Standardize pantheon pkgbuilds; don't overwrite lightdm or gtk config

2 files changed, 20 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 78c9c546c132..4a3e99fbcada 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,7 +5,6 @@ pkgbase = pantheon-qq-default-settings-git
 	url = https://github.com/elementary/default-settings
 	arch = any
 	groups = pantheon-qq
-	groups = pantheon-unstable
 	license = GPL
 	makedepends = git
 	makedepends = meson
diff --git a/PKGBUILD b/PKGBUILD
index 869b6404607b..1c6f0dd7eeb9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,6 +12,7 @@ pkgdesc='Default settings for Pantheon derivatives'
 depends=('elementary-icon-theme' 'gtk-theme-elementary-git'
          'gnome-themes-standard' ttf-{droid,opensans,roboto-mono})
 optdepends=('elementary-wallpapers-git')
+groups=(pantheon-qq)
 provides=(pantheon-default-settings{,-git})
 conflicts=(pantheon-default-settings{,-git})
 source=('pantheon-default-settings::git+https://github.com/elementary/default-settings.git#branch=meson'
@@ -22,32 +23,35 @@ sha256sums=('SKIP'
             '3732b2209d28c68bb3a11da5726f486db1fca9fcb3776bf58f83c81678b84211')
 
 pkgver() {
-  cd $srcdir/pantheon-default-settings
+    cd $srcdir/pantheon-default-settings
 
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-  cd $srcdir/pantheon-default-settings
+    cd $srcdir/pantheon-default-settings
 
-  #Remove ubuntu-specific settings
-  patch -Np1 -i ../arch-tweaks.patch
+    #Remove ubuntu-specific settings
+    patch -Np1 -i ../arch-tweaks.patch
 
-  #Don't touch any background-related settings
-  patch -Np2 -i ../leave-bg-alone.patch
+    #Don't touch any background-related settings
+    patch -Np2 -i ../leave-bg-alone.patch
 }
 
 build() {
-  cd $srcdir/pantheon-default-settings
-  meson build
+    cd $srcdir/pantheon-default-settings
+    [ -d build ] && rm -rf build
+    arch-meson build
 }
 
 package() {
-  cd $srcdir/pantheon-default-settings
-  DESTDIR=$pkgdir ninja -C build install
-
-  install -dm 755 "${pkgdir}"/usr/share/glib-2.0/schemas
-  install -m 644 debian/elementary-default-settings.gsettings-override "${pkgdir}"/usr/share/glib-2.0/schemas/25_pantheon-default-settings.gschema.override
-  install -Dm 755 $pkgdir/etc/lightdm/lightdm.conf $pkgdir/etc/skel/.config/lightdm/lightdm.conf
-  rm $pkgdir/etc/lightdm/lightdm.conf
+    cd $srcdir/pantheon-default-settings
+    DESTDIR=$pkgdir ninja -C build install
+
+    install -dm 755 "${pkgdir}"/usr/share/glib-2.0/schemas
+    install -m 644 debian/elementary-default-settings.gsettings-override "${pkgdir}"/usr/share/glib-2.0/schemas/25_pantheon-default-settings.gschema.override
+    install -Dm 644 $pkgdir/etc/lightdm/lightdm.conf $pkgdir/etc/skel/.config/lightdm/lightdm.conf
+    rm $pkgdir/etc/lightdm/lightdm.conf
+    install -Dm 644 $pkgdir/etc/gtk-3.0/settings.ini $pkgdir/etc/skel/.config/gtk-3.0/settings.ini
+    rm $pkgdir/etc/gtk-3.0/settings.ini
 }