[arch-commits] Commit in xfce4-panel/trunk (2 files)

[Evangelos Foutras]

    Date: Thursday, September 26, 2019 @ 06:53:08
  Author: foutrelis
Revision: 363431

upgpkg: xfce4-panel 4.14.1-1

New upstream release.

Modified:
  xfce4-panel/trunk/PKGBUILD
Deleted:
  xfce4-panel/trunk/systray-fix-icons-without-compositing.patch

---------------------------------------------+
 PKGBUILD                                    |   13 +---
 systray-fix-icons-without-compositing.patch |   76 --------------------------
 2 files changed, 4 insertions(+), 85 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-26 06:22:26 UTC (rev 363430)
+++ PKGBUILD	2019-09-26 06:53:08 UTC (rev 363431)
@@ -2,8 +2,8 @@
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-panel
-pkgver=4.14.0
-pkgrel=2
+pkgver=4.14.1
+pkgrel=1
 pkgdesc="Panel for the Xfce desktop environment"
 arch=('x86_64')
 url="https://www.xfce.org/"
@@ -12,16 +12,11 @@
 depends=('exo' 'garcon' 'libxfce4ui' 'xfconf' 'libwnck3' 'hicolor-icon-theme'
          'desktop-file-utils')
 makedepends=('intltool' 'gobject-introspection' 'vala')
-source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
-        systray-fix-icons-without-compositing.patch)
-sha256sums=('d5f8f3bd7e142139987e5e62cda26135a424baabb5e47aa0c23b4169d0a66ef4'
-            '684d223dac553d007983ae34b359e198b1b7b4f0b88e8b621654d04ea1060a24')
+source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('9c3c78b49ddfac7d42a804e6a6ad9d22ad64ec60bbe17d8724bc52d3e3f6d114')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  # https://bugzilla.xfce.org/show_bug.cgi?id=14577
-  patch -Np1 -i ../systray-fix-icons-without-compositing.patch
 }
 
 build() {

Deleted: systray-fix-icons-without-compositing.patch
===================================================================
--- systray-fix-icons-without-compositing.patch	2019-09-26 06:22:26 UTC (rev 363430)
+++ systray-fix-icons-without-compositing.patch	2019-09-26 06:53:08 UTC (rev 363431)
@@ -1,76 +0,0 @@
-From f6f70cce417fd2982c2ce6f01016ed01deb6a9ae Mon Sep 17 00:00:00 2001
-From: "Ivan A. Melnikov" <iv at altlinux.org>
-Date: Mon, 23 Sep 2019 16:18:10 +0400
-Subject: 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.
-
-Refs: https://bugzilla.xfce.org/show_bug.cgi?id=14577
-Signed-off-by: Ivan A. Melnikov <iv at altlinux.org>
----
- 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),
--- 
-cgit v1.2.1
-