Upstream: 2.5.1.r199.bde0a73

3 files changed, 68 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 371004adcee3..341d35545ac1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,20 @@
+# Generated by mksrcinfo v8
+# Tue Apr 19 16:44:19 UTC 2016
 pkgbase = numix-themes-green
 	pkgdesc = A flat and light theme with a modern look using Green color (GNOME, MATE, Openbox, Unity, XFCE)
-	pkgver = 2.5.1
-	pkgrel = 2
+	pkgver = 2.5.1.r199.bde0a73
+	pkgrel = 1
 	url = http://numixproject.org/
 	arch = any
 	license = GPL3
+	makedepends = git
+	makedepends = ruby-bundler
+	makedepends = imagemagick
 	depends = gtk-engine-murrine
-	source = numix-themes-green-2.5.1.tar.gz::https://github.com/shimmerproject/Numix/archive/v2.5.1.tar.gz
-	md5sums = 4468cb3f2fe0d01e823df7c310778787
+	source = git+https://github.com/shimmerproject/Numix.git#commit=bde0a7364864b0e3b8265c5b13969757295e1e17
+	source = Gemfile
+	sha256sums = SKIP
+	sha256sums = b1061ba7ce09c9eb3e41f59362aa8c21d27073b0658f13fb5eabdaea654afe2c
 
 pkgname = numix-themes-green
 
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000000000000..3f76dd555ee0
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gem "sass"
diff --git a/PKGBUILD b/PKGBUILD
index 7e07599acf37..fb9aac7e9aa9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,74 @@
 # Maintainer: grimi <grimi at poczta dot fm>
 
 pkgname=numix-themes-green
-pkgver=2.5.1
-pkgrel=2
+pkgver=2.5.1.r199.bde0a73
+pkgrel=1
 pkgdesc="A flat and light theme with a modern look using Green color (GNOME, MATE, Openbox, Unity, XFCE)"
 arch=('any')
 url='http://numixproject.org/'
 license=('GPL3')
 depends=('gtk-engine-murrine')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/shimmerproject/Numix/archive/v${pkgver}.tar.gz")
-md5sums=('4468cb3f2fe0d01e823df7c310778787')
+makedepends=('git' 'ruby-bundler' 'imagemagick')
+_commit='bde0a7364864b0e3b8265c5b13969757295e1e17'
+source=("git+https://github.com/shimmerproject/Numix.git#commit=${_commit}" "Gemfile")
+sha256sums=('SKIP'
+            'b1061ba7ce09c9eb3e41f59362aa8c21d27073b0658f13fb5eabdaea654afe2c')
+
+
+
+pkgver() {
+   cd Numix
+   git describe --tags | sed 's/^v//; s/-/.r/; s/-g/./'
+}
 
 
 prepare() {
-   cd Numix-${pkgver}
-   for f in gtk-2.0/gtkrc \
-         gtk-3.0/gtk-dark.css \
-         gtk-3.0/gtk-widgets-assets.css \
-         gtk-3.0/gtk-widgets.css \
-         gtk-3.0/gtk.css \
-         gtk-3.0/settings.ini \
-         gtk-3.0/apps/gnome-applications.css \
-         gtk-3.0/apps/granite-widgets.css \
-         gtk-3.0/apps/lightdm-gtk-greeter.css \
-         gtk-3.0/apps/nemo.css \
-         gtk-3.0/apps/synaptic.css \
-         gtk-3.0/apps/unity.css \
-         gtk-3.0/apps/xfce.css \
-         gtk-3.0/assets/*.svg \
-         metacity-1/metacity-theme-2.xml \
-         metacity-1/metacity-theme-3.xml \
-         openbox-3/themerc \
-         xfce-notify-4.0/gtkrc \
-         xfwm4/themerc \
-         xfwm4/*.xpm \
-         unity/*.svg \
-         index.theme
+   cd Numix
+   for FILE in gtk-2.0/gtkrc \
+      gtk-3.0/scss/_global.scss \
+      gtk-3.0/assets/*.svg \
+      gtk-3.20/scss/_global.scss \
+      metacity-1/metacity-theme-2.xml \
+      metacity-1/metacity-theme-3.xml \
+      openbox-3/themerc \
+      xfce-notify-4.0/gtkrc \
+      xfwm4/themerc \
+      xfwm4/*.xpm \
+      unity/*.svg \
+      index.theme
+   do
+      sed -i 's/#f0544c/#697740/Ig' "${FILE}"
+      sed -i 's/#d64937/#697740/Ig' "${FILE}"
+      sed -i 's/#f06860/#697740/Ig' "${FILE}"
+      sed -i 's/#f44336/#697740/Ig' "${FILE}"
+      sed -i 's/Numix/Numix-Green/I' "${FILE}"
+   done
+
+   # fix name
+   cp gtk-3.0/assets/radio-{selected,checked}.svg
+   cp gtk-3.0/assets/radio-{selected,checked}-dark.svg
+
+   for FILE in gtk-3.0/assets/*.svg
    do
-      sed -i 's/#fc6f5d/#697740/Ig' "${f}"
-      sed -i 's/#d64937/#697740/Ig' "${f}"
-      sed -i 's/Numix/Numix-Green/' "${f}"
+      if [[ -f ${FILE%.svg}.png ]]
+      then
+         convert -resize 16x16 -background none "${FILE}" "${FILE%.svg}.png"
+      fi
    done
 }
 
+
+build() {
+   cd Numix
+   bundle install --path .
+   make SASS="bundle exec sass"
+}
+
+
 package() {
-   cd Numix-${pkgver}
-   rm -rf .git .gitignore CREDITS LICENSE README.md
+   cd Numix
    install -dm 755 "${pkgdir}"/usr/share/themes/Numix-Green
-   cp -dr --no-preserve='ownership' * "${pkgdir}"/usr/share/themes/Numix-Green
+   rm -rf .git .gitignore CREDITS LICENSE README.md
+   cp -dr --no-preserve='ownership,mode' * "${pkgdir}"/usr/share/themes/Numix-Green
 }