diff options
| -rw-r--r-- | .SRCINFO | 37 | ||||
| -rw-r--r-- | PKGBUILD | 87 | ||||
| -rw-r--r-- | xid-collision-debug.patch | 20 |
3 files changed, 84 insertions, 60 deletions
@@ -1,33 +1,31 @@ pkgbase = gtk2-patched-filechooser-icon-view pkgdesc = GTK2 patched with ahodesuka's filechooser-icon-view patch pkgver = 2.24.33 - pkgrel = 2 + pkgrel = 3 url = https://github.com/Dudemanguy/gtk/tree/gtk2-filechooser-icon-view install = gtk2.install arch = x86_64 license = LGPL - makedepends = gobject-introspection makedepends = git + makedepends = gobject-introspection makedepends = gtk-doc depends = atk - depends = pango + depends = cairo + depends = desktop-file-utils + depends = gtk-update-icon-cache + depends = libcups + depends = librsvg + depends = libxcomposite depends = libxcursor + depends = libxdamage + depends = libxi depends = libxinerama depends = libxrandr - depends = libxi - depends = libxcomposite - depends = libxdamage + depends = pango depends = shared-mime-info - depends = cairo - depends = libcups - depends = gtk-update-icon-cache - depends = librsvg - depends = desktop-file-utils - depends = gtk-doc - optdepends = gnome-themes-standard: Default widget theme optdepends = adwaita-icon-theme: Default icon theme + optdepends = gnome-themes-standard: Default widget theme optdepends = python: gtk-builder-convert - provides = gtk2=2.24.33 provides = libgailutil.so provides = libgdk-x11-2.0.so provides = libgtk-x11-2.0.so @@ -37,11 +35,10 @@ pkgbase = gtk2-patched-filechooser-icon-view source = gtk-query-immodules-2.0.hook source = xid-collision-debug.patch source = gtk2-filechooser-icon-view.patch - sha256sums = SKIP - sha256sums = bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805 - sha256sums = 427e7ed2626465ea7a8986189b6c8340a0520b9f7b8e2a56cd1169d375da7425 - sha256sums = 7724a55c4916318ed81b22f21c37c0a66e78adce017563fed6d84d813a4b80bc - sha256sums = 45a6533c89e4bc5b84b2a50473b560503a7cc6a45b30bac1a4b83807c5f85b7d + b2sums = SKIP + b2sums = 0583436972edcebb09ce6c3f445f6ea4d7f92132da0ef317ee93665b646061ba261281b0186ed6655e63bbb668c58e37f6987919d4c054ccda19ca034aa718dc + b2sums = 9c531f9f605e1739e13c39c1cac22daddd9574f3082f18bcf0b9dfaa4c41f2485d55be03a9ed12fb4504d509f0d5ac63980a9d9349e3f80a06595c6430c78096 + b2sums = c35b2f16ea3402f41a7a5ac83a93b423e46f9355e11186742402887ba94fc58e9a5c1d7fc55141fab72f230a973c5ac6346090b225a5eff9e416e397bd1b1ec4 + b2sums = 3bfc017cdb94f604b6d211747641cc6564955c0f4108654cea11dc19a574854ee0d56019f34faa577f3b92708a2c7b57b4a1a2146c9d7772bf0a567288be60a6 pkgname = gtk2-patched-filechooser-icon-view - @@ -5,33 +5,62 @@ pkgname=gtk2-patched-filechooser-icon-view pkgver=2.24.33 -pkgrel=2 -arch=(x86_64) +pkgrel=3 pkgdesc="GTK2 patched with ahodesuka's filechooser-icon-view patch" url="https://github.com/Dudemanguy/gtk/tree/gtk2-filechooser-icon-view" provides=(gtk2=$pkgver libgailutil.so libg{d,t}k-x11-2.0.so) conflicts=('gtk2') -depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' - 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache' 'librsvg' - 'desktop-file-utils' 'gtk-doc') -makedepends=(gobject-introspection git gtk-doc) -optdepends=('gnome-themes-standard: Default widget theme' - 'adwaita-icon-theme: Default icon theme' - 'python: gtk-builder-convert') +arch=(x86_64) +depends=( + atk + cairo + desktop-file-utils + gtk-update-icon-cache + libcups + librsvg + libxcomposite + libxcursor + libxdamage + libxi + libxinerama + libxrandr + pango + shared-mime-info +) +makedepends=( + git + gobject-introspection + gtk-doc +) +optdepends=( + 'adwaita-icon-theme: Default icon theme' + 'gnome-themes-standard: Default widget theme' + 'python: gtk-builder-convert' +) +provides=( + libgailutil.so + libg{d,t}k-x11-2.0.so +) license=('LGPL') install=gtk2.install _commit=68631945733158f164427db84f01301d7e875763 # tags/2.24.33^0 -source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit" - gtkrc - gtk-query-immodules-2.0.hook - xid-collision-debug.patch - gtk2-filechooser-icon-view.patch) +source=( + "git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit" + gtkrc + gtk-query-immodules-2.0.hook + xid-collision-debug.patch + gtk2-filechooser-icon-view.patch +) +b2sums=('SKIP' + '0583436972edcebb09ce6c3f445f6ea4d7f92132da0ef317ee93665b646061ba261281b0186ed6655e63bbb668c58e37f6987919d4c054ccda19ca034aa718dc' + '9c531f9f605e1739e13c39c1cac22daddd9574f3082f18bcf0b9dfaa4c41f2485d55be03a9ed12fb4504d509f0d5ac63980a9d9349e3f80a06595c6430c78096' + 'c35b2f16ea3402f41a7a5ac83a93b423e46f9355e11186742402887ba94fc58e9a5c1d7fc55141fab72f230a973c5ac6346090b225a5eff9e416e397bd1b1ec4' + '3bfc017cdb94f604b6d211747641cc6564955c0f4108654cea11dc19a574854ee0d56019f34faa577f3b92708a2c7b57b4a1a2146c9d7772bf0a567288be60a6') -sha256sums=('SKIP' - 'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805' - '427e7ed2626465ea7a8986189b6c8340a0520b9f7b8e2a56cd1169d375da7425' - '7724a55c4916318ed81b22f21c37c0a66e78adce017563fed6d84d813a4b80bc' - '45a6533c89e4bc5b84b2a50473b560503a7cc6a45b30bac1a4b83807c5f85b7d') +pkgver() { + cd gtk + git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' +} prepare() { cd gtk @@ -41,18 +70,17 @@ prepare() { } build() { - cd gtk - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-xinput=yes \ + local configure_options=( + --prefix=/usr + --sysconfdir=/etc + --localstatedir=/var + --with-xinput=yes --disable-gtk-doc + ) - # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + cd gtk + ./configure "${configure_options[@]}" sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make } @@ -63,5 +91,8 @@ package() { install -Dt "$pkgdir/usr/share/gtk-2.0" -m644 ../gtkrc install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../gtk-query-immodules-2.0.hook + # Built by GTK 4, shared with GTK 2/3 rm "$pkgdir/usr/bin/gtk-update-icon-cache" } + +# vim:set sw=2 sts=-1 et: diff --git a/xid-collision-debug.patch b/xid-collision-debug.patch index 187ce879589d..a0d43a6cd70c 100644 --- a/xid-collision-debug.patch +++ b/xid-collision-debug.patch @@ -1,20 +1,16 @@ - gdk/x11/gdkxid.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + gdk/x11/gdkxid.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git c/gdk/x11/gdkxid.c i/gdk/x11/gdkxid.c -index 1005f9e40c..71578f8fcf 100644 +index 1005f9e40c..1523fa70b2 100644 --- c/gdk/x11/gdkxid.c +++ i/gdk/x11/gdkxid.c -@@ -56,10 +56,10 @@ _gdk_xid_table_insert (GdkDisplay *display, - if (!display_x11->xid_ht) - display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash, +@@ -58,7 +58,7 @@ _gdk_xid_table_insert (GdkDisplay *display, (GEqualFunc) gdk_xid_equal); -- -+/* + if (g_hash_table_lookup (display_x11->xid_ht, xid)) - g_warning ("XID collision, trouble ahead"); -- -+*/ +- g_warning ("XID collision, trouble ahead"); ++ g_debug ("XID collision, trouble ahead"); + g_hash_table_insert (display_x11->xid_ht, xid, data); } - |