[arch-commits] Commit in gtk3/repos/gnome-unstable-x86_64 (13 files)
Jan Steffens
heftig at archlinux.org
Wed Sep 5 20:24:42 UTC 2018
Date: Wednesday, September 5, 2018 @ 20:24:41
Author: heftig
Revision: 333551
archrelease: copy trunk to gnome-unstable-x86_64
Added:
gtk3/repos/gnome-unstable-x86_64/0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch
(from rev 333550, gtk3/trunk/0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch)
gtk3/repos/gnome-unstable-x86_64/PKGBUILD
(from rev 333550, gtk3/trunk/PKGBUILD)
gtk3/repos/gnome-unstable-x86_64/gtk-query-immodules-3.0.hook
(from rev 333550, gtk3/trunk/gtk-query-immodules-3.0.hook)
gtk3/repos/gnome-unstable-x86_64/gtk-update-icon-cache.hook
(from rev 333550, gtk3/trunk/gtk-update-icon-cache.hook)
gtk3/repos/gnome-unstable-x86_64/gtk-update-icon-cache.script
(from rev 333550, gtk3/trunk/gtk-update-icon-cache.script)
gtk3/repos/gnome-unstable-x86_64/gtk3.install
(from rev 333550, gtk3/trunk/gtk3.install)
gtk3/repos/gnome-unstable-x86_64/settings.ini
(from rev 333550, gtk3/trunk/settings.ini)
Deleted:
gtk3/repos/gnome-unstable-x86_64/PKGBUILD
gtk3/repos/gnome-unstable-x86_64/gtk-query-immodules-3.0.hook
gtk3/repos/gnome-unstable-x86_64/gtk-update-icon-cache.hook
gtk3/repos/gnome-unstable-x86_64/gtk-update-icon-cache.script
gtk3/repos/gnome-unstable-x86_64/gtk3.install
gtk3/repos/gnome-unstable-x86_64/settings.ini
-----------------------------------------------------------------+
0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch | 49 ++
PKGBUILD | 174 +++++-----
gtk-query-immodules-3.0.hook | 22 -
gtk-update-icon-cache.hook | 26 -
gtk-update-icon-cache.script | 20 -
gtk3.install | 6
settings.ini | 8
7 files changed, 179 insertions(+), 126 deletions(-)
Copied: gtk3/repos/gnome-unstable-x86_64/0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch (from rev 333550, gtk3/trunk/0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch)
===================================================================
--- 0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch (rev 0)
+++ 0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch 2018-09-05 20:24:41 UTC (rev 333551)
@@ -0,0 +1,49 @@
+From 3c7d5e749ccafa75718ef00f1d5f6cdc0defacb3 Mon Sep 17 00:00:00 2001
+Message-Id: <3c7d5e749ccafa75718ef00f1d5f6cdc0defacb3.1536176847.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Wed, 5 Sep 2018 21:46:28 +0200
+Subject: [PATCH] GtkApplication: Fix CRITICAL on shutdown when
+ register_session=FALSE
+
+---
+ gtk/gtkapplication-dbus.c | 23 +++++++++++++++--------
+ 1 file changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/gtk/gtkapplication-dbus.c b/gtk/gtkapplication-dbus.c
+index 25015eb68c..0946edf35c 100644
+--- a/gtk/gtkapplication-dbus.c
++++ b/gtk/gtkapplication-dbus.c
+@@ -826,15 +826,22 @@ gtk_application_impl_dbus_finalize (GObject *object)
+ {
+ GtkApplicationImplDBus *dbus = (GtkApplicationImplDBus *) object;
+
+- g_dbus_connection_call (dbus->session,
+- "org.freedesktop.portal.Desktop",
+- dbus->session_id,
+- "org.freedesktop.portal.Session",
+- "Close",
+- NULL, NULL, 0, -1, NULL, NULL, NULL);
++ if (dbus->session_id)
++ {
++ g_dbus_connection_call (dbus->session,
++ "org.freedesktop.portal.Desktop",
++ dbus->session_id,
++ "org.freedesktop.portal.Session",
++ "Close",
++ NULL, NULL, 0, -1, NULL, NULL, NULL);
++
++ g_free (dbus->session_id);
++ }
++
++ if (dbus->state_changed_handler)
++ g_dbus_connection_signal_unsubscribe (dbus->session,
++ dbus->state_changed_handler);
+
+- g_free (dbus->session_id);
+- g_dbus_connection_signal_unsubscribe (dbus->session, dbus->state_changed_handler);
+ g_clear_object (&dbus->inhibit_proxy);
+ g_slist_free_full (dbus->inhibit_handles, inhibit_handle_free);
+ g_free (dbus->app_menu_path);
+--
+2.18.0
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-09-05 20:24:12 UTC (rev 333550)
+++ PKGBUILD 2018-09-05 20:24:41 UTC (rev 333551)
@@ -1,85 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgbase=gtk3
-pkgname=(gtk3 gtk-update-icon-cache)
-pkgver=3.24.0
-pkgrel=1
-pkgdesc="GObject-based multi-platform GUI toolkit"
-arch=(x86_64)
-url="https://www.gtk.org/"
-depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 dconf
- libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon
- adwaita-icon-theme json-glib librsvg wayland-protocols desktop-file-utils mesa
- cantarell-fonts colord rest libcups libcanberra)
-makedepends=(gobject-introspection gtk-doc git glib2-docs sassc)
-license=(LGPL)
-_commit=ef1a1b5cb1010977d631dc1131b0db45a1e1e15f # tags/3.24.0^0
-source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
- settings.ini
- gtk-query-immodules-3.0.hook
- gtk-update-icon-cache.hook
- gtk-update-icon-cache.script)
-sha256sums=('SKIP'
- '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
- 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
- '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
- 'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
-
-pkgver() {
- cd gtk
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd gtk
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd gtk
-
- CXX=/bin/false ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-schemas-compile \
- --enable-x11-backend \
- --enable-broadway-backend \
- --enable-wayland-backend \
- --enable-gtk-doc
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package_gtk3() {
- depends+=(gtk-update-icon-cache)
- provides=(gtk3-print-backends)
- conflicts=(gtk3-print-backends)
- replaces=("gtk3-print-backends<=3.22.26-1")
- install=gtk3.install
-
- cd gtk
- make DESTDIR="$pkgdir" install
-
- install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
- install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook"
-
- # split this out to use with gtk2 too
- rm "$pkgdir/usr/bin/gtk-update-icon-cache"
-}
-
-package_gtk-update-icon-cache() {
- pkgdesc="GTK+ icon cache updater"
- depends=(gdk-pixbuf2 librsvg hicolor-icon-theme)
-
- cd gtk
- install -D gtk/gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
- install -Dm644 ../gtk-update-icon-cache.hook "$pkgdir/usr/share/libalpm/hooks/gtk-update-icon-cache.hook"
- install -D ../gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: gtk3/repos/gnome-unstable-x86_64/PKGBUILD (from rev 333550, gtk3/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-09-05 20:24:41 UTC (rev 333551)
@@ -0,0 +1,89 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgbase=gtk3
+pkgname=(gtk3 gtk-update-icon-cache)
+pkgver=3.24.0
+pkgrel=2
+pkgdesc="GObject-based multi-platform GUI toolkit"
+arch=(x86_64)
+url="https://www.gtk.org/"
+depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 dconf
+ libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon
+ adwaita-icon-theme json-glib librsvg wayland-protocols desktop-file-utils mesa
+ cantarell-fonts colord rest libcups libcanberra)
+makedepends=(gobject-introspection gtk-doc git glib2-docs sassc)
+license=(LGPL)
+_commit=ef1a1b5cb1010977d631dc1131b0db45a1e1e15f # tags/3.24.0^0
+source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
+ 0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch
+ settings.ini
+ gtk-query-immodules-3.0.hook
+ gtk-update-icon-cache.hook
+ gtk-update-icon-cache.script)
+sha256sums=('SKIP'
+ '54ea494642c2498dc9f14c310744a4a9d43b6d1fd217bc8ca50f4a86ec56973f'
+ '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
+ 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
+ '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
+ 'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
+
+pkgver() {
+ cd gtk
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd gtk
+
+ # Attempt to unbreak libdazzle test-application
+ patch -Np1 -i ../0001-GtkApplication-Fix-CRITICAL-on-shutdown-when-registe.patch
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd gtk
+
+ CXX=/bin/false ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-schemas-compile \
+ --enable-x11-backend \
+ --enable-broadway-backend \
+ --enable-wayland-backend \
+ --enable-gtk-doc
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package_gtk3() {
+ depends+=(gtk-update-icon-cache)
+ provides=(gtk3-print-backends)
+ conflicts=(gtk3-print-backends)
+ replaces=("gtk3-print-backends<=3.22.26-1")
+ install=gtk3.install
+
+ DESTDIR="$pkgdir" make -C gtk install
+
+ install -Dt "$pkgdir/usr/share/gtk-3.0" -m644 settings.ini
+ install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-query-immodules-3.0.hook
+
+ # split this out to use with gtk2 too
+ mv "$pkgdir/usr/bin/gtk-update-icon-cache" "$srcdir"
+}
+
+package_gtk-update-icon-cache() {
+ pkgdesc="GTK+ icon cache updater"
+ depends=(gdk-pixbuf2 librsvg hicolor-icon-theme)
+
+ install -Dt "$pkgdir/usr/bin" gtk-update-icon-cache
+ install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-update-icon-cache.hook
+ install -D gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: gtk-query-immodules-3.0.hook
===================================================================
--- gtk-query-immodules-3.0.hook 2018-09-05 20:24:12 UTC (rev 333550)
+++ gtk-query-immodules-3.0.hook 2018-09-05 20:24:41 UTC (rev 333551)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
-
-[Action]
-Description = Probing GTK3 input method modules...
-When = PostTransaction
-Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache
Copied: gtk3/repos/gnome-unstable-x86_64/gtk-query-immodules-3.0.hook (from rev 333550, gtk3/trunk/gtk-query-immodules-3.0.hook)
===================================================================
--- gtk-query-immodules-3.0.hook (rev 0)
+++ gtk-query-immodules-3.0.hook 2018-09-05 20:24:41 UTC (rev 333551)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
+
+[Action]
+Description = Probing GTK3 input method modules...
+When = PostTransaction
+Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache
Deleted: gtk-update-icon-cache.hook
===================================================================
--- gtk-update-icon-cache.hook 2018-09-05 20:24:12 UTC (rev 333550)
+++ gtk-update-icon-cache.hook 2018-09-05 20:24:41 UTC (rev 333551)
@@ -1,13 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/share/icons/*/
-Target = !usr/share/icons/*/?*
-
-[Action]
-Description = Updating icon theme caches...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/gtk-update-icon-cache
-NeedsTargets
Copied: gtk3/repos/gnome-unstable-x86_64/gtk-update-icon-cache.hook (from rev 333550, gtk3/trunk/gtk-update-icon-cache.hook)
===================================================================
--- gtk-update-icon-cache.hook (rev 0)
+++ gtk-update-icon-cache.hook 2018-09-05 20:24:41 UTC (rev 333551)
@@ -0,0 +1,13 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/icons/*/
+Target = !usr/share/icons/*/?*
+
+[Action]
+Description = Updating icon theme caches...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/gtk-update-icon-cache
+NeedsTargets
Deleted: gtk-update-icon-cache.script
===================================================================
--- gtk-update-icon-cache.script 2018-09-05 20:24:12 UTC (rev 333550)
+++ gtk-update-icon-cache.script 2018-09-05 20:24:41 UTC (rev 333551)
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-while read -r f; do
- if [[ -e ${f}index.theme ]]; then
- gtk-update-icon-cache -q "$f"
- elif [[ -d $f ]]; then
- rm -f "${f}icon-theme.cache"
- rmdir --ignore-fail-on-non-empty "$f"
- fi
-done
Copied: gtk3/repos/gnome-unstable-x86_64/gtk-update-icon-cache.script (from rev 333550, gtk3/trunk/gtk-update-icon-cache.script)
===================================================================
--- gtk-update-icon-cache.script (rev 0)
+++ gtk-update-icon-cache.script 2018-09-05 20:24:41 UTC (rev 333551)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+while read -r f; do
+ if [[ -e ${f}index.theme ]]; then
+ gtk-update-icon-cache -q "$f"
+ elif [[ -d $f ]]; then
+ rm -f "${f}icon-theme.cache"
+ rmdir --ignore-fail-on-non-empty "$f"
+ fi
+done
Deleted: gtk3.install
===================================================================
--- gtk3.install 2018-09-05 20:24:12 UTC (rev 333550)
+++ gtk3.install 2018-09-05 20:24:41 UTC (rev 333551)
@@ -1,3 +0,0 @@
-pre_remove() {
- rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
Copied: gtk3/repos/gnome-unstable-x86_64/gtk3.install (from rev 333550, gtk3/trunk/gtk3.install)
===================================================================
--- gtk3.install (rev 0)
+++ gtk3.install 2018-09-05 20:24:41 UTC (rev 333551)
@@ -0,0 +1,3 @@
+pre_remove() {
+ rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
+}
Deleted: settings.ini
===================================================================
--- settings.ini 2018-09-05 20:24:12 UTC (rev 333550)
+++ settings.ini 2018-09-05 20:24:41 UTC (rev 333551)
@@ -1,4 +0,0 @@
-[Settings]
-gtk-icon-theme-name = Adwaita
-gtk-theme-name = Adwaita
-gtk-font-name = Cantarell 11
Copied: gtk3/repos/gnome-unstable-x86_64/settings.ini (from rev 333550, gtk3/trunk/settings.ini)
===================================================================
--- settings.ini (rev 0)
+++ settings.ini 2018-09-05 20:24:41 UTC (rev 333551)
@@ -0,0 +1,4 @@
+[Settings]
+gtk-icon-theme-name = Adwaita
+gtk-theme-name = Adwaita
+gtk-font-name = Cantarell 11
More information about the arch-commits
mailing list