[arch-commits] Commit in budgie-desktop/trunk (2 files)

[Balló György]

    Date: Saturday, June 29, 2019 @ 18:29:47
  Author: bgyorgy
Revision: 485945

upgpkg: budgie-desktop 10.5-2

Remove budgie-helper. Workarounds are no longer needed, other modules are not so important

Added:
  budgie-desktop/trunk/00_budgie-desktop.gschema.override
Modified:
  budgie-desktop/trunk/PKGBUILD

------------------------------------+
 00_budgie-desktop.gschema.override |    2 ++
 PKGBUILD                           |   21 ++++-----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

Added: 00_budgie-desktop.gschema.override
===================================================================
--- 00_budgie-desktop.gschema.override	                        (rev 0)
+++ 00_budgie-desktop.gschema.override	2019-06-29 18:29:47 UTC (rev 485945)
@@ -0,0 +1,2 @@
+[org.gnome.desktop.background:Budgie]
+picture-uri='file:///usr/share/backgrounds/gnome/adwaita-day.jpg'

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-29 17:29:30 UTC (rev 485944)
+++ PKGBUILD	2019-06-29 18:29:47 UTC (rev 485945)
@@ -1,10 +1,8 @@
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=budgie-desktop
-_helper_pkgname=budgie-helper
 pkgver=10.5
-_helper_gitrev=3b52434b6d1cfe00c5bac1046d323813ce531a55
-pkgrel=1
+pkgrel=2
 pkgdesc="Modern desktop environment from the Solus Project"
 arch=('x86_64')
 url="https://budgie-desktop.org/"
@@ -19,12 +17,12 @@
 source=("git+https://github.com/budgie-desktop/budgie-desktop.git#commit=$_commit"
         "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
         "gnome-3.32.patch"
-        "$_helper_pkgname-$_helper_gitrev.tar.gz::https://codeload.github.com/City-busz/$_helper_pkgname/tar.gz/$_helper_gitrev")
+        "00_budgie-desktop.gschema.override")
 validpgpkeys=('8876CC8EDAEC52CEAB7742E778E2387015C1205F') # Ikey Doherty (Solus Project Founder)
 sha256sums=('SKIP'
             'SKIP'
             'aaf114147ef494224d4d151f788361ceccffdd5be7bc4b0a8de0b66ef5f48610'
-            '3a4d7dd7c95ccba4e2916adf4a14769ffe54e8f86ed302d0268cd312b2a85c0e')
+            '94b56c7a8efaa12c43485c4592f520d166448e9c9277d0fba71408c1a501bd33')
 
 pkgver() {
 	cd $pkgname
@@ -40,25 +38,14 @@
 
 	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
-	cd "$srcdir/$_helper_pkgname-$_helper_gitrev"
-	NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
 	arch-meson $pkgname build -D with-desktop-icons=none
 	ninja -C build
-
-	cd "$srcdir/$_helper_pkgname-$_helper_gitrev"
-	./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile --disable-Werror
-	make
 }
 
 package() {
 	DESTDIR="$pkgdir" meson install -C build
-
-	cd "$srcdir/$_helper_pkgname-$_helper_gitrev"
-	make DESTDIR="$pkgdir" install
+	install -Dm644 00_budgie-desktop.gschema.override "$pkgdir/usr/share/glib-2.0/schemas/00_budgie-desktop.gschema.override"
 }