Upstream: 20180302

2 files changed, 38 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2dbbfc3c9821..e3f3008e8f5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = matcha-gtk-theme
 	pkgdesc = A flat design themes for GNOME, MATE, Openbox, Unity, XFCE, Budgie
-	pkgver = 20180228
+	pkgver = 20180302
 	pkgrel = 1
 	url = https://www.gnome-look.org/p/1187179
 	arch = any
@@ -8,18 +8,18 @@ pkgbase = matcha-gtk-theme
 	depends = gtk-engine-murrine
 	depends = gtk-engines
 	depends = gtk3
-	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519752012/s/715cc90911d17d6eddfa1edafa2c2c5c/t/1519766283/Matcha-sea.tar.xz
-	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519752000/s/715cc90911d17d6eddfa1edafa2c2c5c/t/1519766283/Matcha-azul.tar.xz
-	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519751997/s/715cc90911d17d6eddfa1edafa2c2c5c/t/1519766283/Matcha-aliz.tar.xz
-	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519752010/s/715cc90911d17d6eddfa1edafa2c2c5c/t/1519766283/Matcha-dark-sea.tar.xz
-	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519752007/s/715cc90911d17d6eddfa1edafa2c2c5c/t/1519766283/Matcha-dark-azul.tar.xz
-	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519752002/s/715cc90911d17d6eddfa1edafa2c2c5c/t/1519766283/Matcha-dark-aliz.tar.xz
-	sha256sums = 47131a6c86fa874a4455118e4bca6fb25bd23d18b8b125930fe5e7f6114d13a1
-	sha256sums = f68d4fc043aacddfcdcc324145ca850fcc5469f93b6cfbd9deac895e45fbaa51
-	sha256sums = 07bc015150e9b957e884c5aed80769f6ba91a100ceb6d16b2a5a8377e72600e0
-	sha256sums = 407c390147ab812418708a79c89a269a3f7af96db83713d5d2d3208932649b4e
-	sha256sums = 54923fa331a5e23baacee4f8e62173a262804dd389ffa9dd223fc9a1547dd4ba
-	sha256sums = 36f6281df90ec3b9632ef9797aa0bbc014f3a59ac0f21072e3327253af2ea9ba
+	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519962314/s/570c7779a800cec791e71885beebcdea/t/1519976024/Matcha-sea.tar.xz
+	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519962308/s/570c7779a800cec791e71885beebcdea/t/1519976024/Matcha-azul.tar.xz
+	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519962307/s/570c7779a800cec791e71885beebcdea/t/1519976024/Matcha-aliz.tar.xz
+	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519962313/s/570c7779a800cec791e71885beebcdea/t/1519976024/Matcha-dark-sea.tar.xz
+	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519962311/s/570c7779a800cec791e71885beebcdea/t/1519976024/Matcha-dark-azul.tar.xz
+	source = https://dl.opendesktop.org/api/files/downloadfile/id/1519962310/s/570c7779a800cec791e71885beebcdea/t/1519976024/Matcha-dark-aliz.tar.xz
+	sha256sums = 10a2c4a3d92fb4c50cc97eff1f1edd7b2d741c9b14bbf90b69755b9d21b1dec4
+	sha256sums = b3b05e077bac560c19b06bfc295770e0a790ec226c0679427efa81b52bc35979
+	sha256sums = 889ab0fa2273b256d2024708710e707869220bbd77f11ec2e74ce5a29039bf07
+	sha256sums = ea2e1fddd915248f65159aaec3bf483c8ae73789b50e5389b4097eabb2f75f77
+	sha256sums = a087aca6822ad1ecc8158f1a0170a36674135ae54fffc6dde4e817d0aeff8b18
+	sha256sums = 0ae8e72284d2df20d4e9b81fec39861e4f43cb93a9d16e6b6762f03860f3a67c
 
 pkgname = matcha-gtk-theme
 
diff --git a/PKGBUILD b/PKGBUILD
index cd58e5186025..17bd25ab379c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: grimi <grimi at poczta dot fm>
 
 pkgname=matcha-gtk-theme
-pkgver=20180228
+pkgver=20180302
 pkgrel=1
 pkgdesc="A flat design themes for GNOME, MATE, Openbox, Unity, XFCE, Budgie"
 arch=('any')
@@ -9,30 +9,34 @@ url='https://www.gnome-look.org/p/1187179'
 license=('GPL3')
 depends=('gtk-engine-murrine' 'gtk-engines' 'gtk3')
 _hash_time=($(curl -s "$url"|grep -e "hash =" -e "timetamp ="|sed "s/.*= '\(.*\)';/\1/"))
-source=("https://dl.opendesktop.org/api/files/downloadfile/id/1519752012/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-sea.tar.xz"
-        "https://dl.opendesktop.org/api/files/downloadfile/id/1519752000/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-azul.tar.xz"
-        "https://dl.opendesktop.org/api/files/downloadfile/id/1519751997/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-aliz.tar.xz"
-        "https://dl.opendesktop.org/api/files/downloadfile/id/1519752010/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-dark-sea.tar.xz"
-        "https://dl.opendesktop.org/api/files/downloadfile/id/1519752007/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-dark-azul.tar.xz"
-        "https://dl.opendesktop.org/api/files/downloadfile/id/1519752002/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-dark-aliz.tar.xz")
+source=("https://dl.opendesktop.org/api/files/downloadfile/id/1519962314/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-sea.tar.xz"
+        "https://dl.opendesktop.org/api/files/downloadfile/id/1519962308/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-azul.tar.xz"
+        "https://dl.opendesktop.org/api/files/downloadfile/id/1519962307/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-aliz.tar.xz"
+        "https://dl.opendesktop.org/api/files/downloadfile/id/1519962313/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-dark-sea.tar.xz"
+        "https://dl.opendesktop.org/api/files/downloadfile/id/1519962311/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-dark-azul.tar.xz"
+        "https://dl.opendesktop.org/api/files/downloadfile/id/1519962310/s/${_hash_time[0]}/t/${_hash_time[1]}/Matcha-dark-aliz.tar.xz")
 
-sha256sums=('47131a6c86fa874a4455118e4bca6fb25bd23d18b8b125930fe5e7f6114d13a1'
-            'f68d4fc043aacddfcdcc324145ca850fcc5469f93b6cfbd9deac895e45fbaa51'
-            '07bc015150e9b957e884c5aed80769f6ba91a100ceb6d16b2a5a8377e72600e0'
-            '407c390147ab812418708a79c89a269a3f7af96db83713d5d2d3208932649b4e'
-            '54923fa331a5e23baacee4f8e62173a262804dd389ffa9dd223fc9a1547dd4ba'
-            '36f6281df90ec3b9632ef9797aa0bbc014f3a59ac0f21072e3327253af2ea9ba')
+sha256sums=('10a2c4a3d92fb4c50cc97eff1f1edd7b2d741c9b14bbf90b69755b9d21b1dec4'
+            'b3b05e077bac560c19b06bfc295770e0a790ec226c0679427efa81b52bc35979'
+            '889ab0fa2273b256d2024708710e707869220bbd77f11ec2e74ce5a29039bf07'
+            'ea2e1fddd915248f65159aaec3bf483c8ae73789b50e5389b4097eabb2f75f77'
+            'a087aca6822ad1ecc8158f1a0170a36674135ae54fffc6dde4e817d0aeff8b18'
+            '0ae8e72284d2df20d4e9b81fec39861e4f43cb93a9d16e6b6762f03860f3a67c')
 
 
 prepare() {
-   local ori="#2f9b85" sea="#2eb398" azul="#3498db" aliz="#f0544c"
-   #sed -i 's/\(menu.border.width:\).*$/\1 1/' Matcha-*/openbox-3/themerc
-   sed -i 's/\(menu.items.text.color:\).*$/\1 #d3c2c5/; s/\(menu.items.bg.color:\).*$/\1 #1f2729/;
-        s/\(menu.border.color:\).*$/\1 #2d3036/; s/\(menu.seperator.color:\).*$/\1 #32353b/' \
-        Matcha-dark-*/openbox-3/themerc
-   sed -i "s/$ori/$sea/Ig" Matcha{,-dark}-sea/openbox-3/themerc
-   sed -i "s/$ori/$azul/Ig" Matcha{,-dark}-azul/openbox-3/themerc
-   sed -i "s/$ori/$aliz/Ig" Matcha{,-dark}-aliz/openbox-3/themerc
+   sed -i 's/\(menu.items.text.color:\).*$/\1 #d3c2c5/; s/\(menu.border.color:\).*$/\1 #2d3036/;
+      s/\(menu.seperator.color:\).*$/\1 #32353b/' Matcha-dark-*/openbox-3/themerc
+
+   sed -i 's/\(menu.items.bg.color:\).*$/\1 #1f2729/' Matcha-dark-sea/openbox-3/themerc
+   sed -i 's/\(menu.items.bg.color:\).*$/\1 #1b1d24/' Matcha-dark-azul/openbox-3/themerc
+   sed -i 's/\(menu.items.bg.color:\).*$/\1 #222222/' Matcha-dark-aliz/openbox-3/themerc
+
+   sed -i 's/#2f9b85/#2eb398/Ig' Matcha{,-dark}-sea/openbox-3/themerc
+   sed -i 's/#2f9b85/#3498db/Ig' Matcha{,-dark}-azul/openbox-3/themerc
+   sed -i 's/#2f9b85/#f0544c/Ig' Matcha{,-dark}-aliz/openbox-3/themerc
+   sed -i 's/#1b2224/#1b1d24/Ig' Matcha{,-dark}-azul/openbox-3/themerc
+   sed -i 's/#1b2224/#222222/Ig' Matcha{,-dark}-aliz/openbox-3/themerc
 }
 
 package() {