Fix gnome shell install dir

1 files changed, 13 insertions, 11 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2a5e8e51e104..bbe29af986e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgbase=yaru
 pkgname=('yaru-sound-theme' 'yaru-gtk-theme' 'yaru-gnome-shell-theme' 'yaru-icon-theme')
 pkgver=18.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Yaru default ubuntu theme"
 arch=(any)
 url="https://github.com/ubuntu/yaru"
@@ -11,14 +11,16 @@ license=('GPL3')
 makedepends=('meson' 'sassc' 'git')
 options=('!strip' '!buildflags' 'staticlibs')
 conflicts=('yaru-git')
-_commit=684f3d3f9cf9f7fd793f80e2fcf38dde7f970a43  # 18.10
 
-source=("git+https://github.com/ubuntu/${pkgbase}#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://github.com/ubuntu/${pkgbase}#tag=${pkgver}"
+  "0001-gnome-shell-fix-install-dir.patch")
+sha256sums=('SKIP'
+  'c84e9720c47fc86eaf89ebc647bb656b13a3e79aa0b01c46734c5db013e42bc5')
 
-pkgver() {
-  cd ${pkgbase}
-  git describe --tags | sed 's/-/+/g'
+prepare() {
+  cd "${pkgbase}"
+
+  patch -Np1 < ../0001-gnome-shell-fix-install-dir.patch
 }
 
 build() {
@@ -33,7 +35,6 @@ package_yaru-sound-theme() {
   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/gnome-shell"
   rm -r "$pkgdir/usr/share/icons"
   rm -r "$pkgdir/usr/share/themes"
 }
@@ -47,7 +48,7 @@ package_yaru-gtk-theme() {
   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/gnome-shell"
+  rm -r "$pkgdir/usr/share/themes/Yaru/gnome-shell"
   rm -r "$pkgdir/usr/share/icons"
   rm -r "$pkgdir/usr/share/sounds"
 }
@@ -62,7 +63,9 @@ package_yaru-gnome-shell-theme() {
   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"
+  rm -r "$pkgdir/usr/share/themes/Yaru/gtk-2.0"
+  rm -r "$pkgdir/usr/share/themes/Yaru/gtk-3.0"
+  rm -r "$pkgdir/usr/share/themes/Yaru/index.theme"
 }
 
 package_yaru-icon-theme() {
@@ -71,7 +74,6 @@ package_yaru-icon-theme() {
 
   DESTDIR="$pkgdir" meson install -C build
   rm -r "$pkgdir/usr/share/glib-2.0"
-  rm -r "$pkgdir/usr/share/gnome-shell"
   rm -r "$pkgdir/usr/share/xsessions"
   rm -r "$pkgdir/usr/share/wayland-sessions"
   rm -r "$pkgdir/usr/share/sounds"