2.6.6

1 files changed, 49 insertions, 25 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4ed7b5d05e2e..0b07d160bc35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,64 @@
 pkgname=numix-themes-electric
-pkgver=2.5.1
-pkgrel=2
+pkgver=2.6.6
+pkgrel=1
 pkgdesc='A flat and light theme with a modern look using Arch Linux colors (GNOME, Openbox, Unity, Xfce)'
 arch=('any')
 url='http://numixproject.org/'
 license=('GPL3')
+makedepends=('glib2' 'gdk-pixbuf2' 'ruby-bundler' 'inkscape')
 depends=('gtk-engine-murrine')
-source=("numix-themes-${pkgver}.tar.gz::https://github.com/shimmerproject/Numix/archive/v${pkgver}.tar.gz")
-md5sums=('f480ae44848186818a4c5a884c250388')
+source=("numix-themes-${pkgver}.tar.gz::https://github.com/numixproject/numix-gtk-theme/archive/${pkgver}.tar.gz"
+        'Gemfile')
+md5sums=('7533cdecb2e9f875cd7efc881b8d65a3'
+         '2a6b61ff91955c37fa60a972a67631cf')
+
+_electric_color='#00BFFF'
+_get_color() {
+    grep -E "@define-color\\s+\\w*$1" src/gtk-3.20/dist/gtk-dark.css | head -n1 | cut -d' ' -f3 | cut -d';' -f1
+}
 
 prepare() {
-    names='base_color bg_color text_color fg_color selected_bg_color selected_fg_color tooltip_bg_color tooltip_fg_color'
-    
-    cd numix-gtk-theme-${pkgver}
-    
+    cd ${srcdir}/numix-gtk-theme-${pkgver}
+    sed -i 's/\$variant: "light";/\$variant: "dark";/' src/gtk-3.{,2}0/scss/gtk.scss
+
+    for name in selected_bg_color link_color
+    do
+        sed -i "s/\$${name}: #.\{6\};/\$${name}: ${_electric_color};/" src/gtk-3.{,2}0/scss/_global.scss
+    done
+
+    rm src/assets/*.png
+    sed -i "s/fill:#f1544d/fill:${_electric_color}/g" src/assets/all-assets.svg
+}
+
+build() {
+    cd ${srcdir}/numix-gtk-theme-${pkgver}/scripts
+    ./render-assets.sh
+    cd ..
+
+    bundle install --path .
+    make SASS="bundle exec sass"
+
+    names='bg_color fg_color base_color text_color selected_bg_color selected_fg_color tooltip_bg_color tooltip_fg_color titlebar_bg_color titlebar_fg_color menubar_bg_color menubar_fg_color toolbar_bg_color toolbar_fg_color menu_bg_color menu_fg_color panel_bg_color panel_fg_color'
+
     for name in $names
     do
-        color=$(grep "@define-color\\s\+$name" gtk-3.0/gtk-dark.css | head -n1 | cut -d' ' -f3 | cut -d';' -f1)
-        sed -i "s/$name:#.\{6\}/$name:$color/" gtk-2.0/gtkrc
+        color=$(_get_color $name)
+
+        if [[ $color = "@"* ]]
+        then
+            color=$(_get_color $(echo $color | cut -d'@' -f2))
+        fi
+
+        sed -i "s/$name:#.\{6\}/$name:$color/" src/gtk-2.0/gtkrc
     done
-    
-    sed -i 's/selected_bg_color:#.\{6\}/selected_bg_color:#00BFFF/' gtk-2.0/gtkrc
-    sed -i 's/selected_fg_color:#.\{6\}/selected_fg_color:#000000/' gtk-2.0/gtkrc
-    sed -i 's/@define-color selected_bg_color #.\{6\}/@define-color selected_bg_color #00BFFF/' gtk-3.0/gtk-dark.css
-    sed -i 's/@define-color selected_fg_color #.\{6\}/@define-color selected_fg_color #000000/' gtk-3.0/gtk-dark.css
-    
-    cd gtk-3.0
-    
-    rm -f gtk.css
-    mv gtk-dark.css gtk.css
+
+    sed -i "s/selected_bg_color:#.\{6\}/selected_bg_color:${_electric_color}/" src/gtk-2.0/gtkrc
+    sed -i "s/link_color:#.\{6\}/link_color:${_electric_color}/" src/gtk-2.0/gtkrc
 }
 
 package() {
-    cd numix-gtk-theme-${pkgver}
-    
-    install -dm 755 "${pkgdir}"/usr/share/themes/Numix-Electric
-    rm -rf .git .gitignore CREDITS LICENSE README.md
-    cp -dr --no-preserve='ownership' * "${pkgdir}"/usr/share/themes/Numix-Electric/
+    cd ${srcdir}/numix-gtk-theme-${pkgver}
+    make SASS="bundle exec sass" DESTDIR="${pkgdir}" install
+    cd "${pkgdir}"/usr/share/themes
+    mv Numix 'Numix Electric'
 }