Upstream 3.24.36; Drop lib32-gtk3-classic

2 files changed, 115 insertions, 180 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8d0267185cd7..0e2cb819d78e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,67 +1,68 @@
 pkgbase = gtk3-classic
 	pkgdesc = GTK3 patched to provide a more classic experience
-	pkgver = 3.24.35
+	pkgver = 3.24.36
 	pkgrel = 1
 	url = https://github.com/lah7/gtk3-classic
 	install = gtk3.install
 	arch = x86_64
 	license = LGPL
+	makedepends = adwaita-icon-theme
+	makedepends = at-spi2-atk
+	makedepends = atk
+	makedepends = cairo
+	makedepends = cantarell-fonts
+	makedepends = desktop-file-utils
+	makedepends = fribidi
+	makedepends = gdk-pixbuf2
 	makedepends = git
 	makedepends = gobject-introspection
-	makedepends = libcanberra
-	makedepends = gtk-doc
-	makedepends = sassc
+	makedepends = gtk-update-icon-cache
 	makedepends = libcups
-	makedepends = meson
-	makedepends = quilt
-	makedepends = atk
-	makedepends = cairo
-	makedepends = libxcursor
-	makedepends = libxinerama
-	makedepends = libxrandr
-	makedepends = libxi
+	makedepends = libegl
 	makedepends = libepoxy
-	makedepends = gdk-pixbuf2
-	makedepends = fribidi
+	makedepends = libgl
+	makedepends = librsvg
 	makedepends = libxcomposite
+	makedepends = libxcursor
 	makedepends = libxdamage
+	makedepends = libxi
+	makedepends = libxinerama
+	makedepends = libxkbcommon
+	makedepends = libxrandr
+	makedepends = meson
 	makedepends = pango
+	makedepends = quilt
+	makedepends = sassc
 	makedepends = shared-mime-info
-	makedepends = at-spi2-atk
 	makedepends = wayland
-	makedepends = libxkbcommon
-	makedepends = json-glib
-	makedepends = librsvg
 	makedepends = wayland-protocols
-	makedepends = desktop-file-utils
-	makedepends = mesa
-	makedepends = gtk-update-icon-cache
-	makedepends = adwaita-icon-theme
-	makedepends = cantarell-fonts
-	makedepends = lib32-atk
-	makedepends = lib32-cairo
-	makedepends = lib32-libxcursor
-	makedepends = lib32-libxinerama
-	makedepends = lib32-libxrandr
-	makedepends = lib32-libxi
-	makedepends = lib32-libepoxy
-	makedepends = lib32-gdk-pixbuf2
-	makedepends = lib32-fribidi
-	makedepends = lib32-libxcomposite
-	makedepends = lib32-libxdamage
-	makedepends = lib32-pango
-	makedepends = lib32-at-spi2-atk
-	makedepends = lib32-wayland
-	makedepends = lib32-libxkbcommon
-	makedepends = lib32-json-glib
-	makedepends = lib32-librsvg
-	makedepends = lib32-mesa
-	makedepends = lib32-libcups
-	makedepends = lib32-krb5
-	makedepends = lib32-e2fsprogs
-	provides = gtk3=3.24.35
-	provides = gtk3-typeahead=3.24.35
-	provides = gtk3-mushrooms=3.24.35
+	depends = at-spi2-atk
+	depends = atk
+	depends = cairo
+	depends = desktop-file-utils
+	depends = fribidi
+	depends = gdk-pixbuf2
+	depends = gtk-update-icon-cache
+	depends = libepoxy
+	depends = librsvg
+	depends = libxcomposite
+	depends = libxcursor
+	depends = libxdamage
+	depends = libxi
+	depends = libxinerama
+	depends = libxkbcommon
+	depends = libxrandr
+	depends = pango
+	depends = shared-mime-info
+	depends = wayland
+	optdepends = adwaita-icon-theme: default icon theme
+	optdepends = cantarell-fonts: default font
+	optdepends = colord: color management support
+	optdepends = dconf: default GSettings backend
+	optdepends = libcups: printer support in print dialog
+	provides = gtk3=3.24.36
+	provides = gtk3-typeahead=3.24.36
+	provides = gtk3-mushrooms=3.24.36
 	provides = gtk3-print-backends
 	provides = libgtk-3.so
 	provides = libgdk-3.so
@@ -72,67 +73,13 @@ pkgbase = gtk3-classic
 	conflicts = gtk3-nocsd
 	conflicts = gtk3-nocsd-git
 	conflicts = gtk3-nocsd-legacy-git
-	source = git+https://github.com/lah7/gtk3-classic.git#commit=9d1df122a4efce431d6d853ad2a87ae292b19f61
-	source = https://gitlab.gnome.org/GNOME/gtk/-/archive/b2ad8d2abafbd94c7e58e5e1b98c92e6b6fa6d9a/gtk-b2ad8d2abafbd94c7e58e5e1b98c92e6b6fa6d9a.tar.bz2
+	source = git+https://github.com/lah7/gtk3-classic.git#commit=ca470ac4870271fd9b40a4478c15a70fd10a3a68
+	source = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.36.tar.xz
 	source = gtk-query-immodules-3.0.hook::https://raw.githubusercontent.com/archlinux/svntogit-packages/ec12847fb811add133b399aaf0916c96eb03862e/trunk/gtk-query-immodules-3.0.hook
 	source = settings.ini
 	sha256sums = SKIP
-	sha256sums = a11a387bbe8401cf461d6621eb60680155bd168365d4f5d5a9002ab5084f7043
+	sha256sums = 27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691
 	sha256sums = a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229
 	sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202
 
 pkgname = gtk3-classic
-	depends = atk
-	depends = cairo
-	depends = libxcursor
-	depends = libxinerama
-	depends = libxrandr
-	depends = libxi
-	depends = libepoxy
-	depends = gdk-pixbuf2
-	depends = fribidi
-	depends = libxcomposite
-	depends = libxdamage
-	depends = pango
-	depends = shared-mime-info
-	depends = at-spi2-atk
-	depends = wayland
-	depends = libxkbcommon
-	depends = json-glib
-	depends = librsvg
-	depends = desktop-file-utils
-	depends = mesa
-	depends = gtk-update-icon-cache
-	optdepends = adwaita-icon-theme: default icon theme
-	optdepends = cantarell-fonts: default font
-	optdepends = colord: color management support
-	optdepends = dconf: default GSettings backend
-	optdepends = libcups: printer support in print dialog
-
-pkgname = lib32-gtk3-classic
-	pkgdesc = GTK3 patched to provide a more classic experience (32-bit)
-	depends = lib32-atk
-	depends = lib32-cairo
-	depends = lib32-libxcursor
-	depends = lib32-libxinerama
-	depends = lib32-libxrandr
-	depends = lib32-libxi
-	depends = lib32-libepoxy
-	depends = lib32-gdk-pixbuf2
-	depends = lib32-fribidi
-	depends = lib32-libxcomposite
-	depends = lib32-libxdamage
-	depends = lib32-pango
-	depends = lib32-at-spi2-atk
-	depends = lib32-wayland
-	depends = lib32-libxkbcommon
-	depends = lib32-json-glib
-	depends = lib32-librsvg
-	depends = lib32-mesa
-	depends = lib32-libcups
-	depends = lib32-krb5
-	depends = lib32-e2fsprogs
-	depends = gtk3-classic>=3.24.35
-	provides = lib32-gtk3=3.24.35
-	conflicts = lib32-gtk3
-	conflicts = lib32-libgtk3-nocsd-git
diff --git a/PKGBUILD b/PKGBUILD
index 37c5844e6874..1db736d3bcbb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,15 +6,12 @@
 # https://git.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/gtk3
 
 __arch_pkg_commit="ec12847fb811add133b399aaf0916c96eb03862e"
+_gtkver=3.24.36
 
-# NOTE: 3.24.35 is missing a source file required for building (#87),a commit
-#       tarball will be downloaded instead for this release.
-_gtkver=3.24.35
-
-_gtk3_classic_commit="9d1df122a4efce431d6d853ad2a87ae292b19f61"
+_gtk3_classic_commit="ca470ac4870271fd9b40a4478c15a70fd10a3a68"
 
 pkgbase=gtk3-classic
-pkgname=($pkgbase lib32-$pkgbase)
+pkgname=($pkgbase)
 pkgver=${_gtkver}
 pkgrel=1
 pkgdesc="GTK3 patched to provide a more classic experience"
@@ -24,40 +21,82 @@ provides=(gtk3=$_gtkver gtk3-typeahead=$_gtkver gtk3-mushrooms=$_gtkver gtk3-pri
           libgtk-3.so libgdk-3.so libgailutil-3.so)
 arch=(x86_64)
 license=(LGPL)
-makedepends=(
-	git gobject-introspection libcanberra gtk-doc sassc libcups meson quilt
-
-	atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 fribidi
-	libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon
-	json-glib librsvg wayland-protocols desktop-file-utils mesa gtk-update-icon-cache
-	adwaita-icon-theme cantarell-fonts
+depends=(
+	at-spi2-atk
+	atk
+	cairo
+	desktop-file-utils
+	fribidi
+	gdk-pixbuf2
+	gtk-update-icon-cache
+	libepoxy
+	librsvg
+	libxcomposite
+	libxcursor
+	libxdamage
+	libxi
+	libxinerama
+	libxkbcommon
+	libxrandr
+	pango
+	shared-mime-info
+	wayland
+)
+optdepends=(
+	'adwaita-icon-theme: default icon theme'
+	'cantarell-fonts: default font'
+	'colord: color management support'
+	'dconf: default GSettings backend'
+	'libcups: printer support in print dialog'
+)
 
-	lib32-atk lib32-cairo lib32-libxcursor lib32-libxinerama lib32-libxrandr lib32-libxi
-	lib32-libepoxy lib32-gdk-pixbuf2 lib32-fribidi lib32-libxcomposite lib32-libxdamage
-	lib32-pango lib32-at-spi2-atk lib32-wayland lib32-libxkbcommon lib32-json-glib
-	lib32-librsvg lib32-mesa lib32-libcups lib32-krb5 lib32-e2fsprogs
+makedepends=(
+	adwaita-icon-theme
+	at-spi2-atk
+	atk
+	cairo
+	cantarell-fonts
+	desktop-file-utils
+	fribidi
+	gdk-pixbuf2
+	git
+	gobject-introspection
+	gtk-update-icon-cache
+	libcups
+	libegl
+	libepoxy
+	libgl
+	librsvg
+	libxcomposite
+	libxcursor
+	libxdamage
+	libxi
+	libxinerama
+	libxkbcommon
+	libxrandr
+	meson
+	pango
+	quilt
+	sassc
+	shared-mime-info
+	wayland
+	wayland-protocols
 )
 install=gtk3.install
 source=(
 	git+$url.git#commit=$_gtk3_classic_commit
-# 	"https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$_gtkver.tar.xz"
-
-	# WORKAROUND: 3.24.35 is missing a source file (#87)
-	https://gitlab.gnome.org/GNOME/gtk/-/archive/b2ad8d2abafbd94c7e58e5e1b98c92e6b6fa6d9a/gtk-b2ad8d2abafbd94c7e58e5e1b98c92e6b6fa6d9a.tar.bz2
+ 	"https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$_gtkver.tar.xz"
 
 	"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
 )
 sha256sums=('SKIP'
-            'a11a387bbe8401cf461d6621eb60680155bd168365d4f5d5a9002ab5084f7043'
+            '27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691'
             'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229'
             '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202')
 
 prepare()
 {
-	# WORKAROUND: 3.24.35 needs to use commit tarball because of missing file (#87)
-	mv gtk-b2ad8d2abafbd94c7e58e5e1b98c92e6b6fa6d9a gtk+-$_gtkver
-
 	cd gtk+-$_gtkver
 	QUILT_PATCHES=../$pkgbase quilt push -av
 
@@ -79,42 +118,10 @@ build()
 		-D tests=false \
 		-D installed_tests=false
 	ninja -C build
-
-	# 32-bit
-	export PKG_CONFIG_LIBDIR="/usr/lib32/pkgconfig"
-	export PKG_CONFIG_PATH="/usr/share/pkgconfig"
-
-	CFLAGS+=" -m32"
-	CXXFLAGS+=" -m32"
-	LDFLAGS+=" -m32"
-
-	linux32 arch-meson gtk+-$_gtkver build32 \
-		-D broadway_backend=true \
-		-D colord=auto \
-		-D demos=false \
-		-D examples=false \
-		-D introspection=false \
-		-D tests=false \
-		-D installed_tests=false \
-		-D libdir=/usr/lib32
-	linux32 ninja -C build32
 }
 
 package_gtk3-classic()
 {
-	depends=(
-		atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 fribidi
-		libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon
-		json-glib librsvg desktop-file-utils mesa gtk-update-icon-cache
-	)
-	optdepends=(
-		'adwaita-icon-theme: default icon theme'
-		'cantarell-fonts: default font'
-		'colord: color management support'
-		'dconf: default GSettings backend'
-		'libcups: printer support in print dialog'
-	)
-
 	DESTDIR="$pkgdir" meson install -C build
 
 	install -Dt "$pkgdir/usr/share/gtk-3.0" -m644 settings.ini
@@ -122,22 +129,3 @@ package_gtk3-classic()
 
 	rm "$pkgdir/usr/bin/gtk-update-icon-cache"
 }
-
-package_lib32-gtk3-classic()
-{
-	pkgdesc="GTK3 patched to provide a more classic experience (32-bit)"
-	depends=(
-		lib32-atk lib32-cairo lib32-libxcursor lib32-libxinerama lib32-libxrandr lib32-libxi
-		lib32-libepoxy lib32-gdk-pixbuf2 lib32-fribidi lib32-libxcomposite lib32-libxdamage
-		lib32-pango lib32-at-spi2-atk lib32-wayland lib32-libxkbcommon lib32-json-glib
-		lib32-librsvg lib32-mesa lib32-libcups lib32-krb5 lib32-e2fsprogs
-		"gtk3-classic>=$pkgver"
-	)
-	conflicts=(lib32-gtk3 lib32-libgtk3-nocsd-git)
-	provides=("lib32-gtk3=$pkgver")
-
-	DESTDIR="$pkgdir" linux32 meson install -C build32
-
-	rm -fr "$pkgdir"/etc
-	rm -fr "$pkgdir"/usr/{bin,share,include}
-}