Patchset update.

- Update places sidebar patch: add "Networks" button as replacement of "Other locations" functionality. - Introduce patch for tray icons problems in Awesome and i3wm. - Add small patch for hiding XFCE errors about "inhibit" method.
author: Tomasz Gąsior 2018-09-22 02:25:18 +0200
committer: Tomasz Gąsior 2018-09-22 02:25:18 +0200
commit: c5f1b69b1d37a2723b043727965e65a1e7e42d01 (patch)
tree: 7349a6d884e5220483492482f93157dd10bc0ca3
parent: f6df2454a5e6ce2b5bc73d62b747edb5776d002a (diff)
download: aur-c5f1b69b1d37a2723b043727965e65a1e7e42d01.tar.gz
7 files changed, 88 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 28b9e3a82e1e..5ece4fc732f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gtk3-mushrooms
 	pkgdesc = GTK3 patched for classic desktops like XFCE or MATE. Please see README.
 	pkgver = 3.24.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/TomaszGasior/gtk3-mushrooms
 	arch = x86_64
 	license = LGPL
@@ -55,6 +55,8 @@ pkgbase = gtk3-mushrooms
 	source = fixes__atk-bridge-errors.patch
 	source = fixes__labels-wrapping.patch
 	source = fixes__too-large-menu-covers-bar.patch
+	source = fixes__trayicon-parent-relative.patch
+	source = fixes__xfce-inhibit-errors.patch
 	source = other__default-settings.patch
 	source = other__hide-insert-emoji.patch
 	source = other__mnemonics-delay.patch
@@ -74,11 +76,13 @@ pkgbase = gtk3-mushrooms
 	sha256sums = 515ff6df72934aa4294cdb1befd6c542a187fe3b4326cda68a8541dabbe657fd
 	sha256sums = 63bf214d836f688e628b30d1743ff9e47deb64d0f4bde9f0eb9c352fc00ca8d4
 	sha256sums = 1508ddc7e682cdaace327ffe2955abe90f903cf7ec923892b85673a37f76a32f
-	sha256sums = f0c8cbccab2bc9743075135bd5fa74f28dca722e8e723cf46e0dfa2b004a3791
+	sha256sums = 8271342e6a0394f70b6e5a21afb21e2e0b645edf39a0d149d5e8b4d6b062846d
 	sha256sums = 7b987cc9bd7ca9722bfb881b30b082c0d7409e3cd68592f5e7a1f401d73e7672
 	sha256sums = 99b12d7af7efc6a014e6afcab1ee82ea0feb0b5a4e9bbd663d1c45354cd34f2b
 	sha256sums = 7a604d453beb9c425b8ed4a60b5e9435c3f4ee10438490641c0ade448401306a
 	sha256sums = 21b8c90ceec02300affb5b30fecf390531cb76322faaf1dd01e2f1ca239ed729
+	sha256sums = 22ec5d9ee91b50775d7c5662fa683791a1da55d44c03790636552bdc16be7bbd
+	sha256sums = 40ea6615a9f9942e3a9ae52297c9f88a3fbbb70c8da9a559143d649414ab7076
 	sha256sums = 37e3278dd33542b706eb9e1db56997b194a7e2f1fd729a8511369387a74b22bd
 	sha256sums = acd3babd22add981690728e84a89fb8bb332b7ac746e9db7cdb27c47f1ac0042
 	sha256sums = c213812e1fafeb5565f7e329c4501195f04adcfe377b88439a6d51d478edc071
diff --git a/PKGBUILD b/PKGBUILD
index 4b5693724b0f..d8ca9c242a67 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ __arch_pkg_commit="3313de611df4a2893692b70ca96e481c4d930df3"
 
 pkgname=gtk3-mushrooms
 pkgver=3.24.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK3 patched for classic desktops like XFCE or MATE. Please see README."
 url="https://github.com/TomaszGasior/gtk3-mushrooms"
 conflicts=(gtk3 gtk3-print-backends)
@@ -45,6 +45,8 @@ source=(
 	"fixes__atk-bridge-errors.patch"
 	"fixes__labels-wrapping.patch"
 	"fixes__too-large-menu-covers-bar.patch"
+	"fixes__trayicon-parent-relative.patch"
+	"fixes__xfce-inhibit-errors.patch"
 	"other__default-settings.patch"
 	"other__hide-insert-emoji.patch"
 	"other__mnemonics-delay.patch"
@@ -72,11 +74,13 @@ sha256sums=(
 	"515ff6df72934aa4294cdb1befd6c542a187fe3b4326cda68a8541dabbe657fd"
 	"63bf214d836f688e628b30d1743ff9e47deb64d0f4bde9f0eb9c352fc00ca8d4"
 	"1508ddc7e682cdaace327ffe2955abe90f903cf7ec923892b85673a37f76a32f"
-	"f0c8cbccab2bc9743075135bd5fa74f28dca722e8e723cf46e0dfa2b004a3791"
+	"8271342e6a0394f70b6e5a21afb21e2e0b645edf39a0d149d5e8b4d6b062846d"
 	"7b987cc9bd7ca9722bfb881b30b082c0d7409e3cd68592f5e7a1f401d73e7672"
 	"99b12d7af7efc6a014e6afcab1ee82ea0feb0b5a4e9bbd663d1c45354cd34f2b"
 	"7a604d453beb9c425b8ed4a60b5e9435c3f4ee10438490641c0ade448401306a"
 	"21b8c90ceec02300affb5b30fecf390531cb76322faaf1dd01e2f1ca239ed729"
+	"22ec5d9ee91b50775d7c5662fa683791a1da55d44c03790636552bdc16be7bbd"
+	"40ea6615a9f9942e3a9ae52297c9f88a3fbbb70c8da9a559143d649414ab7076"
 	"37e3278dd33542b706eb9e1db56997b194a7e2f1fd729a8511369387a74b22bd"
 	"acd3babd22add981690728e84a89fb8bb332b7ac746e9db7cdb27c47f1ac0042"
 	"c213812e1fafeb5565f7e329c4501195f04adcfe377b88439a6d51d478edc071"
@@ -121,7 +125,7 @@ __patch_makefiles()
 __patch_gtk_code()
 {
 	for patch_file in $srcdir/*.patch; do
-		patch -d "gtk" -p 3 -i "$patch_file"
+		patch -p 2 -i "$patch_file"
 	done
 
 	cat "$srcdir/smaller-adwaita.css" | tee -a gtk/theme/Adwaita/gtk-contained{,-dark}.css > /dev/null
diff --git a/README.md b/README.md
index bff148431e3b..0f7e9492267b 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ File chooser
 ---
 
 * Typeahead feature is restored. Recursive file search will not be ran automatically when you start typing. You can still search recursively by Left Alt + S shortcut. See https://gitlab.gnome.org/GNOME/gtk/issues/839.
-* "Other locations" button is removed from places sidebar. All mounted devices and drives are accessible directly.
+* "Other locations" button is removed from places sidebar. All mounted devices and drives are accessible directly. "Networks" button is added for browsing network shares.
 * Trash and XDG user directories (like Pictures, Downloads, Documents) are removed from places sidebar. You can add it as bookmarks.
 * File system button in places sidebar is labeled as "File System" instead of "Computer".
 
@@ -51,4 +51,6 @@ Fixes
 
 * Menu bars are not covered by too high popup menus. See https://gitlab.gnome.org/GNOME/gtk/issues/1016.
 * Labels are wrapped similarly to GTK2. This patch fixes too wide windows in applications improperly ported from GTK2.
-* Errors in console output because of integration with Accessibility Toolkit are hidden. See https://unix.stackexchange.com/questions/230238.
-\ No newline at end of file
+* Errors in console output caused by integration with Accessibility Toolkit are hidden. See https://unix.stackexchange.com/questions/230238.
+* Errors in console output about non-existent "inhibit" method in XFCE are hidden. See example on https://bugzilla.redhat.com/show_bug.cgi?id=1515272#c1.
+* Tray icons in non-compositing window managers like Awesome or i3wm are shown properly. See https://gitlab.gnome.org/GNOME/gtk/issues/1280.
diff --git a/create-patch.sh b/create-patch.sh
index 0cd938087939..b48459503688 100755
--- a/create-patch.sh
+++ b/create-patch.sh
@@ -8,6 +8,6 @@
 # Patch file is saved under name specified by first argument.
 
 if [[ -d ./org/gtk ]] && [[ -d ./mod/gtk ]] && [[ $1 ]]; then
-	command="diff --color -U 5 -r -Z -B ./org/gtk ./mod/gtk"
+	command="diff --color -U 5 -r -Z -B ./org ./mod"
 	$command > "$1.patch"; reset; $command
 fi
diff --git a/file-chooser__places-sidebar.patch b/file-chooser__places-sidebar.patch
index 22f3e5b2088e..cd9a2f560d22 100644
--- a/file-chooser__places-sidebar.patch
+++ b/file-chooser__places-sidebar.patch
@@ -1,7 +1,7 @@
 diff --color -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
---- ./org/gtk/gtkplacessidebar.c	2017-10-02 18:00:58.000000000 +0200
-+++ ./mod/gtk/gtkplacessidebar.c	2017-10-30 21:21:17.593654954 +0100
-@@ -616,10 +616,11 @@
+--- ./org/gtk/gtkplacessidebar.c	2018-09-22 01:04:58.832337000 +0200
++++ ./mod/gtk/gtkplacessidebar.c	2018-09-22 01:24:14.618504785 +0200
+@@ -631,10 +631,11 @@
  }
  
  static void
@@ -13,7 +13,7 @@ diff --color -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessideb
  
    dirs = NULL;
    for (index = 0; index < G_USER_N_DIRECTORIES; index++)
-@@ -1383,12 +1384,10 @@
+@@ -1418,12 +1419,10 @@
        BookmarkQueryClosure *clos;
  
        root = sl->data;
@@ -26,7 +26,29 @@ diff --color -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessideb
          continue;
  
        clos = g_slice_new (BookmarkQueryClosure);
-@@ -4066,11 +4065,11 @@
+@@ -1527,10 +1526,21 @@
+                  _("Other Locations"), start_icon, NULL, "other-locations:///",
+                  NULL, NULL, NULL, NULL, 0, _("Show other locations"));
+ 
+       g_object_unref (start_icon);
+     }
++  else if (!sidebar->local_only)
++    {
++      start_icon = g_themed_icon_new_with_default_fallbacks (ICON_NAME_NETWORK);
++
++      add_place (sidebar, PLACES_BUILT_IN,
++                 SECTION_OTHER_LOCATIONS,
++                 _("Networks"), start_icon, NULL, "network:///",
++                 NULL, NULL, NULL, NULL, 0, _("Show other locations"));
++
++      g_object_unref (start_icon);
++    }
+ 
+   gtk_widget_show_all (GTK_WIDGET (sidebar));
+   /* We want this hidden by default, but need to do it after the show_all call */
+   gtk_sidebar_row_hide (GTK_SIDEBAR_ROW (sidebar->new_bookmark_row), TRUE);
+ 
+@@ -4143,11 +4153,11 @@
    sidebar->dragging_over = FALSE;
    sidebar->drag_data_info = DND_UNKNOWN;
  
@@ -39,9 +61,10 @@ diff --color -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessideb
                              G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
                              NULL,
                              "org.freedesktop.hostname1",
+Tylko w ./mod/gtk: gtkplacessidebar.c.orig
 diff --color -U 5 -r -Z -B ./org/gtk/ui/gtkfilechooserwidget.ui ./mod/gtk/ui/gtkfilechooserwidget.ui
---- ./org/gtk/ui/gtkfilechooserwidget.ui	2017-10-02 18:00:49.000000000 +0200
-+++ ./mod/gtk/ui/gtkfilechooserwidget.ui	2017-10-30 21:21:17.593654954 +0100
+--- ./org/gtk/ui/gtkfilechooserwidget.ui	2017-11-16 14:21:24.000000000 +0100
++++ ./mod/gtk/ui/gtkfilechooserwidget.ui	2018-09-22 01:21:49.227346988 +0200
 @@ -14,11 +14,12 @@
              <child>
                <object class="GtkPlacesSidebar" id="places_sidebar">
diff --git a/fixes__trayicon-parent-relative.patch b/fixes__trayicon-parent-relative.patch
new file mode 100644
index 000000000000..fa75e7ea8d53
--- /dev/null
+++ b/fixes__trayicon-parent-relative.patch
@@ -0,0 +1,24 @@
+diff --color -U 5 -r -Z -B ./org/gdk/x11/gdkwindow-x11.c ./mod/gdk/x11/gdkwindow-x11.c
+--- ./org/gdk/x11/gdkwindow-x11.c	2018-06-19 17:45:21.000000000 +0200
++++ ./mod/gdk/x11/gdkwindow-x11.c	2018-09-21 23:44:50.443842645 +0200
+@@ -2983,10 +2983,20 @@
+   if (GDK_WINDOW_DESTROYED (window))
+     return;
+ 
+   if (pattern == NULL)
+     {
++      gpointer gtk_widget_ptr;
++      GObject *gtk_widget;
++      gdk_window_get_user_data (window, &gtk_widget_ptr);
++      gtk_widget = G_OBJECT (gtk_widget_ptr);
++      if (gtk_widget && g_strcmp0 (G_OBJECT_TYPE_NAME (gtk_widget), "GtkTrayIcon") == 0)
++      {
++        XSetWindowBackgroundPixmap (GDK_WINDOW_XDISPLAY (window),
++                                    GDK_WINDOW_XID (window), ParentRelative);
++        return;
++      }
+       XSetWindowBackgroundPixmap (GDK_WINDOW_XDISPLAY (window),
+                                   GDK_WINDOW_XID (window), None);
+       return;
+     }
+ 
diff --git a/fixes__xfce-inhibit-errors.patch b/fixes__xfce-inhibit-errors.patch
new file mode 100644
index 000000000000..fc086a97f55a
--- /dev/null
+++ b/fixes__xfce-inhibit-errors.patch
@@ -0,0 +1,16 @@
+diff --color -U 5 -r -Z -B ./org/gtk/gtkapplication-dbus.c ./mod/gtk/gtkapplication-dbus.c
+--- ./org/gtk/gtkapplication-dbus.c	2018-09-14 05:32:45.000000000 +0200
++++ ./mod/gtk/gtkapplication-dbus.c	2018-09-22 00:05:37.731044507 +0200
+@@ -644,11 +644,11 @@
+           return cookie;
+         }
+ 
+       if (error)
+         {
+-          if (!warned)
++          if (FALSE)
+             {
+               g_warning ("Calling %s.Inhibit failed: %s",
+                          g_dbus_proxy_get_interface_name (dbus->sm_proxy),
+                          error->message);
+               warned = TRUE;
author	Tomasz Gąsior	2018-09-22 02:25:18 +0200
committer	Tomasz Gąsior	2018-09-22 02:25:18 +0200
commit	c5f1b69b1d37a2723b043727965e65a1e7e42d01 (patch)
tree	7349a6d884e5220483492482f93157dd10bc0ca3
parent	f6df2454a5e6ce2b5bc73d62b747edb5776d002a (diff)
download	aur-c5f1b69b1d37a2723b043727965e65a1e7e42d01.tar.gz