Update to 20.04.1

1 files changed, 45 insertions, 37 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2318d5e0b706..d2f0c8714f28 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: drakkan <nicola.murino at gmail dot com>
+# Maintainer: Chris Billington <chrisjbillington@gmail.com>
 pkgbase=yaru
-pkgname=('yaru-sound-theme' 'yaru-gtk-theme' 'yaru-gnome-shell-theme' 'yaru-icon-theme' 'yaru-session')
-pkgver=19.10.5
+pkgname=('yaru-sound-theme' 'yaru-gtk-theme' 'yaru-gnome-shell-theme' 'yaru-unity-theme' 'yaru-icon-theme' 'yaru-session')
+pkgver=20.04.1
 pkgrel=1
-_tag=19.10.5
 pkgdesc="Yaru default ubuntu theme"
 arch=(any)
 url="https://github.com/ubuntu/yaru"
@@ -12,25 +12,44 @@ license=('GPL3')
 makedepends=('meson' 'sassc' 'git')
 options=('!strip' '!buildflags' 'staticlibs')
 
-
-source=("git+https://github.com/ubuntu/${pkgbase}#tag=${_tag}")
-sha256sums=('SKIP')
+source=("https://github.com/ubuntu/yaru/archive/${pkgver}.tar.gz")
+sha256sums=('269c2aa9cbfbe0778338199934325fbe808ccfa84c28df7e1d3ad1921afcacab')
 
 build() {
-  arch-meson ${pkgbase} build
+  arch-meson $pkgbase-$pkgver build
   ninja -C build
 }
 
+_delete_all_from_pkgdir_except() {
+    if [[ "$1" != "sound-theme" ]]; then
+        rm -r "${pkgdir}"/usr/share/sounds
+    fi
+    if [[ "$1" != "gtk-theme" ]]; then
+        rm -r "${pkgdir}"/usr/share/themes/Yaru{-light,{,-dark}/{gtk-*,index.theme}}
+    fi
+    if [[ "$1" != "gnome-shell-theme" ]]; then
+        rm -r "${pkgdir}"/usr/share/themes/Yaru{,-dark}/gnome-shell
+        rm -r "${pkgdir}"/usr/share/gnome-shell/theme/Yaru
+    fi
+    if [[ "$1" != "unity-theme" ]]; then
+        rm -r "${pkgdir}"/usr/share/themes/Yaru/unity
+    fi
+    if [[ "$1" != "icon-theme" ]]; then
+        rm -r "${pkgdir}"/usr/share/icons
+    fi
+    if [[ "$1" != "session" ]]; then
+        rm -r "${pkgdir}"/usr/share/{glib-2.0,xsessions,wayland-sessions}
+        rm -r "${pkgdir}"/usr/share/gnome-shell/{extensions,modes}
+    fi
+    # Delete remaining empty directories:
+    find "${pkgdir}" -type d -empty -delete
+}
+
 package_yaru-sound-theme() {
   pkgdesc="Yaru default ubuntu sound theme"  
 
   DESTDIR="$pkgdir" ninja -C build install 2>&1 >> install.log
-  rm -r "$pkgdir/usr/share/glib-2.0"
-  rm -r "$pkgdir/usr/share/xsessions"
-  rm -r "$pkgdir/usr/share/wayland-sessions"
-  rm -r "$pkgdir/usr/share/icons"
-  rm -r "$pkgdir/usr/share/themes"
-  rm -r "$pkgdir/usr/share/gnome-shell"
+  _delete_all_from_pkgdir_except "sound-theme"
 }
 
 package_yaru-gtk-theme() {
@@ -38,25 +57,22 @@ package_yaru-gtk-theme() {
   depends=("gtk3" "gdk-pixbuf2" "gtk-engine-murrine" "gnome-themes-extra")
   
   DESTDIR="$pkgdir" ninja -C build install 2>&1 >> install.log
-  rm -r "$pkgdir/usr/share/glib-2.0"
-  rm -r "$pkgdir/usr/share/xsessions"
-  rm -r "$pkgdir/usr/share/wayland-sessions"
-  rm -r "$pkgdir/usr/share/icons"
-  rm -r "$pkgdir/usr/share/sounds"
-  rm -r "$pkgdir/usr/share/gnome-shell"
+  _delete_all_from_pkgdir_except "gtk-theme"
 }
 
 package_yaru-gnome-shell-theme() {
   pkgdesc="Yaru default ubuntu gnome shell theme"  
-  depends=("gnome-shell" "yaru-session")
+  depends=("gnome-shell")
   
   DESTDIR="$pkgdir" ninja -C build install 2>&1 >> install.log
-  rm -r "$pkgdir/usr/share/glib-2.0"
-  rm -r "$pkgdir/usr/share/xsessions"
-  rm -r "$pkgdir/usr/share/wayland-sessions"
-  rm -r "$pkgdir/usr/share/icons"
-  rm -r "$pkgdir/usr/share/sounds"
-  rm -r "$pkgdir/usr/share/themes"
+  _delete_all_from_pkgdir_except "gnome-shell-theme"
+}
+
+package_yaru-unity-theme() {
+  pkgdesc="Yaru default ubuntu unity theme"  
+
+  DESTDIR="$pkgdir" ninja -C build install 2>&1 >> install.log
+  _delete_all_from_pkgdir_except "unity-theme"
 }
 
 package_yaru-icon-theme() {
@@ -64,23 +80,15 @@ package_yaru-icon-theme() {
   depends=("hicolor-icon-theme" "gtk-update-icon-cache" "librsvg" "humanity-icon-theme")
 
   DESTDIR="$pkgdir" ninja -C build install 2>&1 >> install.log
-  rm -r "$pkgdir/usr/share/glib-2.0"
-  rm -r "$pkgdir/usr/share/xsessions"
-  rm -r "$pkgdir/usr/share/wayland-sessions"
-  rm -r "$pkgdir/usr/share/sounds"
-  rm -r "$pkgdir/usr/share/themes"
-  rm -r "$pkgdir/usr/share/gnome-shell"
+  _delete_all_from_pkgdir_except "icon-theme"
 }
 
 package_yaru-session() {
   pkgdesc="Yaru session"
-  depends=("gnome-shell")
+  depends=("gnome-shell" "yaru-gnome-shell-theme")
 
   DESTDIR="$pkgdir" ninja -C build install 2>&1 >> install.log
-  rm -r "$pkgdir/usr/share/sounds"
-  rm -r "$pkgdir/usr/share/themes"
-  rm -r "$pkgdir/usr/share/gnome-shell"
-  rm -r "$pkgdir/usr/share/icons"
+  _delete_all_from_pkgdir_except "session"
 }