Update for latest version of gnome themes

2 files changed, 46 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 92e7877fe9aa..11a2e7433654 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = adwaita-dark-darose
 	pkgdesc = Adwaita theme hacked to use my custom color scheme. (Dark blues instead of greys.)
-	pkgver = 3.22.3
-	pkgrel = 10
+	pkgver = 3.28
+	pkgrel = 1
 	url = none
 	arch = any
 	license = GPL
 	makedepends = glib2
 	makedepends = gtk3
-	depends = gnome-themes-standard
+	depends = gnome-themes-extra
 	source = no-source.txt
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 8df7fd5d6a61..3947b851e51b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: David Rosenstrauch <darose@darose.net>
 
 pkgname="adwaita-dark-darose"
-pkgver=3.22.3
-pkgrel=10
+pkgver=3.28
+pkgrel=1
 pkgdesc="Adwaita theme hacked to use my custom color scheme.  (Dark blues instead of greys.)"
 url="none"
 license=('GPL')
 arch=('any')
 makedepends=('glib2' 'gtk3')
-depends=('gnome-themes-standard')
+depends=('gnome-themes-extra')
 source=('no-source.txt')
 md5sums=('SKIP')
 
@@ -25,42 +25,68 @@ build() {
     echo '@import url("gtk-contained-dark.css");' > gtk-3.0/gtk.css
     echo '@import url("gtk-contained-dark.css");' > gtk-3.0/gtk-dark.css
 
+    sed -i 's|#2b3032|#181c28|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#2b3032|#181c28|g' gtk-2.0/gtkrc
+    sed -i 's|#2c3234|#181c28|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#2c3234|#181c28|g' gtk-2.0/gtkrc
+    sed -i 's|#313131|#181c28|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#313131|#181c28|g' gtk-2.0/gtkrc
     sed -i 's|#33393b|#181c28|g' gtk-3.0/gtk-contained-dark.css
     sed -i 's|#33393b|#181c28|g' gtk-2.0/gtkrc
+    sed -i 's|#353535|#181c28|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#353535|#181c28|g' gtk-2.0/gtkrc
     sed -i 's|#232729|#00001b|g' gtk-3.0/gtk-contained-dark.css
     sed -i 's|#232729|#00001b|g' gtk-2.0/gtkrc
+    sed -i 's|#252a2c|#00001b|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#252a2c|#00001b|g' gtk-2.0/gtkrc
+    sed -i 's|#272c2e|#00001b|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#272c2e|#00001b|g' gtk-2.0/gtkrc
+    sed -i 's|#282828|#00001b|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#282828|#00001b|g' gtk-2.0/gtkrc
+    sed -i 's|#2c3233|#00001b|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#2c3233|#00001b|g' gtk-2.0/gtkrc
+    sed -i 's|#2d2d2d|#00001b|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#2d2d2d|#00001b|g' gtk-2.0/gtkrc
+    sed -i 's|#2e2e2e|#00001b|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#2e2e2e|#00001b|g' gtk-2.0/gtkrc
+    sed -i 's|#303030|#00001b|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#303030|#00001b|g' gtk-2.0/gtkrc
     sed -i 's|35, 39, 41|0, 0, 27|g' gtk-3.0/gtk-contained-dark.css
     sed -i 's|35, 39, 41|0, 0, 27|g' gtk-2.0/gtkrc
+    sed -i 's|46, 46, 46|0, 0, 27|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|46, 46, 46|0, 0, 27|g' gtk-2.0/gtkrc
+    sed -i 's|color: #eeeeec; font-weight: normal|color: #919494; font-weight: bold|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|color: #eeeeec; font-weight: normal|color: #919494; font-weight: bold|g' gtk-2.0/gtkrc
     sed -i 's|#ffffff|#eeeeec|g' gtk-3.0/gtk-contained-dark.css
     sed -i 's|#ffffff|#eeeeec|g' gtk-2.0/gtkrc
     sed -i 's|white|#eeeeec|g' gtk-3.0/gtk-contained-dark.css
     sed -i 's|white|#eeeeec|g' gtk-2.0/gtkrc
     sed -i 's|#262b2d|#1a1e2c|g' gtk-3.0/gtk-contained-dark.css
     sed -i 's|#262b2d|#1a1e2c|g' gtk-2.0/gtkrc
+    sed -i 's|#2f2f2f|#1a1e2c|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#2f2f2f|#1a1e2c|g' gtk-2.0/gtkrc
+    sed -i 's|#15539e|#566b96|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#15539e|#566b96|g' gtk-2.0/gtkrc
     sed -i 's|#215d9c|#566b96|g' gtk-3.0/gtk-contained-dark.css
     sed -i 's|#215d9c|#566b96|g' gtk-2.0/gtkrc
     sed -i 's|#2d3234|#1c202e|g' gtk-3.0/gtk-contained-dark.css
     sed -i 's|#2d3234|#1c202e|g' gtk-2.0/gtkrc
-    sed -i 's|#2c3233|#00001b|g' gtk-3.0/gtk-contained-dark.css
-    sed -i 's|#2c3233|#00001b|g' gtk-2.0/gtkrc
-    sed -i 's|#272c2e|#00001b|g' gtk-3.0/gtk-contained-dark.css
-    sed -i 's|#272c2e|#00001b|g' gtk-2.0/gtkrc
-    sed -i 's|#2c3234|#181c28|g' gtk-3.0/gtk-contained-dark.css
-    sed -i 's|#2c3234|#181c28|g' gtk-2.0/gtkrc
-    sed -i 's|#252a2c|#00001b|g' gtk-3.0/gtk-contained-dark.css
-    sed -i 's|#252a2c|#00001b|g' gtk-2.0/gtkrc
-    sed -i 's|#2b3032|#181c28|g' gtk-3.0/gtk-contained-dark.css
-    sed -i 's|#2b3032|#181c28|g' gtk-2.0/gtkrc
+    sed -i 's|#323232|#1c202e|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#323232|#1c202e|g' gtk-2.0/gtkrc
     sed -i 's|#272c2d|#171b27|g' gtk-3.0/gtk-contained-dark.css
     sed -i 's|#272c2d|#171b27|g' gtk-2.0/gtkrc
+    sed -i 's|#1e1e1e|#101420|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#1e1e1e|#101420|g' gtk-2.0/gtkrc
+    sed -i 's|#373737|#293045|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#373737|#293045|g' gtk-2.0/gtkrc
 
     # dark gradient
-    sed -i 's|#2e3436|#293045|g' gtk-3.0/gtk-contained-dark.css
-    sed -i 's|#2e3436|#293045|g' gtk-2.0/gtkrc
-    sed -i 's|#2a2e30|#1c202e|g' gtk-3.0/gtk-contained-dark.css
-    sed -i 's|#2a2e30|#1c202e|g' gtk-2.0/gtkrc
     sed -i 's|#25292b|#171b27|g' gtk-3.0/gtk-contained-dark.css
     sed -i 's|#25292b|#171b27|g' gtk-2.0/gtkrc
+    sed -i 's|#2a2e30|#1c202e|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#2a2e30|#1c202e|g' gtk-2.0/gtkrc
+    sed -i 's|#2e3436|#293045|g' gtk-3.0/gtk-contained-dark.css
+    sed -i 's|#2e3436|#293045|g' gtk-2.0/gtkrc
 
     mkdir gtk-3.0/assets
     for f in $(gresource list /usr/lib/libgtk-3.so.0 | grep Adwaita/assets); do