Update Ver 3.18.0

2 files changed, 12 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1a779691a751..44e8090eb735 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = xfce-theme-greybird
-	pkgdesc = A grey and blue Xfce theme, used by default in Xubuntu 12.04
-	pkgver = 1.6.2
-	pkgrel = 4
-	url = http://shimmerproject.org/projects/greybird/
+	pkgdesc = A grey and blue Xfce theme.
+	pkgver = 3.18.0
+	pkgrel = 1
+	url = https://github.com/shimmerproject/Greybird
 	arch = any
 	groups = xfce-themes-shimmer-collection
 	license = CCPL:by-sa-3.0
@@ -15,10 +15,8 @@ pkgbase = xfce-theme-greybird
 	optdepends = shimmer-wallpapers: contains the Greybird wallpaper, among others
 	optdepends = lib32-gtk-engine-murrine: required for multilib
 	conflicts = xfce-theme-greybird-git
-	source = xfce-theme-greybird-1.6.2.tar.gz::https://github.com/shimmerproject/Greybird/archive/v1.6.2.tar.gz
-	source = GTK3.20-patch.tar.gz::https://github.com/Poultryphile/xfce-theme-greybird/archive/1.6.2.tar.gz
-	sha256sums = 473a38b379381311b68dcc579005c0d5bbfbabefe1de7107d897c68b81e6b460
-	sha256sums = cac9e935b7b5bb216c45fb4df2ddd75d4d8353185189fa763ddaa91025768139
+	source = xfce-theme-greybird-3.18.0.tar.gz::https://github.com/shimmerproject/Greybird/archive/v3.18.0.tar.gz
+	sha256sums = 85a2d6bb73c32fb1caba2e5881dcf604af5b394bb8818058df874398e6dfe96f
 
 pkgname = xfce-theme-greybird
 
diff --git a/PKGBUILD b/PKGBUILD
index 909a3a80812d..03ca72ec0392 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
 # Contributor:	flan_suse
 
 pkgname=xfce-theme-greybird
-pkgver=1.6.2
-pkgrel=4
-pkgdesc="A grey and blue Xfce theme, used by default in Xubuntu 12.04"
+pkgver=3.18.0
+pkgrel=1
+pkgdesc="A grey and blue Xfce theme."
 arch=('any')
-url="http://shimmerproject.org/projects/greybird/"
+url="https://github.com/shimmerproject/Greybird"
 license=('CCPL:by-sa-3.0' 'GPL')
 groups=('xfce-themes-shimmer-collection')
 conflicts=("$pkgname-git")
@@ -18,18 +18,8 @@ optdepends=('elementary-xfce-icons: matching icon set; use the dark icon theme'
 	    'lightdm-unity-greeter: required for the LightDM Unity theme'
 	    'shimmer-wallpapers: contains the Greybird wallpaper, among others'
 	    'lib32-gtk-engine-murrine: required for multilib')
-_github="https://github.com"
-source=("$pkgname-$pkgver.tar.gz"::"$_github/shimmerproject/Greybird/archive/v$pkgver.tar.gz"
-	"GTK3.20-patch.tar.gz"::"$_github/Poultryphile/$pkgname/archive/$pkgver.tar.gz")
-sha256sums=('473a38b379381311b68dcc579005c0d5bbfbabefe1de7107d897c68b81e6b460'
-	    'cac9e935b7b5bb216c45fb4df2ddd75d4d8353185189fa763ddaa91025768139')
-
-build() {
-	cd "$srcdir"
-	
-	patch -p0 -Nus -i "$pkgname-$pkgver/$pkgname-$pkgver-GTK3.20.patch" \
-	> /dev/null || echo "1" > /dev/null
-}
+source=("$pkgname-$pkgver.tar.gz"::"https://github.com/shimmerproject/Greybird/archive/v$pkgver.tar.gz")
+sha256sums=('85a2d6bb73c32fb1caba2e5881dcf604af5b394bb8818058df874398e6dfe96f')
 
 package() {
 	cd "$srcdir"