Date: Saturday, October 15, 2016 @ 09:17:56
  Author: bgyorgy
Revision: 192289

upgpkg: budgie-desktop 10.2.7-3

Apply some upstream fixes (FS#51380)

Added:
  budgie-desktop/trunk/fallback-icons.patch
  budgie-desktop/trunk/fix-warnings.patch
Modified:
  budgie-desktop/trunk/PKGBUILD
Deleted:
  budgie-desktop/trunk/0001-Raven-Trigger-use-standard-icons.patch

---------------------------------------------+
 0001-Raven-Trigger-use-standard-icons.patch |   39 -----
 PKGBUILD                                    |   23 ++
 fallback-icons.patch                        |  201 ++++++++++++++++++++++++++
 fix-warnings.patch                          |   56 +++++++
 4 files changed, 273 insertions(+), 46 deletions(-)

Deleted: 0001-Raven-Trigger-use-standard-icons.patch
===================================================================
--- 0001-Raven-Trigger-use-standard-icons.patch 2016-10-15 06:45:48 UTC (rev 
192288)
+++ 0001-Raven-Trigger-use-standard-icons.patch 2016-10-15 09:17:56 UTC (rev 
192289)
@@ -1,39 +0,0 @@
-From 1b62110e6f5af4396a13528bab95963a1248e51a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@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-15 06:45:48 UTC (rev 192288)
+++ PKGBUILD    2016-10-15 09:17:56 UTC (rev 192289)
@@ -5,7 +5,7 @@
 _helper_pkgname=budgie-helper
 pkgver=10.2.7
 _helper_gitrev=3b52434b6d1cfe00c5bac1046d323813ce531a55
-pkgrel=2
+pkgrel=3
 pkgdesc="Modern desktop environment from the Solus Project"
 arch=('i686' 'x86_64')
 url="https://solus-project.com/budgie";
@@ -18,21 +18,30 @@
             '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";
-        "0001-Raven-Trigger-use-standard-icons.patch")
+        "fix-warnings.patch"
+        "fallback-icons.patch")
 sha256sums=('abfd35666764fabc39960dd298834e52d5cd7d7f2f3e1b5de77cfe1fe9090bad'
             '3a4d7dd7c95ccba4e2916adf4a14769ffe54e8f86ed302d0268cd312b2a85c0e'
-            'a1ef238cc9ae1763a15d59ae7bceb2f76f3c5966b7f99e347a55dd38e2e92538')
+            '7758c8465b96861445aed6697d13ddd00b5674665c180044bd68db94ba172da7'
+            'e98b57fae4afe03d4c24ce5995024809767c3662eec86d5201fe3dbefe333346')
 
 prepare() {
        cd $pkgname-$pkgver
 
-       # Raven Trigger: use standard icons
-       # https://github.com/solus-project/budgie-desktop/pull/637
-       patch -Np1 -i ../0001-Raven-Trigger-use-standard-icons.patch
+       # panel: Chain methods to fix GtkBox allocation spam every half second
+       # 
https://github.com/solus-project/budgie-desktop/commit/ff3d7c9c0fc17f4fb23c172f8c8874ab4a7d6602
+       patch -Np1 -i ../fix-warnings.patch
 
+       # data: Add fallback icons for pane-{hide,show}-symbolic 
+       # 
https://github.com/solus-project/budgie-desktop/commit/0634f87fa164e4dc8b8185834867ea43a8430d02
+       patch -Np1 -i ../fallback-icons.patch
+
        # Fix theme for GTK+ 3.22
-       sed -i 's/font:1;//' theme/3.20/theme.css
+       # 
https://github.com/solus-project/budgie-desktop/commit/8bda4cab14720d59d595ab4aa32644a830939ac0
+       sed -i 's/font:1;/font-size:1px;/' theme/3.20/theme{,_hc}.css
 
+       autoreconf -fi
+
        # Provide better compatibility for GNOME
        # https://github.com/solus-project/budgie-desktop/issues/261
        cd "$srcdir/$_helper_pkgname-$_helper_gitrev"

Added: fallback-icons.patch
===================================================================
--- fallback-icons.patch                                (rev 0)
+++ fallback-icons.patch        2016-10-15 09:17:56 UTC (rev 192289)
@@ -0,0 +1,201 @@
+From 0634f87fa164e4dc8b8185834867ea43a8430d02 Mon Sep 17 00:00:00 2001
+From: Ikey Doherty <i...@solus-project.com>
+Date: Mon, 10 Oct 2016 21:58:36 +0100
+Subject: [PATCH] data: Add fallback icons for pane-{hide,show}-symbolic
+
+These icons are from horst3180 and will be used in the absence of these
+named icons within the icon theme itself, i.e. when using Adwaita or such.
+This is intended to be a better solution than patching to use GNOME icon
+names as seen in PR #637.
+
+Signed-off-by: Ikey Doherty <i...@solus-project.com>
+---
+ data/Makefile.am                  |  6 +++-
+ data/icons/README                 |  2 ++
+ data/icons/pane-hide-symbolic.svg | 74 +++++++++++++++++++++++++++++++++++++++
+ data/icons/pane-show-symbolic.svg | 74 +++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 155 insertions(+), 1 deletion(-)
+ create mode 100644 data/icons/pane-hide-symbolic.svg
+ create mode 100644 data/icons/pane-show-symbolic.svg
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 59d563c..974c49a 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -3,6 +3,8 @@ EXTRA_DIST = \
+       com.solus-project.budgie-panel.gschema.xml \
+       budgie-panel.gresource.xml \
+       icons/notification-alert-symbolic.svg \
++      icons/pane-hide-symbolic.svg \
++      icons/pane-show-symbolic.svg \
+       panel.ini
+ 
+ gsettings_SCHEMAS = \
+@@ -17,4 +19,6 @@ app_DATA = \
+ 
+ iconsdir = $(datadir)/icons/hicolor/scalable/actions
+ icons_DATA = \
+-      icons/notification-alert-symbolic.svg
++      icons/notification-alert-symbolic.svg \
++      icons/pane-hide-symbolic.svg \
++      icons/pane-show-symbolic.svg
+diff --git a/data/icons/pane-hide-symbolic.svg 
b/data/icons/pane-hide-symbolic.svg
+new file mode 100644
+index 0000000..6150010
+--- /dev/null
++++ b/data/icons/pane-hide-symbolic.svg
+@@ -0,0 +1,74 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Inkscape (http://www.inkscape.org/) -->
++
++<svg
++   xmlns:dc="http://purl.org/dc/elements/1.1/";
++   xmlns:cc="http://creativecommons.org/ns#";
++   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
++   xmlns:svg="http://www.w3.org/2000/svg";
++   xmlns="http://www.w3.org/2000/svg";
++   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
++   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
++   width="16"
++   height="16"
++   viewBox="0 0 16 16"
++   id="svg2"
++   version="1.1"
++   inkscape:version="0.91 r13725"
++   sodipodi:docname="pane-hide-symbolic.svg">
++  <defs
++     id="defs4" />
++  <sodipodi:namedview
++     id="base"
++     pagecolor="#383838"
++     bordercolor="#666666"
++     borderopacity="1.0"
++     inkscape:pageopacity="0"
++     inkscape:pageshadow="2"
++     inkscape:zoom="1"
++     inkscape:cx="4.8493875"
++     inkscape:cy="9.1519684"
++     inkscape:document-units="px"
++     inkscape:current-layer="layer1"
++     showgrid="false"
++     units="px"
++     inkscape:snap-bbox="true"
++     inkscape:bbox-paths="true"
++     inkscape:bbox-nodes="true"
++     inkscape:snap-bbox-edge-midpoints="true"
++     inkscape:showpageshadow="false"
++     inkscape:snap-bbox-midpoints="true">
++    <inkscape:grid
++       type="xygrid"
++       id="grid4136" />
++  </sodipodi:namedview>
++  <metadata
++     id="metadata7">
++    <rdf:RDF>
++      <cc:Work
++         rdf:about="">
++        <dc:format>image/svg+xml</dc:format>
++        <dc:type
++           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
++        <dc:title></dc:title>
++      </cc:Work>
++    </rdf:RDF>
++  </metadata>
++  <g
++     inkscape:label="Ebene 1"
++     inkscape:groupmode="layer"
++     id="layer1"
++     transform="translate(0,-1036.3622)">
++    <path
++       
style="opacity:1;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
++       d="m 2,1040.8622 4.7,3.5 -4.7,3.5 z"
++       id="rect4143"
++       inkscape:connector-curvature="0"
++       sodipodi:nodetypes="cccc" />
++    <path
++       
style="opacity:1;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
++       d="m 13,1037.3622 0,14 -10,0 0,-2.0059 a 1.80018,1.80018 0 0 0 
0.074219,-0.049 L 5,1047.8739 l 0,1.4883 6,0 0,-10 -6,0 0,1.4902 
-1.925781,-1.4336 A 1.80018,1.80018 0 0 0 3,1039.3681 l 0,-2.0059 10,0 z"
++       id="rect4136-3"
++       inkscape:connector-curvature="0" />
++  </g>
++</svg>
+diff --git a/data/icons/pane-show-symbolic.svg 
b/data/icons/pane-show-symbolic.svg
+new file mode 100644
+index 0000000..95e9177
+--- /dev/null
++++ b/data/icons/pane-show-symbolic.svg
+@@ -0,0 +1,74 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Inkscape (http://www.inkscape.org/) -->
++
++<svg
++   xmlns:dc="http://purl.org/dc/elements/1.1/";
++   xmlns:cc="http://creativecommons.org/ns#";
++   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
++   xmlns:svg="http://www.w3.org/2000/svg";
++   xmlns="http://www.w3.org/2000/svg";
++   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
++   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
++   width="16"
++   height="16"
++   viewBox="0 0 16 16"
++   id="svg2"
++   version="1.1"
++   inkscape:version="0.91 r13725"
++   sodipodi:docname="pane-show-symbolic.svg">
++  <defs
++     id="defs4" />
++  <sodipodi:namedview
++     id="base"
++     pagecolor="#383838"
++     bordercolor="#666666"
++     borderopacity="1.0"
++     inkscape:pageopacity="0"
++     inkscape:pageshadow="2"
++     inkscape:zoom="1"
++     inkscape:cx="4.4277755"
++     inkscape:cy="8.5384952"
++     inkscape:document-units="px"
++     inkscape:current-layer="layer1"
++     showgrid="false"
++     units="px"
++     inkscape:snap-bbox="true"
++     inkscape:bbox-paths="true"
++     inkscape:bbox-nodes="true"
++     inkscape:snap-bbox-edge-midpoints="true"
++     inkscape:showpageshadow="false">
++    <inkscape:grid
++       type="xygrid"
++       id="grid4136" />
++  </sodipodi:namedview>
++  <metadata
++     id="metadata7">
++    <rdf:RDF>
++      <cc:Work
++         rdf:about="">
++        <dc:format>image/svg+xml</dc:format>
++        <dc:type
++           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
++        <dc:title></dc:title>
++      </cc:Work>
++    </rdf:RDF>
++  </metadata>
++  <g
++     inkscape:label="Ebene 1"
++     inkscape:groupmode="layer"
++     id="layer1"
++     transform="translate(0,-1036.3622)">
++    <path
++       
style="opacity:1;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
++       d="m 13,1037.3622 0,14 -10,0 0,-3.5508 2,1.5508 6,0 0,-10 -6,0 
-2,1.5527 0,-3.5527 z"
++       id="rect4138-3-7-5"
++       inkscape:connector-curvature="0"
++       sodipodi:nodetypes="ccccccccccc" />
++    <path
++       
style="opacity:1;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
++       d="m 6,1040.8622 -4.7,3.5 4.7,3.5 z"
++       id="rect4143"
++       inkscape:connector-curvature="0"
++       sodipodi:nodetypes="cccc" />
++  </g>
++</svg>

Added: fix-warnings.patch
===================================================================
--- fix-warnings.patch                          (rev 0)
+++ fix-warnings.patch  2016-10-15 09:17:56 UTC (rev 192289)
@@ -0,0 +1,56 @@
+From ff3d7c9c0fc17f4fb23c172f8c8874ab4a7d6602 Mon Sep 17 00:00:00 2001
+From: Ikey Doherty <i...@solus-project.com>
+Date: Fri, 7 Oct 2016 01:43:58 +0100
+Subject: [PATCH] panel: Chain methods to fix GtkBox allocation spam every half
+ second
+
+In newer versions of GTK (Notably, 3.20 onwards) we're spammed every second
+or so with debug messages regarding the size allocation. In reality, this
+is ticked by the clock update and any other applets requiring refresh.
+
+As such we now chain the method to the base methods and ensure that the
+internal state machine is updated accordingly, saving us from ridiculous
+levels of spam in the journal and a complete inability to debug the panel.
+
+This resolves issue #532 and it's duplicates.
+
+Signed-off-by: Ikey Doherty <i...@solus-project.com>
+---
+ panel/panel.vala | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/panel/panel.vala b/panel/panel.vala
+index b2543be..d4e4a0d 100644
+--- a/panel/panel.vala
++++ b/panel/panel.vala
+@@ -871,22 +871,30 @@ public class Panel : Budgie.Toplevel
+ 
+     public override void get_preferred_width(out int m, out int n)
+     {
++        int x, j;
++        base.get_preferred_width(out x, out j);
+         m = scr.width;
+         n = scr.width;
+     }
+     public override void get_preferred_width_for_height(int h, out int m, out 
int n)
+     {
++        int x, j;
++        base.get_preferred_width_for_height(h, out x, out j);
+         m = scr.width;
+         n = scr.width;
+     }
+ 
+     public override void get_preferred_height(out int m, out int n)
+     {
++        int x, j;
++        base.get_preferred_height(out x, out j);
+         m = scr.height;
+         n = scr.height;
+     }
+     public override void get_preferred_height_for_width(int w, out int m, out 
int n)
+     {
++        int x, j;
++        base.get_preferred_height_for_width(w, out x, out j);
+         m = scr.height;
+         n = scr.height;
+     }

Reply via email to