Initial Commit

5 files changed, 147 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..fd986036264e
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,52 @@
+pkgbase = gtk2-patched-filechooser-icon-view
+	pkgdesc = GTK2 patched with ahodesuka's filechooser-icon-view patch.
+	pkgver = 2.24.28
+	pkgrel = 1
+	url = https://gist.github.com/ahodesuka/01213036b58e510dc074
+	install = gtk2.install
+	arch = i686
+	arch = x86_64
+	license = LGPL
+	makedepends = atk
+	makedepends = pango
+	makedepends = libxcursor
+	makedepends = libxinerama
+	makedepends = libxrandr
+	makedepends = libxi
+	makedepends = libxcomposite
+	makedepends = libxdamage
+	makedepends = shared-mime-info
+	makedepends = cairo
+	makedepends = libcups
+	makedepends = gdk-pixbuf2
+	makedepends = gobject-introspection
+	makedepends = python2
+	depends = atk
+	depends = pango
+	depends = libxcursor
+	depends = libxinerama
+	depends = libxrandr
+	depends = libxi
+	depends = libxcomposite
+	depends = libxdamage
+	depends = shared-mime-info
+	depends = cairo
+	depends = libcups
+	depends = gtk-update-icon-cache
+	depends = glib2-patched-thumbnailer
+	optdepends = gnome-themes-standard: Default widget theme
+	optdepends = gnome-icon-theme: Default icon theme
+	provides = gtk2=2.24.28
+	conflicts = gtk2
+	replaces = gtk2-docs
+	source = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.28.tar.xz
+	source = gtkrc
+	source = xid-collision-debug.patch
+	source = https://gist.githubusercontent.com/ahodesuka/01213036b58e510dc074/raw/2bc146e381aa988f6c29d547ed98432389b205a5/gtk2-filechooser-icon-view.patch
+	sha256sums = b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656
+	sha256sums = b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2
+	sha256sums = d758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558
+	sha256sums = e55f6a4e4e5fac92d3f5b08c6a609013893ab386e2564527cce0a4e375edd514
+
+pkgname = gtk2-patched-filechooser-icon-view
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..bbb341a9c3f6
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,60 @@
+# Maintainer: Vaporeon <vaporeon@tfwno.gf>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=gtk2-patched-filechooser-icon-view
+pkgname=gtk2-patched-filechooser-icon-view
+pkgver=2.24.28
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc="GTK2 patched with ahodesuka's filechooser-icon-view patch."
+url="https://gist.github.com/ahodesuka/01213036b58e510dc074"
+provides="gtk2=$pkgver"
+conflicts=gtk2
+install=gtk2.install
+makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
+             'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection' 'python2')
+depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 
+         'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache' 'glib2-patched-thumbnailer')
+optdepends=('gnome-themes-standard: Default widget theme' 
+            'gnome-icon-theme: Default icon theme')
+replaces=('gtk2-docs')
+license=('LGPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
+        gtkrc xid-collision-debug.patch
+        https://gist.githubusercontent.com/ahodesuka/01213036b58e510dc074/raw/2bc146e381aa988f6c29d547ed98432389b205a5/gtk2-filechooser-icon-view.patch)
+sha256sums=('b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656'
+            'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2'
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+            'e55f6a4e4e5fac92d3f5b08c6a609013893ab386e2564527cce0a4e375edd514')
+
+prepare() {
+    cd gtk+-$pkgver
+    patch -Np1 -i ../xid-collision-debug.patch
+    patch -Np1 -i $srcdir/gtk2-filechooser-icon-view.patch
+}
+
+build() {
+    cd gtk+-$pkgver
+
+    CXX=/bin/false ./configure --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --with-xinput=yes
+
+    # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+    make
+}
+
+package() {
+    cd gtk+-$pkgver
+    make DESTDIR="$pkgdir" install
+
+    sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
+
+    install -Dm644 "$srcdir/gtkrc" "$pkgdir/usr/share/gtk-2.0/gtkrc"
+
+    #split this out to use with gtk3 too
+    rm $pkgdir/usr/bin/gtk-update-icon-cache
+}
diff --git a/gtk2.install b/gtk2.install
new file mode 100644
index 000000000000..f14e648d38bb
--- /dev/null
+++ b/gtk2.install
@@ -0,0 +1,17 @@
+post_install() {
+    /usr/bin/gtk-query-immodules-2.0 --update-cache
+}
+
+pre_upgrade() {
+    if (( $(vercmp $2 2.24.20) < 0 )); then
+        rm -f /etc/gtk-2.0/gtk.immodules
+    fi
+}
+
+post_upgrade() {
+    post_install
+}
+
+pre_remove() {
+    rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache
+}
diff --git a/gtkrc b/gtkrc
new file mode 100644
index 000000000000..d2282ac36e5f
--- /dev/null
+++ b/gtkrc
@@ -0,0 +1,3 @@
+gtk-icon-theme-name = "gnome"
+gtk-theme-name = "Adwaita"
+gtk-font-name = "Cantarell 11"
diff --git a/xid-collision-debug.patch b/xid-collision-debug.patch
new file mode 100644
index 000000000000..d61238c3b274
--- /dev/null
+++ b/xid-collision-debug.patch
@@ -0,0 +1,15 @@
+--- gtk+-2.18.3/gdk/x11/gdkxid.c	2009-06-19 04:59:18.000000000 +0200
++++ gtk+-2.18.3/gdk/x11/gdkxid.c.new	2009-07-22 11:30:12.000000000 +0200
+@@ -56,10 +56,10 @@
+   if (!display_x11->xid_ht)
+     display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
+ 					    (GEqualFunc) gdk_xid_equal);
+-
++/*
+   if (g_hash_table_lookup (display_x11->xid_ht, xid))
+     g_warning ("XID collision, trouble ahead");
+-
++*/
+   g_hash_table_insert (display_x11->xid_ht, xid, data);
+ }
+