[arch-commits] Commit in budgie-desktop/trunk (PKGBUILD fix-workspaces-applet.patch)

[Balló György]

    Date: Monday, July 25, 2016 @ 05:16:13
  Author: bgyorgy
Revision: 183941

upgpkg: budgie-desktop 10.2.6-2

Fix workspaces applet

Added:
  budgie-desktop/trunk/fix-workspaces-applet.patch
Modified:
  budgie-desktop/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   15 +++++++------
 fix-workspaces-applet.patch |   46 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-25 04:56:48 UTC (rev 183940)
+++ PKGBUILD	2016-07-25 05:16:13 UTC (rev 183941)
@@ -5,7 +5,7 @@
 _helper_pkgname=budgie-helper
 pkgver=10.2.6
 _helper_gitrev=3b52434b6d1cfe00c5bac1046d323813ce531a55
-pkgrel=1
+pkgrel=2
 pkgdesc="Modern desktop environment from the Solus Project"
 arch=('i686' 'x86_64')
 url="https://solus-project.com/budgie"
@@ -17,17 +17,18 @@
             'gnome-screensaver: Lock screen'
             'network-manager-applet: Network management')
 source=("https://github.com/solus-project/budgie-desktop/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz"
-        "$_helper_pkgname-$_helper_gitrev.tar.gz::https://codeload.github.com/City-busz/$_helper_pkgname/tar.gz/$_helper_gitrev")
+        "$_helper_pkgname-$_helper_gitrev.tar.gz::https://codeload.github.com/City-busz/$_helper_pkgname/tar.gz/$_helper_gitrev"
+        "fix-workspaces-applet.patch")
 sha256sums=('88febba5dbf5456a1573753be836d17c261971ccefcb4b56370b5bf053e9b659'
-            '3a4d7dd7c95ccba4e2916adf4a14769ffe54e8f86ed302d0268cd312b2a85c0e')
+            '3a4d7dd7c95ccba4e2916adf4a14769ffe54e8f86ed302d0268cd312b2a85c0e'
+            'd6e439410dd67d8a89ca5340fe9678b8a6e4b4a6c5e06f03a05a2507ead3d1b8')
 
 prepare() {
 	cd $pkgname-$pkgver
 
-	# Disable workspaces applet as it's broken
-	# https://github.com/solus-project/budgie-desktop/issues/302
-	sed -i ':a;N;$!ba;s/ \\\n\tworkspaces//' panel/applets/Makefile.am
-	autoreconf -fi
+	# Fix workspaces applet to prevent crash
+	# https://github.com/solus-project/budgie-desktop/pull/509
+	patch -Np1 -i ../fix-workspaces-applet.patch
 
 	# Provide better compatibility for GNOME
 	# https://github.com/solus-project/budgie-desktop/issues/261

Added: fix-workspaces-applet.patch
===================================================================
--- fix-workspaces-applet.patch	                        (rev 0)
+++ fix-workspaces-applet.patch	2016-07-25 05:16:13 UTC (rev 183941)
@@ -0,0 +1,46 @@
+From 582060d816563a83ceff1cceefa097ce7c33e3cf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= <ballogyor at gmail.com>
+Date: Mon, 25 Jul 2016 06:58:34 +0200
+Subject: [PATCH] workspaces-applet: Really fix panel crash (issue #302)
+
+This reverts commit 9422bb1563ac42759087b64d531898d567748b1e and add the set_size_request line to prevent the crash.
+---
+ panel/applets/workspaces/WorkspacesApplet.vala | 21 ++-------------------
+ 1 file changed, 2 insertions(+), 19 deletions(-)
+
+diff --git a/panel/applets/workspaces/WorkspacesApplet.vala b/panel/applets/workspaces/WorkspacesApplet.vala
+index 39e023c..b41e855 100644
+--- a/panel/applets/workspaces/WorkspacesApplet.vala
++++ b/panel/applets/workspaces/WorkspacesApplet.vala
+@@ -21,29 +21,12 @@ public class WorkspacesApplet : Budgie.Applet
+ {
+ 
+     Wnck.Pager? widget;
+-    Gtk.EventBox? box;
+ 
+     public WorkspacesApplet()
+     {
+-        box = new Gtk.EventBox();
+-        add(box);
+-
+-        show_all();
+-
+-        realize.connect_after(()=> {
+-            maybe_integrate_pager();
+-        });
+-    }
+-
+-    public void maybe_integrate_pager()
+-    {
+-        if (widget != null) {
+-            return;
+-        }
+-
+         widget = new Wnck.Pager();
+-
+-        box.add(widget);
++        widget.set_size_request (0, 0);
++        add(widget);
+         show_all();
+     }
+ }