Date: Sunday, October 15, 2017 @ 14:12:33 Author: bgyorgy Revision: 262910
upgpkg: budgie-desktop 10.4+8+gff09a510-1 Update to new version Modified: budgie-desktop/trunk/PKGBUILD Deleted: budgie-desktop/trunk/07b5ce0a12f8fadba9bb7941b0874db5493ef034.patch budgie-desktop/trunk/c8950712cb95a257e9b08fd11507070f0c221d39.patch ------------------------------------------------+ 07b5ce0a12f8fadba9bb7941b0874db5493ef034.patch | 25 --------------- PKGBUILD | 37 +++++++++++------------ c8950712cb95a257e9b08fd11507070f0c221d39.patch | 26 ---------------- 3 files changed, 19 insertions(+), 69 deletions(-) Deleted: 07b5ce0a12f8fadba9bb7941b0874db5493ef034.patch =================================================================== --- 07b5ce0a12f8fadba9bb7941b0874db5493ef034.patch 2017-10-15 14:07:23 UTC (rev 262909) +++ 07b5ce0a12f8fadba9bb7941b0874db5493ef034.patch 2017-10-15 14:12:33 UTC (rev 262910) @@ -1,25 +0,0 @@ -From 07b5ce0a12f8fadba9bb7941b0874db5493ef034 Mon Sep 17 00:00:00 2001 -From: Ikey Doherty <i...@solus-project.com> -Date: Fri, 26 May 2017 09:30:59 +0100 -Subject: [PATCH] raven: Only deal with a device card when it actually exists - -Signed-off-by: Ikey Doherty <i...@solus-project.com> ---- - src/raven/sound.vala | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/raven/sound.vala b/src/raven/sound.vala -index becd7128..9c74203b 100644 ---- a/src/raven/sound.vala -+++ b/src/raven/sound.vala -@@ -318,6 +318,10 @@ public class SoundWidget : Gtk.Box - } - var device = this.mixer.lookup_output_id(id); - -+ if (device.card == null) { -+ return; -+ } -+ - var card = device.card as Gvc.MixerCard; - var check = new Gtk.RadioButton.with_label_from_widget(this.output_leader, "%s - %s".printf(device.description, card.name)); - (check.get_child() as Gtk.Label).set_ellipsize(Pango.EllipsizeMode.END); Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-10-15 14:07:23 UTC (rev 262909) +++ PKGBUILD 2017-10-15 14:12:33 UTC (rev 262910) @@ -3,37 +3,39 @@ pkgname=budgie-desktop _helper_pkgname=budgie-helper -pkgver=10.3.1 +pkgver=10.4+8+gff09a510 _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=('accountsservice' 'gnome-bluetooth' 'gnome-menus' 'gnome-session' 'gnome-themes-standard' 'libibus' 'libpeas' 'libwnck3' 'mutter') -makedepends=('autoconf-archive' 'git' 'gobject-introspection' 'intltool' 'meson' 'vala') +makedepends=('autoconf-archive' 'git' 'gobject-introspection' 'intltool' 'meson' 'sassc' '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"{,.asc} - "$_helper_pkgname-$_helper_gitrev.tar.gz::https://codeload.github.com/City-busz/$_helper_pkgname/tar.gz/$_helper_gitrev" - 07b5ce0a12f8fadba9bb7941b0874db5493ef034.patch - c8950712cb95a257e9b08fd11507070f0c221d39.patch) +_commit=ff09a5104075e9774d8f600b875e9871eccb04f8 # master +source=("git+https://github.com/budgie-desktop/budgie-desktop.git#commit=$_commit" + "git+https://git.gnome.org/browse/libgnome-volume-control" + "$_helper_pkgname-$_helper_gitrev.tar.gz::https://codeload.github.com/City-busz/$_helper_pkgname/tar.gz/$_helper_gitrev") validpgpkeys=('8876CC8EDAEC52CEAB7742E778E2387015C1205F') # Ikey Doherty (Solus Project Founder) -sha256sums=('c19a5ac3f5cd1d142a87efded62f8a1750eb2af25102ff151da9201353a18b84' +sha256sums=('SKIP' 'SKIP' - '3a4d7dd7c95ccba4e2916adf4a14769ffe54e8f86ed302d0268cd312b2a85c0e' - '3f1c3b9d1ace34fcfb8d16f402336e5b427246a637cde0796101228970664b4c' - '5bf292668f8a11ea5ba0f50ec791c9edf11cfbd70374e5ce302769b48d47056f') + '3a4d7dd7c95ccba4e2916adf4a14769ffe54e8f86ed302d0268cd312b2a85c0e') +pkgver() { + cd $pkgname + git describe --tags | sed 's/^v//;s/-/+/g' +} + prepare() { mkdir build - cd $pkgname-$pkgver + cd $pkgname - # Fix crash (FS#54679) - patch -Np1 -i ../07b5ce0a12f8fadba9bb7941b0874db5493ef034.patch - patch -Np1 -i ../c8950712cb95a257e9b08fd11507070f0c221d39.patch + git config --local submodule.subprojects/gvc.url "$srcdir/libgnome-volume-control" + git submodule update --init # Provide better compatibility for GNOME # https://github.com/solus-project/budgie-desktop/issues/261 @@ -43,9 +45,8 @@ build() { cd build - meson --prefix=/usr --buildtype=release ../$pkgname-$pkgver \ - --sysconfdir=/etc \ - -Dwith-gtk-doc=false + meson --prefix=/usr --buildtype=release ../$pkgname \ + --sysconfdir=/etc ninja cd "$srcdir/$_helper_pkgname-$_helper_gitrev" Deleted: c8950712cb95a257e9b08fd11507070f0c221d39.patch =================================================================== --- c8950712cb95a257e9b08fd11507070f0c221d39.patch 2017-10-15 14:07:23 UTC (rev 262909) +++ c8950712cb95a257e9b08fd11507070f0c221d39.patch 2017-10-15 14:12:33 UTC (rev 262910) @@ -1,26 +0,0 @@ -From c8950712cb95a257e9b08fd11507070f0c221d39 Mon Sep 17 00:00:00 2001 -From: Ikey Doherty <i...@solus-project.com> -Date: Sun, 28 May 2017 00:22:44 +0100 -Subject: [PATCH] raven: Mirror the last fix and ensure removed Things have - cards too - -Signed-off-by: Ikey Doherty <i...@solus-project.com> ---- - src/raven/sound.vala | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/raven/sound.vala b/src/raven/sound.vala -index 9c74203b..8ca6895d 100644 ---- a/src/raven/sound.vala -+++ b/src/raven/sound.vala -@@ -347,6 +347,10 @@ public class SoundWidget : Gtk.Box - } - var device = this.mixer.lookup_input_id(id); - -+ if (device.card == null) { -+ return; -+ } -+ - var card = device.card as Gvc.MixerCard; - var check = new Gtk.RadioButton.with_label_from_widget(this.input_leader, "%s - %s".printf(device.description, card.name)); - (check.get_child() as Gtk.Label).set_ellipsize(Pango.EllipsizeMode.END);