Upstream 3.24.30

4 files changed, 25 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 909930cc339c..ca8369e288c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gtk3-classic
 	pkgdesc = GTK3 patched to provide a more classic experience
-	pkgver = 3.24.29
+	pkgver = 3.24.30
 	pkgrel = 1
 	url = https://github.com/lah7/gtk3-classic
 	install = gtk3.install
@@ -59,9 +59,9 @@ pkgbase = gtk3-classic
 	makedepends = lib32-libcups
 	makedepends = lib32-krb5
 	makedepends = lib32-e2fsprogs
-	provides = gtk3=3.24.29
-	provides = gtk3-typeahead=3.24.29
-	provides = gtk3-mushrooms=3.24.29
+	provides = gtk3=3.24.30
+	provides = gtk3-typeahead=3.24.30
+	provides = gtk3-mushrooms=3.24.30
 	provides = gtk3-print-backends
 	provides = libgtk-3.so
 	provides = libgdk-3.so
@@ -69,15 +69,15 @@ pkgbase = gtk3-classic
 	conflicts = gtk3
 	conflicts = gtk3-typeahead
 	conflicts = gtk3-print-backends
-	source = git+https://github.com/lah7/gtk3-classic.git#commit=fdbaeb4e4936e90f8b92abf23c2cb7dd46fbd03b
-	source = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.29.tar.xz
-	source = settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=408873e9af613dc26f6d434fe489735fb8c5de75
-	source = gtk-query-immodules-3.0.hook::https://git.archlinux.org/svntogit/packages.git/plain/trunk/gtk-query-immodules-3.0.hook?h=packages/gtk3&id=408873e9af613dc26f6d434fe489735fb8c5de75
+	source = git+https://github.com/lah7/gtk3-classic.git#commit=c2043c9140121ed5875ce66f61bd934e342a7e80
+	source = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.30.tar.xz
+	source = gtk-query-immodules-3.0.hook::https://raw.githubusercontent.com/archlinux/svntogit-packages/2e881c9916dd4babb5f9922fb07dce2345b3cb4b/trunk/gtk-query-immodules-3.0.hook
+	source = settings.ini
 	source = README.md
 	sha256sums = SKIP
-	sha256sums = f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa
-	sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202
+	sha256sums = ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9
 	sha256sums = a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229
+	sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202
 	sha256sums = 1d2e3c41c7de03a31d717b09e053c88cbaca2ae74eefd982549c49de81c21ada
 
 pkgname = gtk3-classic
@@ -132,7 +132,6 @@ pkgname = lib32-gtk3-classic
 	depends = lib32-libcups
 	depends = lib32-krb5
 	depends = lib32-e2fsprogs
-	depends = gtk3-classic>=3.24.29
-	provides = lib32-gtk3=3.24.29
+	depends = gtk3-classic>=3.24.30
+	provides = lib32-gtk3=3.24.30
 	conflicts = lib32-gtk3
-
diff --git a/.gitignore b/.gitignore
index 88906de3a62b..b8de34d5f132 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,4 @@ src
 *.tar.xz
 *.tar.gz
 gtk-query-immodules-3.0.hook
-settings.ini
 *._patch
diff --git a/PKGBUILD b/PKGBUILD
index d843143e23e8..c69f842faefc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,10 @@
 # This file is based on original PKGBUILD of GTK3 package.
 # https://git.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/gtk3
 
-__arch_pkg_commit="408873e9af613dc26f6d434fe489735fb8c5de75"
-_gtkver=3.24.29
+__arch_pkg_commit="2e881c9916dd4babb5f9922fb07dce2345b3cb4b"
+_gtkver=3.24.30
+
+_gtk3_classic_commit="12f90e216bd894b27cfedc5b1eb918fd7cae4811"
 
 pkgbase=gtk3-classic
 pkgname=($pkgbase lib32-$pkgbase)
@@ -34,16 +36,16 @@ makedepends=(
 )
 install=gtk3.install
 source=(
-	git+$url.git#commit=fdbaeb4e4936e90f8b92abf23c2cb7dd46fbd03b
+	git+$url.git#commit=$_gtk3_classic_commit
 	"https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$_gtkver.tar.xz"
-	"settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=$__arch_pkg_commit"
-	"gtk-query-immodules-3.0.hook::https://git.archlinux.org/svntogit/packages.git/plain/trunk/gtk-query-immodules-3.0.hook?h=packages/gtk3&id=$__arch_pkg_commit"
+	"gtk-query-immodules-3.0.hook::https://raw.githubusercontent.com/archlinux/svntogit-packages/$__arch_pkg_commit/trunk/gtk-query-immodules-3.0.hook"
+	settings.ini
 	README.md
 )
 sha256sums=('SKIP'
-            'f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa'
-            '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
+            'ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9'
             'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229'
+            '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
             '1d2e3c41c7de03a31d717b09e053c88cbaca2ae74eefd982549c49de81c21ada')
 
 prepare()
diff --git a/settings.ini b/settings.ini
new file mode 100644
index 000000000000..921d1ddeec01
--- /dev/null
+++ b/settings.ini
@@ -0,0 +1,4 @@
+[Settings]
+gtk-icon-theme-name = Adwaita
+gtk-theme-name = Adwaita
+gtk-font-name = Cantarell 11