[arch-commits] Commit in budgie-desktop/trunk (3 files)
Balló György
bgyorgy at archlinux.org
Thu Oct 6 15:41:21 UTC 2016
Date: Thursday, October 6, 2016 @ 15:41:21
Author: bgyorgy
Revision: 191483
upgpkg: budgie-desktop 10.2.7-1
Update to new version
Added:
budgie-desktop/trunk/0001-Raven-Trigger-use-standard-icons.patch
Modified:
budgie-desktop/trunk/PKGBUILD
Deleted:
budgie-desktop/trunk/fix-workspaces-applet.patch
---------------------------------------------+
0001-Raven-Trigger-use-standard-icons.patch | 39 ++++++++++++++++++++++
PKGBUILD | 18 +++++-----
fix-workspaces-applet.patch | 46 --------------------------
3 files changed, 48 insertions(+), 55 deletions(-)
Added: 0001-Raven-Trigger-use-standard-icons.patch
===================================================================
--- 0001-Raven-Trigger-use-standard-icons.patch (rev 0)
+++ 0001-Raven-Trigger-use-standard-icons.patch 2016-10-06 15:41:21 UTC (rev 191483)
@@ -0,0 +1,39 @@
+From 1b62110e6f5af4396a13528bab95963a1248e51a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Thu, 6 Oct 2016 17:20:00 +0200
+Subject: [PATCH] Raven Trigger: use standard icons
+
+pane-show and pane-hide are non-standard icons. Use go-previous and go-next instead.
+---
+ panel/applets/raven-trigger/RavenTriggerApplet.plugin.in | 2 +-
+ panel/applets/raven-trigger/RavenTriggerApplet.vala | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/panel/applets/raven-trigger/RavenTriggerApplet.plugin.in b/panel/applets/raven-trigger/RavenTriggerApplet.plugin.in
+index fbadccc..6d0e2de 100644
+--- a/panel/applets/raven-trigger/RavenTriggerApplet.plugin.in
++++ b/panel/applets/raven-trigger/RavenTriggerApplet.plugin.in
+@@ -5,4 +5,4 @@ _Description=Raven Sidebar Control
+ Authors=Ikey Doherty
+ Copyright=Copyright © 2016 Ikey Doherty
+ Website=https://solus-project.com
+-Icon=pane-show-symbolic
++Icon=go-previous-symbolic
+diff --git a/panel/applets/raven-trigger/RavenTriggerApplet.vala b/panel/applets/raven-trigger/RavenTriggerApplet.vala
+index 1b3697f..899199e 100644
+--- a/panel/applets/raven-trigger/RavenTriggerApplet.vala
++++ b/panel/applets/raven-trigger/RavenTriggerApplet.vala
+@@ -46,8 +46,8 @@ public class RavenTriggerApplet : Budgie.Applet
+ widget.set_can_focus(false);
+ widget.get_style_context().add_class("raven-trigger");
+
+- img_hidden = new Gtk.Image.from_icon_name("pane-show-symbolic", Gtk.IconSize.BUTTON);
+- img_expanded = new Gtk.Image.from_icon_name("pane-hide-symbolic", Gtk.IconSize.BUTTON);
++ img_hidden = new Gtk.Image.from_icon_name("go-previous-symbolic", Gtk.IconSize.BUTTON);
++ img_expanded = new Gtk.Image.from_icon_name("go-next-symbolic", Gtk.IconSize.BUTTON);
+
+ img_stack = new Gtk.Stack();
+ img_stack.add_named(img_hidden, "hidden");
+--
+2.10.0
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-10-06 12:36:30 UTC (rev 191482)
+++ PKGBUILD 2016-10-06 15:41:21 UTC (rev 191483)
@@ -3,14 +3,14 @@
pkgname=budgie-desktop
_helper_pkgname=budgie-helper
-pkgver=10.2.6
+pkgver=10.2.7
_helper_gitrev=3b52434b6d1cfe00c5bac1046d323813ce531a55
-pkgrel=2
+pkgrel=1
pkgdesc="Modern desktop environment from the Solus Project"
arch=('i686' 'x86_64')
url="https://solus-project.com/budgie"
license=('GPL' 'LGPL')
-depends=('gnome-bluetooth' 'gnome-menus' 'gnome-session' 'gnome-themes-standard' 'libpeas' 'libwnck3' 'mutter')
+depends=('accountsservice' 'gnome-bluetooth' 'gnome-menus' 'gnome-session' 'gnome-themes-standard' 'libpeas' 'libwnck3' 'mutter')
makedepends=('autoconf-archive' 'git' 'gobject-introspection' 'intltool' 'vala')
optdepends=('gnome-backgrounds: Default background'
'gnome-control-center: System settings'
@@ -18,17 +18,17 @@
'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"
- "fix-workspaces-applet.patch")
-sha256sums=('88febba5dbf5456a1573753be836d17c261971ccefcb4b56370b5bf053e9b659'
+ "0001-Raven-Trigger-use-standard-icons.patch")
+sha256sums=('abfd35666764fabc39960dd298834e52d5cd7d7f2f3e1b5de77cfe1fe9090bad'
'3a4d7dd7c95ccba4e2916adf4a14769ffe54e8f86ed302d0268cd312b2a85c0e'
- 'd6e439410dd67d8a89ca5340fe9678b8a6e4b4a6c5e06f03a05a2507ead3d1b8')
+ 'a1ef238cc9ae1763a15d59ae7bceb2f76f3c5966b7f99e347a55dd38e2e92538')
prepare() {
cd $pkgname-$pkgver
- # Fix workspaces applet to prevent crash
- # https://github.com/solus-project/budgie-desktop/pull/509
- patch -Np1 -i ../fix-workspaces-applet.patch
+ # Raven Trigger: use standard icons
+ # https://github.com/solus-project/budgie-desktop/pull/637
+ patch -Np1 -i ../0001-Raven-Trigger-use-standard-icons.patch
# Provide better compatibility for GNOME
# https://github.com/solus-project/budgie-desktop/issues/261
Deleted: fix-workspaces-applet.patch
===================================================================
--- fix-workspaces-applet.patch 2016-10-06 12:36:30 UTC (rev 191482)
+++ fix-workspaces-applet.patch 2016-10-06 15:41:21 UTC (rev 191483)
@@ -1,46 +0,0 @@
-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();
- }
- }
More information about the arch-commits
mailing list