xfce4-panel: Draw icons/background properly when compositing is disabled
PATCH 1/3 xfce4-panel: Draw icons/background properly when compositing is disabled
A similar patch was sent for master [1] but that was superseded by upgrade of xfce4-panel 4.14.0 -> 4.14.1 [2]
[1] http://lists.openembedded.org/pipermail/openembedded-devel/2019-September/201966.html
[2] http://lists.openembedded.org/pipermail/openembedded-devel/2019-September/201986.html
--- ...-icons-without-compositing-Bug-14577.patch | 80 +++++++++++++++++++ .../xfce4-panel/xfce4-panel_4.13.4.bb | 1 + 2 files changed, 81 insertions(+) create mode 100644 meta-xfce/recipes-xfce/xfce4-panel/files/0002-systray-Fix-icons-without-compositing-Bug-14577.patch
meta-xfce/recipes-xfce/xfce4-panel/files/0002-systray-Fix-icons-without-compositing-Bug-14577.patch new file +80 -0
@@ -0,0 +1,80 @@ +From f6f70cce417fd2982c2ce6f01016ed01deb6a9ae Mon Sep 17 00:00:00 2001 +From: "Ivan A. Melnikov" <[email protected]> +Date: Mon, 23 Sep 2019 16:18:10 +0400 +Subject: [PATCH] systray: Fix icons without compositing (Bug #14577) + +Wrapper window uses RGBA visual when it's available; +systray manager should try to do the same for +the transparent or parent-relative background to work. + +That means that the manager and icons will work with +RGBA visual even if the screen is not compositing; so +we should always force-redraw the icons. + +Upstream-Status: Accepted [1] + +[1] https://git.xfce.org/xfce/xfce4-panel/commit?id=f6f70cce417fd2982c2ce6f01016ed01deb6a9ae + +Refs: https://bugzilla.xfce.org/show_bug.cgi?id=14577 +Signed-off-by: Ivan A. Melnikov <[email protected]> +--- + plugins/systray/systray-manager.c | 10 ++++++---- + plugins/systray/systray.c | 10 ---------- + 2 files changed, 6 insertions(+), 14 deletions(-) + +diff --git a/plugins/systray/systray-manager.c b/plugins/systray/systray-manager.c +index 68836554..4915649c 100644 +--- a/plugins/systray/systray-manager.c ++++ b/plugins/systray/systray-manager.c +@@ -751,6 +751,7 @@ static void + systray_manager_set_visual (SystrayManager *manager) + { + GdkDisplay *display; ++ GdkVisual *visual; + Visual *xvisual; + Atom visual_atom; + gulong data[1]; +@@ -768,11 +769,12 @@ systray_manager_set_visual (SystrayManager *manager) + visual_atom = gdk_x11_get_xatom_by_name_for_display (display, + "_NET_SYSTEM_TRAY_VISUAL"); + +- if (gdk_screen_is_composited (gtk_widget_get_screen (manager->invisible)) +- && (gdk_screen_get_rgba_visual (screen) != NULL)) ++ visual = gdk_screen_get_rgba_visual (screen); ++ panel_debug (PANEL_DEBUG_SYSTRAY, "rgba visual is %p", visual); ++ if (visual != NULL) + { +- /* get the rgba visual */ +- xvisual = GDK_VISUAL_XVISUAL (gdk_screen_get_rgba_visual (screen)); ++ /* use the rgba visual */ ++ xvisual = GDK_VISUAL_XVISUAL (visual); + } + else + { +diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c +index 3fb9520c..beae1973 100644 +--- a/plugins/systray/systray.c ++++ b/plugins/systray/systray.c +@@ -728,19 +728,9 @@ systray_plugin_box_draw (GtkWidget *box, + gpointer user_data) + { + SystrayPlugin *plugin = XFCE_SYSTRAY_PLUGIN (user_data); +- GdkScreen *screen; +- + panel_return_if_fail (XFCE_IS_SYSTRAY_PLUGIN (plugin)); + panel_return_if_fail (cr != NULL); + +- screen = gtk_widget_get_screen (GTK_WIDGET (plugin)); +- +- if (G_LIKELY (screen != NULL)) +- { +- if (!gdk_screen_is_composited (screen)) +- return; +- } +- + /* separately draw all the composed tray icons after gtk + * handled the draw event */ + gtk_container_foreach (GTK_CONTAINER (box), +-- +2.21.0 +
meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.4.bb +1 -0
@@ -12,6 +12,7 @@ SRC_URI[md5sum] = "c0f132fed2110d37f351aadc9e80a034" SRC_URI[sha256sum] = "36ffd26ef7f5867c01ba310475b4358ff0e588cfd5599a266f0037a6c20052a1" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ + file://0002-systray-Fix-icons-without-compositing-Bug-14577.patch \ " python populate_packages_prepend() {
Signature · 1 line
2.21.0
PATCH 2/3 polkit-group-rules: Fix error in do_rootfs for rpm package-manager
* An issue in meta-mortsgna was reported. Discussion is found at [1]
* We do similar in meta-gnome's gvfs for same reason [2]
* This is a bugfix which should apply and work for many release-branches
Fixes:
| Error: Transaction check error:
| file /etc/polkit-1/rules.d conflicts between attempted installs of polkit-group-rule-datetime-1.0-r0.cortexa7t2hf_neon_vfpv4 and polkit-0.115-r0.cortexa7t2hf_neon_vfpv4
[1] https://github.com/schnitzeltony/meta-mortsgna/issues/11
[2] https://github.com/openembedded/meta-openembedded/blob/fd1a0c9210b162ccb147e933984c755d32899efc/meta-gnome/recipes-gnome/gvfs/gvfs_1.41.2.bb#L72
---
Additional hints ontop of original commit message:
* vlc does not support qt4 any more
* without qt backend vlc is not exactly usable
meta-oe/recipes-extended/polkit/polkit-group-rule.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-extended/polkit/polkit-group-rule.inc +1 -1
@@ -8,6 +8,6 @@ inherit useradd do_install_prepend() { install -m 700 -d ${D}${sysconfdir}/polkit-1/rules.d - chown polkitd:polkitd ${D}${sysconfdir}/polkit-1/rules.d + chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d } USERADD_PARAM_${PN}_prepend = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;"
Signature · 1 line
2.21.0
PATCH RESEND 3/3 vlc: rework qt PACKAGECONFIG
In reply to Andreas Müller* qt4 support is gone -> move to qt5
* while at it remove noop libtool copy
--- .../recipes-multimedia/vlc/vlc.inc | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-)
meta-multimedia/recipes-multimedia/vlc/vlc.inc +15 -9
@@ -36,12 +36,17 @@ EXTRA_OECONF = "\ --enable-realrtsp \ --disable-libtar \ --enable-avcodec \ - ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \ - ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \ - ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ + ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \ + ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/rcc \ + ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/uic \ " -PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread png ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG ?= " \ + live555 dc1394 dv1394 notify fontconfig freetype dvdread png \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ +" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
@@ -54,7 +59,7 @@ PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gst-plugins-bad" PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" -PACKAGECONFIG[qt4] = "--enable-qt,--disable-qt, qt4-x11-free" +PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg" PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi" PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba"
@@ -76,12 +81,13 @@ PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" -do_configure_prepend() { - cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true -} - do_configure_append() { sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool + + # moc needs support: precreate build paths + for qtpath in adapters components/epg components/playlist components/sout dialogs managers styles util/buttons; do + mkdir -p "${B}/modules/gui/qt/$qtpath" + done } # This recipe packages vlc as a library as well, so qt4 dependencies
Signature · 1 line
2.21.0
Quoted 5 lines · Andreas Müller
A similar patch was sent for master [1] but that was superseded by upgrade of xfce4-panel 4.14.0 -> 4.14.1 [2]
[1] http://lists.openembedded.org/pipermail/openembedded-devel/2019-September/201966.html
[2] http://lists.openembedded.org/pipermail/openembedded-devel/2019-September/201986.html
This patch is fine with me.
Regards,
Kai
Quoted 106 lines
Signed-off-by Andreas Müller <[email protected]>--- ...-icons-without-compositing-Bug-14577.patch | 80 +++++++++++++++++++ .../xfce4-panel/xfce4-panel_4.13.4.bb | 1 + 2 files changed, 81 insertions(+)create mode 100644
meta-xfce/recipes-xfce/xfce4-panel/files/0002-systray-Fix-icons-without-compositing-Bug-14577.patchmeta-xfce/recipes-xfce/xfce4-panel/files/0002-systray-Fix-icons-without-compositing-Bug-14577.patch new file +80
-0@@ -0,0 +1,80 @@ +From f6f70cce417fd2982c2ce6f01016ed01deb6a9ae Mon Sep 17 00:00:00 2001 +From: "Ivan A. Melnikov" <[email protected]> +Date: Mon, 23 Sep 2019 16:18:10 +0400 +Subject: [PATCH] systray: Fix icons without compositing (Bug #14577) + +Wrapper window uses RGBA visual when it's available; +systray manager should try to do the same for +the transparent or parent-relative background to work. + +That means that the manager and icons will work with +RGBA visual even if the screen is not compositing; so +we should always force-redraw the icons. + +Upstream-Status: Accepted [1] + +[1] https://git.xfce.org/xfce/xfce4-panel/commit?id=f6f70cce417fd2982c2ce6f01016ed01deb6a9ae + +Refs: https://bugzilla.xfce.org/show_bug.cgi?id=14577 +Signed-off-by: Ivan A. Melnikov <[email protected]> +--- + plugins/systray/systray-manager.c | 10 ++++++---- + plugins/systray/systray.c | 10 ---------- + 2 files changed, 6 insertions(+), 14 deletions(-) + +diff --git a/plugins/systray/systray-manager.c b/plugins/systray/systray-manager.c +index 68836554..4915649c 100644 +--- a/plugins/systray/systray-manager.c ++++ b/plugins/systray/systray-manager.c +@@ -751,6 +751,7 @@ static void + systray_manager_set_visual (SystrayManager *manager) + { + GdkDisplay *display; ++ GdkVisual *visual; + Visual *xvisual; + Atom visual_atom; + gulong data[1]; +@@ -768,11 +769,12 @@ systray_manager_set_visual (SystrayManager *manager) + visual_atom = gdk_x11_get_xatom_by_name_for_display (display, + "_NET_SYSTEM_TRAY_VISUAL"); + +- if (gdk_screen_is_composited (gtk_widget_get_screen (manager->invisible)) +- && (gdk_screen_get_rgba_visual (screen) != NULL)) ++ visual = gdk_screen_get_rgba_visual (screen); ++ panel_debug (PANEL_DEBUG_SYSTRAY, "rgba visual is %p", visual); ++ if (visual != NULL) + { +- /* get the rgba visual */ +- xvisual = GDK_VISUAL_XVISUAL (gdk_screen_get_rgba_visual (screen)); ++ /* use the rgba visual */ ++ xvisual = GDK_VISUAL_XVISUAL (visual); + } + else + { +diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c +index 3fb9520c..beae1973 100644 +--- a/plugins/systray/systray.c ++++ b/plugins/systray/systray.c +@@ -728,19 +728,9 @@ systray_plugin_box_draw (GtkWidget *box, + gpointer user_data) + { + SystrayPlugin *plugin = XFCE_SYSTRAY_PLUGIN (user_data); +- GdkScreen *screen; +- + panel_return_if_fail (XFCE_IS_SYSTRAY_PLUGIN (plugin)); + panel_return_if_fail (cr != NULL); + +- screen = gtk_widget_get_screen (GTK_WIDGET (plugin)); +- +- if (G_LIKELY (screen != NULL)) +- { +- if (!gdk_screen_is_composited (screen)) +- return; +- } +- + /* separately draw all the composed tray icons after gtk + * handled the draw event */ + gtk_container_foreach (GTK_CONTAINER (box), +-- +2.21.0 +meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.4.bb +1
-0@@ -12,6 +12,7 @@ SRC_URI[md5sum] = "c0f132fed2110d37f351aadc9e80a034" SRC_URI[sha256sum] = "36ffd26ef7f5867c01ba310475b4358ff0e588cfd5599a266f0037a6c20052a1" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ + file://0002-systray-Fix-icons-without-compositing-Bug-14577.patch \ " python populate_packages_prepend() {
Signature · 1 line
Kai Kang