summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorchrisjbillington2019-10-23 09:36:53 -0400
committerchrisjbillington2019-10-23 09:36:53 -0400
commitfbe20d8f4a519229c23370a93ae860eae780f1a3 (patch)
tree3e6b2c7218dc1550556dc783b0fbd7a97fc6e9df
parent2c14a08af7db1212649f81ba508aa6564eaffc0e (diff)
downloadaur-fbe20d8f4a519229c23370a93ae860eae780f1a3.tar.gz
Remove workaround, bug has been fixed upstream.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD11
-rw-r--r--install-shell.sh9
3 files changed, 4 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7dcdbd84a9c..5c6839f1c7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = yaru-git
pkgdesc = Yaru default ubuntu theme
- pkgver = 19.10.4.r23.gab1bd973
+ pkgver = 19.10.4.r25.g00aaee95
pkgrel = 1
url = https://github.com/ubuntu/yaru
arch = any
@@ -12,9 +12,7 @@ pkgbase = yaru-git
options = !buildflags
options = staticlibs
source = git+https://github.com/ubuntu/yaru
- source = install-shell.sh
sha256sums = SKIP
- sha256sums = 8b6aa29d87c5685fa5f968fae5c614bb45383016839968828ccaa02ceea3fdb1
pkgname = yaru-sound-theme-git
pkgdesc = Yaru default ubuntu sound theme
diff --git a/PKGBUILD b/PKGBUILD
index 01df069a2a8..680488a49cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=(yaru-sound-theme-git
yaru-gnome-shell-theme-git
yaru-icon-theme-git
yaru-session-git)
-pkgver=19.10.4.r23.gab1bd973
+pkgver=19.10.4.r25.g00aaee95
pkgrel=1
pkgdesc="Yaru default ubuntu theme"
arch=(any)
@@ -16,19 +16,14 @@ url="https://github.com/ubuntu/yaru"
license=('GPL3')
makedepends=(meson sassc git)
options=('!strip' '!buildflags' 'staticlibs')
-source=("git+https://github.com/ubuntu/yaru" "install-shell.sh")
-sha256sums=('SKIP' '8b6aa29d87c5685fa5f968fae5c614bb45383016839968828ccaa02ceea3fdb1')
+source=("git+https://github.com/ubuntu/yaru")
+sha256sums=('SKIP')
pkgver() {
cd yaru
git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
-prepare() {
- # Workaround issue https://github.com/ubuntu/yaru/issues/1583 for now:
- cp install-shell.sh "${srcdir}/yaru/gnome-shell/src/"
-}
-
build() {
arch-meson yaru build
ninja -C build
diff --git a/install-shell.sh b/install-shell.sh
deleted file mode 100644
index c857bc216f1..00000000000
--- a/install-shell.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# -*- coding: UTF-8 -*-
-
-project_name="$1"
-destdir_prefix="${MESON_INSTALL_DESTDIR_PREFIX}/share"
-install_prefix="${MESON_INSTALL_PREFIX}/share"
-
-mkdir -p "${destdir_prefix}/gnome-shell/theme/"
-ln -sf "${install_prefix}/themes/${project_name}/gnome-shell" "${destdir_prefix}/gnome-shell/theme/${project_name}" \ No newline at end of file