[arch-commits] Commit in budgie-desktop/repos (6 files)
Balló György
bgyorgy at archlinux.org
Mon Jul 25 05:16:24 UTC 2016
Date: Monday, July 25, 2016 @ 05:16:23
Author: bgyorgy
Revision: 183942
archrelease: copy trunk to community-i686, community-x86_64
Added:
budgie-desktop/repos/community-i686/PKGBUILD
(from rev 183941, budgie-desktop/trunk/PKGBUILD)
budgie-desktop/repos/community-i686/fix-workspaces-applet.patch
(from rev 183941, budgie-desktop/trunk/fix-workspaces-applet.patch)
budgie-desktop/repos/community-x86_64/PKGBUILD
(from rev 183941, budgie-desktop/trunk/PKGBUILD)
budgie-desktop/repos/community-x86_64/fix-workspaces-applet.patch
(from rev 183941, budgie-desktop/trunk/fix-workspaces-applet.patch)
Deleted:
budgie-desktop/repos/community-i686/PKGBUILD
budgie-desktop/repos/community-x86_64/PKGBUILD
----------------------------------------------+
/PKGBUILD | 118 +++++++++++++++++++++++++
community-i686/PKGBUILD | 58 ------------
community-i686/fix-workspaces-applet.patch | 46 +++++++++
community-x86_64/PKGBUILD | 58 ------------
community-x86_64/fix-workspaces-applet.patch | 46 +++++++++
5 files changed, 210 insertions(+), 116 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-07-25 05:16:13 UTC (rev 183941)
+++ community-i686/PKGBUILD 2016-07-25 05:16:23 UTC (rev 183942)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=budgie-desktop
-_helper_pkgname=budgie-helper
-pkgver=10.2.6
-_helper_gitrev=3b52434b6d1cfe00c5bac1046d323813ce531a55
-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')
-makedepends=('autoconf-archive' 'git' 'gobject-introspection' 'intltool' 'vala')
-optdepends=('gnome-backgrounds: Default background'
- 'gnome-control-center: System settings'
- '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")
-sha256sums=('88febba5dbf5456a1573753be836d17c261971ccefcb4b56370b5bf053e9b659'
- '3a4d7dd7c95ccba4e2916adf4a14769ffe54e8f86ed302d0268cd312b2a85c0e')
-
-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
-
- # Provide better compatibility for GNOME
- # https://github.com/solus-project/budgie-desktop/issues/261
- cd "$srcdir/$_helper_pkgname-$_helper_gitrev"
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-
- cd "$srcdir/$_helper_pkgname-$_helper_gitrev"
- ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile --disable-Werror
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-
- cd "$srcdir/$_helper_pkgname-$_helper_gitrev"
- make DESTDIR="$pkgdir" install
-}
Copied: budgie-desktop/repos/community-i686/PKGBUILD (from rev 183941, budgie-desktop/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-07-25 05:16:23 UTC (rev 183942)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=budgie-desktop
+_helper_pkgname=budgie-helper
+pkgver=10.2.6
+_helper_gitrev=3b52434b6d1cfe00c5bac1046d323813ce531a55
+pkgrel=2
+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')
+makedepends=('autoconf-archive' 'git' 'gobject-introspection' 'intltool' 'vala')
+optdepends=('gnome-backgrounds: Default background'
+ 'gnome-control-center: System settings'
+ '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"
+ "fix-workspaces-applet.patch")
+sha256sums=('88febba5dbf5456a1573753be836d17c261971ccefcb4b56370b5bf053e9b659'
+ '3a4d7dd7c95ccba4e2916adf4a14769ffe54e8f86ed302d0268cd312b2a85c0e'
+ 'd6e439410dd67d8a89ca5340fe9678b8a6e4b4a6c5e06f03a05a2507ead3d1b8')
+
+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
+
+ # Provide better compatibility for GNOME
+ # https://github.com/solus-project/budgie-desktop/issues/261
+ cd "$srcdir/$_helper_pkgname-$_helper_gitrev"
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+
+ cd "$srcdir/$_helper_pkgname-$_helper_gitrev"
+ ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile --disable-Werror
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ cd "$srcdir/$_helper_pkgname-$_helper_gitrev"
+ make DESTDIR="$pkgdir" install
+}
Copied: budgie-desktop/repos/community-i686/fix-workspaces-applet.patch (from rev 183941, budgie-desktop/trunk/fix-workspaces-applet.patch)
===================================================================
--- community-i686/fix-workspaces-applet.patch (rev 0)
+++ community-i686/fix-workspaces-applet.patch 2016-07-25 05:16:23 UTC (rev 183942)
@@ -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();
+ }
+ }
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-07-25 05:16:13 UTC (rev 183941)
+++ community-x86_64/PKGBUILD 2016-07-25 05:16:23 UTC (rev 183942)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=budgie-desktop
-_helper_pkgname=budgie-helper
-pkgver=10.2.6
-_helper_gitrev=3b52434b6d1cfe00c5bac1046d323813ce531a55
-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')
-makedepends=('autoconf-archive' 'git' 'gobject-introspection' 'intltool' 'vala')
-optdepends=('gnome-backgrounds: Default background'
- 'gnome-control-center: System settings'
- '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")
-sha256sums=('88febba5dbf5456a1573753be836d17c261971ccefcb4b56370b5bf053e9b659'
- '3a4d7dd7c95ccba4e2916adf4a14769ffe54e8f86ed302d0268cd312b2a85c0e')
-
-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
-
- # Provide better compatibility for GNOME
- # https://github.com/solus-project/budgie-desktop/issues/261
- cd "$srcdir/$_helper_pkgname-$_helper_gitrev"
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-
- cd "$srcdir/$_helper_pkgname-$_helper_gitrev"
- ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile --disable-Werror
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-
- cd "$srcdir/$_helper_pkgname-$_helper_gitrev"
- make DESTDIR="$pkgdir" install
-}
Copied: budgie-desktop/repos/community-x86_64/PKGBUILD (from rev 183941, budgie-desktop/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-07-25 05:16:23 UTC (rev 183942)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=budgie-desktop
+_helper_pkgname=budgie-helper
+pkgver=10.2.6
+_helper_gitrev=3b52434b6d1cfe00c5bac1046d323813ce531a55
+pkgrel=2
+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')
+makedepends=('autoconf-archive' 'git' 'gobject-introspection' 'intltool' 'vala')
+optdepends=('gnome-backgrounds: Default background'
+ 'gnome-control-center: System settings'
+ '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"
+ "fix-workspaces-applet.patch")
+sha256sums=('88febba5dbf5456a1573753be836d17c261971ccefcb4b56370b5bf053e9b659'
+ '3a4d7dd7c95ccba4e2916adf4a14769ffe54e8f86ed302d0268cd312b2a85c0e'
+ 'd6e439410dd67d8a89ca5340fe9678b8a6e4b4a6c5e06f03a05a2507ead3d1b8')
+
+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
+
+ # Provide better compatibility for GNOME
+ # https://github.com/solus-project/budgie-desktop/issues/261
+ cd "$srcdir/$_helper_pkgname-$_helper_gitrev"
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+
+ cd "$srcdir/$_helper_pkgname-$_helper_gitrev"
+ ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile --disable-Werror
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ cd "$srcdir/$_helper_pkgname-$_helper_gitrev"
+ make DESTDIR="$pkgdir" install
+}
Copied: budgie-desktop/repos/community-x86_64/fix-workspaces-applet.patch (from rev 183941, budgie-desktop/trunk/fix-workspaces-applet.patch)
===================================================================
--- community-x86_64/fix-workspaces-applet.patch (rev 0)
+++ community-x86_64/fix-workspaces-applet.patch 2016-07-25 05:16:23 UTC (rev 183942)
@@ -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();
+ }
+ }
More information about the arch-commits
mailing list