summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSherlock Holo2018-07-25 10:08:30 +0800
committerSherlock Holo2018-07-25 10:08:30 +0800
commita4263824b1d3b903dae149c9cc5af98a2ccaee61 (patch)
treebf57c68723cf1993614b635b792c453fd7b26adc
parentdc826ef7684f6dd1ea146aad55c2556e100f105a (diff)
downloadaur-a4263824b1d3b903dae149c9cc5af98a2ccaee61.tar.gz
Upstream update
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD24
2 files changed, 18 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c0ce6fe0d77..773735843ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Thu Apr 5 07:22:41 UTC 2018
pkgbase = canta-theme-git
pkgdesc = Flat Material Design theme for GTK 3, GTK 2 and Gnome-Shell
- pkgver = Canta.theme_2018_03_28.r0.223123c
+ pkgver = 2018_05_15.r4.153786a
pkgrel = 1
url = https://github.com/vinceliuice/Canta-theme
arch = any
@@ -13,9 +11,7 @@ pkgbase = canta-theme-git
optdepends = gtk-engine-murrine: needed for gtk2 theme
optdepends = gnome-themes-standard: needed for gtk2 theme
source = canta-theme::git+https://github.com/vinceliuice/Canta-theme.git
- source = installer.patch
md5sums = SKIP
- md5sums = 6e71e7637aaf124e4271366e15b596ec
pkgname = canta-gtk-theme-git
diff --git a/PKGBUILD b/PKGBUILD
index 483fd1bf961..6c2120c556a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Can Celasun <can [at] dcc [dot] im>
+# Maintainer: Sherlock Holo <sherlockya at gmail dot com>
+# Contributor: Can Celasun <can [at] dcc [dot] im>
pkgbase=canta-theme-git
_pkgname=canta-theme
pkgname=('canta-gtk-theme-git' 'canta-icon-theme-git')
pkgdesc="Flat Material Design theme for GTK 3, GTK 2 and Gnome-Shell"
-pkgver=Canta.theme_2018_03_28.r0.223123c
+pkgver=2018_05_15.r4.153786a
pkgrel=1
arch=('any')
url="https://github.com/vinceliuice/Canta-theme"
@@ -14,10 +15,8 @@ optdepends=('numix-circle-icon-theme-git: recommended base icon theme'
'gnome-themes-standard: needed for gtk2 theme')
makedepends=('gtk3' 'git')
-source=("${_pkgname}::git+https://github.com/vinceliuice/Canta-theme.git"
- "installer.patch")
-md5sums=('SKIP'
- '6e71e7637aaf124e4271366e15b596ec')
+source=("${_pkgname}::git+https://github.com/vinceliuice/Canta-theme.git")
+md5sums=('SKIP')
pkgver() {
cd "${srcdir}/${_pkgname}"
@@ -28,7 +27,18 @@ build() {
cd "${srcdir}/${_pkgname}"
# Build GTK theme
- patch -Np1 < "${srcdir}"/installer.patch
+ #patch -Np1 < "${srcdir}"/installer.patch
+
+ sed \
+ -e "/ROOT_UID=0/d" \
+ -e "/DEST_DIR=/d" \
+ -e '/# Destination directory/d' \
+ -e "/if \[ \"\$UID\" -eq \"\$ROOT_UID\" \]; then/d" \
+ -e "/DEST_DIR=\"\/usr\/share\/themes\"/d" \
+ -e "/else/d" \
+ -e "/DEST_DIR=\"\$HOME\/.themes\"/d" \
+ -e "/fi/d" -i $srcdir/canta-theme/install.sh
+
rm -rf build
mkdir build
DEST_DIR=build ./install.sh