Update for 2.6.1 based on numix-themes-darkblue-git

4 files changed, 128 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4deaff060b0d..082ec1ac444d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,20 @@
 # Generated by mksrcinfo v8
-# Thu Mar 31 15:33:54 UTC 2016
+# Sat Jul  2 02:25:33 UTC 2016
 pkgbase = numix-themes-darkblue
-	pkgdesc = A flat and light theme with a modern look using Arch Linux colors (GNOME, Cinnamon, MATE, Openbox, Unity, XFCE)
-	pkgver = 2.5
+	pkgdesc = A flat and light theme with a modern look (GNOME, Openbox, Unity, Xfce) (Dark Blue Variant)
+	pkgver = 2.6.1
 	pkgrel = 1
 	url = http://numixproject.org/
 	arch = any
 	license = GPL3
-	depends = gtk-engine-murrine
-	source = numix-themes-darkblue-2.5.tar.gz::https://github.com/shimmerproject/Numix/archive/v2.5.tar.gz
-	sha256sums = 0fbdfc0281f959bb26e4dcd268bc665c00eeb0030ea4abe9acc8b02460cd1e07
+	makedepends = git
+	makedepends = glib2
+	makedepends = ruby-sass
+	optdepends = gtk-engine-murrine: GTK2 theme engine
+	source = numix-themes-darkblue-2.6.1.tar.gz::https://github.com/numixproject/numix-gtk-theme/archive/2.6.1.tar.gz
+	source = dark_colors.patch
+	md5sums = 499e2e8e9d7d1d81403ebf8f65c8ced6
+	md5sums = a73ce14c46aabad53ddf6c1c467b2b67
 
 pkgname = numix-themes-darkblue
 
diff --git a/.gitignore b/.gitignore
index 1431751fa477..d15cc2f5f8e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-*.pkg.tar*
+/*.pkg.tar*
 /pkg/
 /src/
 /numix-themes-darkblue-*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index e10bbe2a6775..06a910485e39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,70 +1,39 @@
 # Maintainer: Adam Goldsmith <contact@adamgoldsmith.name>
 
-## Contributor: Martin Wimpress <code@flexion.org>
-## Contributor: Maxime Gauduin <alucryd@gmail.com>
-## Contributor: Diego <cdprincipe@gmail.com>
-## Contributor: dRaiser <pw@draiser.net>
+# Based on numix-themes-git
+# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
+# Contributor: Diego <cdprincipe@gmail.com>
 
 pkgname=numix-themes-darkblue
-pkgver=2.5
+pkgver=2.6.1
 pkgrel=1
-pkgdesc="A flat and light theme with a modern look using Arch Linux colors (GNOME, Cinnamon, MATE, Openbox, Unity, XFCE)"
+pkgdesc='A flat and light theme with a modern look (GNOME, Openbox, Unity, Xfce) (Dark Blue Variant)'
 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")
-sha256sums=('0fbdfc0281f959bb26e4dcd268bc665c00eeb0030ea4abe9acc8b02460cd1e07')
+makedepends=('git' 'glib2' 'ruby-sass')
+optdepends=('gtk-engine-murrine: GTK2 theme engine')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/numixproject/numix-gtk-theme/archive/2.6.1.tar.gz"
+		'dark_colors.patch')
+md5sums=('499e2e8e9d7d1d81403ebf8f65c8ced6'
+         'a73ce14c46aabad53ddf6c1c467b2b67')
 
 prepare() {
-	cd Numix-${pkgver}
-	## Replace the Numix Pink/Red with Arch Linux Blue,
-	##  - https://www.archlinux.org/art/
-	for i 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 \
-		metacity-1/metacity-theme-2.xml \
-		metacity-1/metacity-theme-3.xml \
-		openbox-3/themerc \
-		xfce-notify-4.0/gtkrc \
-		xfwm4/themerc \
-		index.theme \
-		gtk-3.0/assets/checkbox-checked-dark.svg \
-		gtk-3.0/assets/menuitem-checkbox-checked.svg \
-		gtk-3.0/assets/checkbox-mixed-dark.svg \
-		gtk-3.0/assets/menuitem-checkbox-mixed.svg \
-		gtk-3.0/assets/menuitem-radio-checked.svg \
-		gtk-3.0/assets/radio-selected-dark.svg \
-		gtk-3.0/assets/grid-selection-checked-dark.svg \
-		gtk-3.0/assets/radio-mixed-dark.svg 
-	do
-		sed -i 's/#fc6f5d/#1568A4/g' "${i}"
-		sed -i 's/#d64937/#1568A4/g' "${i}"
-		sed -i 's/#b14638/#1568A4/g' "${i}"
-		sed -i 's/Numix/Numix-DarkBlue/' "${i}"
-	done
-	sed -i 's|text_color:#333333|text_color:#dcdcdc|g
-		s|base_color:#f9f9f9|base_color:#333333|g
-		s|bg_color:#dedede|bg_color:#333333|g
-		s|fg_color:#555555|fg_color:#dcdcdc|g
-		s|toolbar_bg_color:#dedede|toolbar_bg_color:#404040|g
-		s|toolbar_fg_color:#555555|toolbar_fg_color:#dcdcdc|g' gtk-2.0/gtkrc
-	ln -srf gtk-3.0/gtk{-dark,}.css
+  cd "$srcdir/numix-gtk-theme-$pkgver/"
+
+  patch -Np1 -i ../dark_colors.patch
+  ln -srf gtk-3.0/gtk{-dark,}.css
+  ln -srf gtk-3.20/gtk{-dark,}.css
+}
+
+build() {
+  cd "$srcdir/numix-gtk-theme-$pkgver/"
+  make
 }
 
 package() {
-	cd Numix-${pkgver}
-	install -dm 755 "${pkgdir}"/usr/share/themes/Numix-DarkBlue
-	rm -rf .git .gitignore CREDITS LICENSE README.md
-	cp -dr --no-preserve='ownership,mode' * "${pkgdir}"/usr/share/themes/Numix-DarkBlue
+  cd "$srcdir/numix-gtk-theme-$pkgver/"
+  make INSTALL_DIR="${pkgdir}/usr/share/themes/Numix-DarkBlue" install
 }
+
+# vim: ts=2 sw=2 et:
diff --git a/dark_colors.patch b/dark_colors.patch
new file mode 100644
index 000000000000..a18f1659cd25
--- /dev/null
+++ b/dark_colors.patch
@@ -0,0 +1,91 @@
+--- a/gtk-2.0/gtkrc
++++ b/gtk-2.0/gtkrc
+@@ -1,6 +1,6 @@
+ # Numix GTK Theme
+ 
+-gtk-color-scheme = "bg_color:#eeeeee\nfg_color:#555555\nbase_color:#ffffff\ntext_color:#333333\nselected_bg_color:#f0544c\nselected_fg_color:#ffffff\ntooltip_bg_color:#444444\ntooltip_fg_color:#eeeeee\ntitlebar_bg_color:#444444\ntitlebar_fg_color:#dddddd\nmenubar_bg_color:#444444\nmenubar_fg_color:#dddddd\ntoolbar_bg_color:#eeeeee\ntoolbar_fg_color:#555555\nmenu_bg_color:#444444\nmenu_fg_color:#dddddd\npanel_bg_color:#444444\npanel_fg_color:#dddddd\nlink_color:#f06860"
++gtk-color-scheme = "bg_color:#333333\nfg_color:#dcdcdc\nbase_color:#333333\ntext_color:#dcdcdc\nselected_bg_color:#1568A4\nselected_fg_color:#f9f9f9\ntooltip_bg_color:#2d2d2d\ntooltip_fg_color:#dedede\ntitlebar_bg_color:#2d2d2d\ntitlebar_fg_color:#dcdcdc\nmenubar_bg_color:#2d2d2d\nmenubar_fg_color:#dcdcdc\ntoolbar_bg_color:#333333\ntoolbar_fg_color:#dcdcdc\nmenu_bg_color:#2d2d2d\nmenu_fg_color:#dcdcdc\npanel_bg_color:#2d2d2d\npanel_fg_color:#dcdcdc\nlink_color:#1568A4"
+ 
+ # Default Style
+ 
+--- a/gtk-3.0/scss/_global.scss
++++ b/gtk-3.0/scss/_global.scss
+@@ -3,18 +3,18 @@
+ @import "functions";
+ 
+ // default color scheme
+-$bg_color: if($variant == "dark", #444, #eee);
+-$fg_color: if($variant == "dark", #ddd, #555);
++$bg_color: if($variant == "dark", #333, #eee);
++$fg_color: if($variant == "dark", #dcdcdc, #555);
+ $base_color: if($variant == "dark", #333, #fff);
+-$text_color: if($variant == "dark", #eee, #333);
+-$selected_bg_color: #f0544c;
+-$selected_fg_color: #fff;
+-$tooltip_bg_color: #444;
+-$tooltip_fg_color: #eee;
++$text_color: if($variant == "dark", #dcdcdc, #333);
++$selected_bg_color: #1268A4;
++$selected_fg_color: #f9f9f9;
++$tooltip_bg_color: #2d2d2d;
++$tooltip_fg_color: #dedede;
+ 
+ // dark colors
+-$dark_bg_color: #444;
+-$dark_fg_color: #eee;
++$dark_bg_color: #333;
++$dark_fg_color: #dcdcdc;
+ 
+ // shadows
+ $dark_shadow: #000;
+--- a/gtk-3.20/scss/_global.scss
++++ b/gtk-3.20/scss/_global.scss
+@@ -3,22 +3,22 @@
+ @import "functions";
+ 
+ // default color scheme
+-$bg_color: if($variant == "dark", #444, #eee);
+-$fg_color: if($variant == "dark", #ddd, #555);
++$bg_color: if($variant == "dark", #333, #eee);
++$fg_color: if($variant == "dark", #dcdcdc, #555);
+ $base_color: if($variant == "dark", #333, #fff);
+-$text_color: if($variant == "dark", #eee, #333);
+-$selected_bg_color: #f0544c;
+-$selected_fg_color: #fff;
+-$tooltip_bg_color: #444;
+-$tooltip_fg_color: #eee;
++$text_color: if($variant == "dark", #dcdcdc, #333);
++$selected_bg_color: #1268A4;
++$selected_fg_color: #f9f9f9;
++$tooltip_bg_color: #2d2d2d;
++$tooltip_fg_color: #dedede;
+ 
+ $selected_borders_color: if($variant == 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%));
+ $borders_color: if($variant == 'light', shade($bg_color, .85), shade($bg_color, .88));
+ $borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
+ 
+ // dark colors
+-$dark_bg_color: #444;
+-$dark_fg_color: #eee;
++$dark_bg_color: #333;
++$dark_fg_color: #dcdcdc;
+ 
+ // shadows
+ $dark_shadow: #000;
+--- a/index.theme
++++ b/index.theme
+@@ -1,10 +1,10 @@
+ [Desktop Entry]
+ Type=X-GNOME-Metatheme
+-Name=Numix
+-Comment=A modern flat theme
++Name=Numix-DarkBlue
++Comment=A modern flat theme (Dark Blue variant)
+ Encoding=UTF-8
+ 
+ [X-GNOME-Metatheme]
+-GtkTheme=Numix
+-MetacityTheme=Numix
++GtkTheme=Numix-DarkBlue
++MetacityTheme=Numix-DarkBlue
+ ButtonLayout=:minimize,maximize,close