[arch-commits] Commit in gtk3/repos/extra-x86_64 (13 files)

Jan Steffens heftig at archlinux.org
Tue Oct 6 22:06:19 UTC 2020


    Date: Tuesday, October 6, 2020 @ 22:06:19
  Author: heftig
Revision: 397453

archrelease: copy trunk to extra-x86_64

Added:
  gtk3/repos/extra-x86_64/0001-gtkplacessidebar-Disconnect-and-unref-cloud_manager-.patch
    (from rev 397452, gtk3/trunk/0001-gtkplacessidebar-Disconnect-and-unref-cloud_manager-.patch)
  gtk3/repos/extra-x86_64/PKGBUILD
    (from rev 397452, gtk3/trunk/PKGBUILD)
  gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook
    (from rev 397452, gtk3/trunk/gtk-query-immodules-3.0.hook)
  gtk3/repos/extra-x86_64/gtk-update-icon-cache.hook
    (from rev 397452, gtk3/trunk/gtk-update-icon-cache.hook)
  gtk3/repos/extra-x86_64/gtk-update-icon-cache.script
    (from rev 397452, gtk3/trunk/gtk-update-icon-cache.script)
  gtk3/repos/extra-x86_64/gtk3.install
    (from rev 397452, gtk3/trunk/gtk3.install)
  gtk3/repos/extra-x86_64/settings.ini
    (from rev 397452, gtk3/trunk/settings.ini)
Deleted:
  gtk3/repos/extra-x86_64/PKGBUILD
  gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook
  gtk3/repos/extra-x86_64/gtk-update-icon-cache.hook
  gtk3/repos/extra-x86_64/gtk-update-icon-cache.script
  gtk3/repos/extra-x86_64/gtk3.install
  gtk3/repos/extra-x86_64/settings.ini

-----------------------------------------------------------------+
 0001-gtkplacessidebar-Disconnect-and-unref-cloud_manager-.patch |   64 ++++
 PKGBUILD                                                        |  157 +++++-----
 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, 186 insertions(+), 117 deletions(-)

Copied: gtk3/repos/extra-x86_64/0001-gtkplacessidebar-Disconnect-and-unref-cloud_manager-.patch (from rev 397452, gtk3/trunk/0001-gtkplacessidebar-Disconnect-and-unref-cloud_manager-.patch)
===================================================================
--- 0001-gtkplacessidebar-Disconnect-and-unref-cloud_manager-.patch	                        (rev 0)
+++ 0001-gtkplacessidebar-Disconnect-and-unref-cloud_manager-.patch	2020-10-06 22:06:19 UTC (rev 397453)
@@ -0,0 +1,64 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 6 Oct 2020 21:14:45 +0000
+Subject: [PATCH] gtkplacessidebar: Disconnect and unref cloud_manager in
+ dispose
+
+The manager's providers-changed signal can fire after the sidebar has
+been freed. Make sure we disconnect the sidebar from the manager.
+
+https://bugs.archlinux.org/task/57984
+https://bugs.archlinux.org/task/68123
+---
+ gtk/gtkplacessidebar.c | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
+index 87c08a5389..118739fdd2 100644
+--- a/gtk/gtkplacessidebar.c
++++ b/gtk/gtkplacessidebar.c
+@@ -4411,32 +4411,32 @@ gtk_places_sidebar_dispose (GObject *object)
+   sidebar->shortcuts = NULL;
+ 
+ #ifdef HAVE_CLOUDPROVIDERS
+-  for (l = cloud_providers_collector_get_providers (sidebar->cloud_manager);
+-       l != NULL; l = l->next)
+-    {
+-      g_signal_handlers_disconnect_by_data (l->data, sidebar);
+-    }
+   for (l = sidebar->unready_accounts; l != NULL; l = l->next)
+     {
+         g_signal_handlers_disconnect_by_data (l->data, sidebar);
+     }
+   g_list_free_full (sidebar->unready_accounts, g_object_unref);
+   sidebar->unready_accounts = NULL;
++
++  if (sidebar->cloud_manager)
++    {
++      g_signal_handlers_disconnect_by_data (sidebar->cloud_manager, sidebar);
++      for (l = cloud_providers_collector_get_providers (sidebar->cloud_manager);
++           l != NULL; l = l->next)
++        {
++          g_signal_handlers_disconnect_by_data (l->data, sidebar);
++        }
++      g_object_unref (sidebar->cloud_manager);
++      sidebar->cloud_manager = NULL;
++    }
+ #endif
+ 
+   G_OBJECT_CLASS (gtk_places_sidebar_parent_class)->dispose (object);
+ }
+ 
+ static void
+ gtk_places_sidebar_finalize (GObject *object)
+ {
+-#ifdef HAVE_CLOUDPROVIDERS
+-  GtkPlacesSidebar *sidebar;
+-
+-  sidebar = GTK_PLACES_SIDEBAR (object);
+-  g_clear_object (&sidebar->cloud_manager);
+-#endif
+-
+   G_OBJECT_CLASS (gtk_places_sidebar_parent_class)->finalize (object);
+ }
+ 

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-06 22:05:58 UTC (rev 397452)
+++ PKGBUILD	2020-10-06 22:06:19 UTC (rev 397453)
@@ -1,76 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgbase=gtk3
-pkgname=(gtk3 gtk-update-icon-cache)
-pkgver=3.24.23
-pkgrel=3
-epoch=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 fribidi iso-codes tracker3 libcloudproviders)
-makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson)
-license=(LGPL)
-_commit=016e8c55ab924c9ef4d32c8cb06253b1dc1be60d  # tags/3.24.23^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'
-            'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229'
-            '2d435e3bec8b79b533f00f6d04decb1d7c299c6e89b5b175f20be0459f003fe8'
-            'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
-
-pkgver() {
-  cd gtk
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd gtk
-}
-
-build() {
-  CFLAGS+=" -DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"
-  arch-meson gtk build \
-    -D broadway_backend=true \
-    -D cloudproviders=true \
-    -D colord=yes \
-    -D gtk_doc=true \
-    -D man=true
-  meson compile -C build
-}
-
-package_gtk3() {
-  depends+=(gtk-update-icon-cache)
-  provides=(gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so)
-  conflicts=(gtk3-print-backends)
-  replaces=("gtk3-print-backends<=3.22.26-1")
-  install=gtk3.install
-
-  DESTDIR="$pkgdir" meson install -C build
-
-  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:

Copied: gtk3/repos/extra-x86_64/PKGBUILD (from rev 397452, gtk3/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-10-06 22:06:19 UTC (rev 397453)
@@ -0,0 +1,81 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgbase=gtk3
+pkgname=(gtk3 gtk-update-icon-cache)
+pkgver=3.24.23
+pkgrel=4
+epoch=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 fribidi iso-codes tracker3 libcloudproviders)
+makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson)
+license=(LGPL)
+_commit=016e8c55ab924c9ef4d32c8cb06253b1dc1be60d  # tags/3.24.23^0
+source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
+        0001-gtkplacessidebar-Disconnect-and-unref-cloud_manager-.patch
+        settings.ini
+        gtk-query-immodules-3.0.hook
+        gtk-update-icon-cache.hook
+        gtk-update-icon-cache.script)
+sha256sums=('SKIP'
+            'd6f6bf347482553bc20a1640c1619f674520b853a5b2ade9fd56bb77bfdfe170'
+            '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
+            'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229'
+            '2d435e3bec8b79b533f00f6d04decb1d7c299c6e89b5b175f20be0459f003fe8'
+            'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
+
+pkgver() {
+  cd gtk
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd gtk
+
+  # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2669
+  git apply -3 ../0001-gtkplacessidebar-Disconnect-and-unref-cloud_manager-.patch
+}
+
+build() {
+  CFLAGS+=" -DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"
+  arch-meson gtk build \
+    -D broadway_backend=true \
+    -D cloudproviders=true \
+    -D colord=yes \
+    -D gtk_doc=true \
+    -D man=true
+  meson compile -C build
+}
+
+package_gtk3() {
+  depends+=(gtk-update-icon-cache)
+  provides=(gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so)
+  conflicts=(gtk3-print-backends)
+  replaces=("gtk3-print-backends<=3.22.26-1")
+  install=gtk3.install
+
+  DESTDIR="$pkgdir" meson install -C build
+
+  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	2020-10-06 22:05:58 UTC (rev 397452)
+++ gtk-query-immodules-3.0.hook	2020-10-06 22:06:19 UTC (rev 397453)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = Path
-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/extra-x86_64/gtk-query-immodules-3.0.hook (from rev 397452, gtk3/trunk/gtk-query-immodules-3.0.hook)
===================================================================
--- gtk-query-immodules-3.0.hook	                        (rev 0)
+++ gtk-query-immodules-3.0.hook	2020-10-06 22:06:19 UTC (rev 397453)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+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	2020-10-06 22:05:58 UTC (rev 397452)
+++ gtk-update-icon-cache.hook	2020-10-06 22:06:19 UTC (rev 397453)
@@ -1,13 +0,0 @@
-[Trigger]
-Type = Path
-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/extra-x86_64/gtk-update-icon-cache.hook (from rev 397452, gtk3/trunk/gtk-update-icon-cache.hook)
===================================================================
--- gtk-update-icon-cache.hook	                        (rev 0)
+++ gtk-update-icon-cache.hook	2020-10-06 22:06:19 UTC (rev 397453)
@@ -0,0 +1,13 @@
+[Trigger]
+Type = Path
+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	2020-10-06 22:05:58 UTC (rev 397452)
+++ gtk-update-icon-cache.script	2020-10-06 22:06:19 UTC (rev 397453)
@@ -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/extra-x86_64/gtk-update-icon-cache.script (from rev 397452, gtk3/trunk/gtk-update-icon-cache.script)
===================================================================
--- gtk-update-icon-cache.script	                        (rev 0)
+++ gtk-update-icon-cache.script	2020-10-06 22:06:19 UTC (rev 397453)
@@ -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	2020-10-06 22:05:58 UTC (rev 397452)
+++ gtk3.install	2020-10-06 22:06:19 UTC (rev 397453)
@@ -1,3 +0,0 @@
-pre_remove() {
-    rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}

Copied: gtk3/repos/extra-x86_64/gtk3.install (from rev 397452, gtk3/trunk/gtk3.install)
===================================================================
--- gtk3.install	                        (rev 0)
+++ gtk3.install	2020-10-06 22:06:19 UTC (rev 397453)
@@ -0,0 +1,3 @@
+pre_remove() {
+    rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
+}

Deleted: settings.ini
===================================================================
--- settings.ini	2020-10-06 22:05:58 UTC (rev 397452)
+++ settings.ini	2020-10-06 22:06:19 UTC (rev 397453)
@@ -1,4 +0,0 @@
-[Settings]
-gtk-icon-theme-name = Adwaita
-gtk-theme-name = Adwaita
-gtk-font-name = Cantarell 11

Copied: gtk3/repos/extra-x86_64/settings.ini (from rev 397452, gtk3/trunk/settings.ini)
===================================================================
--- settings.ini	                        (rev 0)
+++ settings.ini	2020-10-06 22:06:19 UTC (rev 397453)
@@ -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