Skip to content
Snippets Groups Projects
Commit dc026b32 authored by Bernhard Landauer's avatar Bernhard Landauer
Browse files

upd systray patch

parent 86e4c458
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ __arch_pkg_commit=a97a4614dfdb3a2f0c97ed58f94385ecc9b16b1e ...@@ -7,7 +7,7 @@ __arch_pkg_commit=a97a4614dfdb3a2f0c97ed58f94385ecc9b16b1e
_pkgname=lib32-gtk3 _pkgname=lib32-gtk3
pkgname=$_pkgname-classic pkgname=$_pkgname-classic
pkgver=3.22.30 pkgver=3.22.30
pkgrel=5.1 pkgrel=6
pkgdesc="GTK3 patched for classic desktops like MATE/XFCE (see README)." pkgdesc="GTK3 patched for classic desktops like MATE/XFCE (see README)."
url="https://github.com/TomaszGasior/gtk3-mushrooms" url="https://github.com/TomaszGasior/gtk3-mushrooms"
_archgit=https://git.archlinux.org/svntogit/community.git/plain/trunk _archgit=https://git.archlinux.org/svntogit/community.git/plain/trunk
...@@ -53,19 +53,21 @@ source=( ...@@ -53,19 +53,21 @@ source=(
# Temporary. Will be removed with next GTK3 release. # Temporary. Will be removed with next GTK3 release.
"upstream_transparent_window_bg_1._patch::https://github.com/GNOME/gtk/commit/2ce63a86ba689aa41eb47409c889c469497478b0.patch" "upstream_transparent_window_bg_1._patch::https://github.com/GNOME/gtk/commit/2ce63a86ba689aa41eb47409c889c469497478b0.patch"
"upstream_transparent_window_bg_2._patch::https://github.com/GNOME/gtk/commit/01d1bc3c75fd0eff5665f5b9c690c5e1e6c65f13.patch" "upstream_transparent_window_bg_2._patch::https://github.com/GNOME/gtk/commit/01d1bc3c75fd0eff5665f5b9c690c5e1e6c65f13.patch"
# Temporary. Fixes problems in Awesome and i3 caused by patches above.
"tmp_parent_relative_systray._patch"
# # trayicons background patch https://github.com/TomaszGasior/gtk3-mushrooms/issues/12
# 'fixes__gtktrayicon-background.patch'
"gtk-query-immodules-3.0-32.hook::$_archgit/gtk-query-immodules-3.0-32.hook?h=packages/$_pkgname&id=$__arch_pkg_commit" "gtk-query-immodules-3.0-32.hook::$_archgit/gtk-query-immodules-3.0-32.hook?h=packages/$_pkgname&id=$__arch_pkg_commit"
# gtk3-mushrooms patches # gtk3-mushrooms patches
"git+$url.git" "git+$url.git"
# trayicons background patch https://github.com/TomaszGasior/gtk3-mushrooms/issues/12
'fixes__gtktrayicon-background.patch'
) )
sha256sums=('a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567' sha256sums=('a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567'
'ceb95c0952ccd3ded84cd55a2386a33edac91597052b077d12fa4a3cc62a1612' 'ceb95c0952ccd3ded84cd55a2386a33edac91597052b077d12fa4a3cc62a1612'
'68e3ea59140ee565a146fff2db2d2e2ed99536bbad8ba818bee124325d516e01' '68e3ea59140ee565a146fff2db2d2e2ed99536bbad8ba818bee124325d516e01'
'e4e82638b5af3b1524a01c807dfa07f8bcd6583cd9579707b902ce7a9267d0a4'
'4ac8112ac7e6fa879756e1eeb89b5efa0825ba00e5b05469913b256f86a37608' '4ac8112ac7e6fa879756e1eeb89b5efa0825ba00e5b05469913b256f86a37608'
'SKIP' 'SKIP')
'57086d7b73b8631bf1a44ff1db255333e8244ae6bd2c1617d540397f78790f7b')
__patch_makefiles() { __patch_makefiles() {
__replace_string_in_file() { __replace_string_in_file() {
...@@ -114,7 +116,11 @@ prepare() { ...@@ -114,7 +116,11 @@ prepare() {
# Temporary. Will be removed with next GTK3 release. # Temporary. Will be removed with next GTK3 release.
patch -p 1 -i "$srcdir/upstream_transparent_window_bg_1._patch" patch -p 1 -i "$srcdir/upstream_transparent_window_bg_1._patch"
patch -p 1 -i "$srcdir/upstream_transparent_window_bg_2._patch" patch -p 1 -i "$srcdir/upstream_transparent_window_bg_2._patch"
patch -p 1 -i "$srcdir/fixes__gtktrayicon-background.patch" # patch -p 1 -i "$srcdir/fixes__gtktrayicon-background.patch"
# Temporary. Fixes problems in Awesome and i3 caused by patches above.
# See https://github.com/TomaszGasior/gtk3-mushrooms/issues/12
patch -p 2 -i "$srcdir/tmp_parent_relative_systray._patch"
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
} }
......
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 2017-12-15 22:04:22.000000000 +0100
+++ ./mod/gdk/x11/gdkwindow-x11.c 2018-08-23 02:47:17.823496337 +0200
@@ -2968,10 +2968,12 @@
static void
gdk_window_x11_set_background (GdkWindow *window,
cairo_pattern_t *pattern)
{
GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (window->impl);
+ if (impl->frame_sync_enabled == FALSE)
+ return;
double r, g, b, a;
cairo_surface_t *surface;
cairo_matrix_t matrix;
if (GDK_WINDOW_DESTROYED (window))
diff --color -U 5 -r -Z -B ./org/gtk/gtkplug.c ./mod/gtk/gtkplug.c
--- ./org/gtk/gtkplug.c 2018-02-17 23:30:46.000000000 +0100
+++ ./mod/gtk/gtkplug.c 2018-08-23 02:45:01.564333192 +0200
@@ -1059,10 +1059,12 @@
gdk_window = gdk_window_new (priv->socket_window,
&attributes, attributes_mask);
else /* If it's a passive plug, we use the root window */
gdk_window = gdk_window_new (root_window,
&attributes, attributes_mask);
+ XSetWindowBackgroundPixmap (GDK_WINDOW_XDISPLAY (gdk_window),
+ GDK_WINDOW_XID (gdk_window), ParentRelative);
/* Because the window isn't known to the window manager,
* frame sync won't work. In theory, XEMBED could be extended
* so that embedder did frame sync like a window manager, but
* it's just not worth the effort considering the current
* minimal use of XEMBED.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment