>From 2bf87ba28f649119bc4d7667a4f6b7a8578fd1ad Mon Sep 17 00:00:00 2001
From: Henrique Lengler <henriqueleng@opmbx.org>
Date: Fri, 9 Jan 2015 22:55:46 +0000
Subject: [PATCH] gtk+2, new version

---
 pkg/gtk+2 | 90 ++++++++++++++++-----------------------------------------------
 1 file changed, 22 insertions(+), 68 deletions(-)

diff --git a/pkg/gtk+2 b/pkg/gtk+2
index 5e28e4e..9ff69b8 100644
--- a/pkg/gtk+2
+++ b/pkg/gtk+2
@@ -1,84 +1,38 @@
-[mirrors]
-http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.10.tar.xz
-
 [main]
-filesize=13261132
-sha512=46bd22af861c04cf7d7b704356936f282da9e7edec1e637dd578170396ce6b4a837f660b46334ceb73372a076966e31afc02aaafb5d69796539ddaac1531fedf
+filesize=13327832
+sha512=e102eabbd86e9e697402b4d915172dd3838374b7b8a16b95369ed602228857a013fdba7b6b8d742f925ff8d340b63a90b56c1ddbd4405d8dc454144c705ac08d
+
+[mirrors]
+http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.25.tar.xz
 
 [deps]
-pango
 cairo
 atk
-gdk-pixbuf
+glib
+pango
+expat
+libice
 libx11
-libxext
-libxrender
-libxdamage
 libxcomposite
 libxcursor
+libxext
+libxfixes
 libxrandr
-libxinerama
-
-[deps.host]
-pkgconf
-
 [build]
-patch -p1 < "$K"/gtk-icontheme-fallback.patch
-
-# fixes from LFS: fix messed up makefile when docbook is installed
-sed -i 's#l \(gtk-.*\).sgml#& -o \1#' docs/tutorial/Makefile.in
-sed -i 's#l \(gtk-.*\).sgml#& -o \1#' docs/faq/Makefile.in
-sed -i 's#.*@man_#man_#' docs/reference/gtk/Makefile.in
-
-printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\nclean:\n\ttrue\n\ndistclean:\n\ttrue" > gdk/tests/Makefile.in
-printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\nclean:\n\ttrue\n\ndistclean:\n\ttrue" > gtk/tests/Makefile.in
-printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\nclean:\n\ttrue\n\ndistclean:\n\ttrue" > tests/Makefile.in
-printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\nclean:\n\ttrue\n\ndistclean:\n\ttrue" > modules/other/gail/tests/Makefile.in
-
-# remove obfuscated symbols
-printf '#!/bin/sh\ntrue\n' > gtk/makegtkalias.pl
-for i in gtk/gtkaliasdef.c gtk/gtkalias.h ; do
-        rm -f "$i" && touch "$i"
-done
-
 [ -n "$CROSS_COMPILE" ] && \
-  xconfflags="--host=$($CC -dumpmachine|sed 's/musl/gnu/') --with-sysroot=$butch_root_dir"
-CFLAGS="-D_GNU_SOURCE $optcflags" \
-LDFLAGS="$optldflags -Wl,-rpath-link=$butch_root_dir$butch_prefix/lib" \
-  ./configure -C --prefix="$butch_prefix"\
- --disable-rebuilds  --disable-glibtest \
- --disable-cups --disable-introspection $xconfflags
+  xconfflags="--host=$($CC -dumpmachine|sed 's/musl/gnu/') \
+  --with-sysroot=$butch_root_dir"
 
-echo '#include <string.h>' >> config.h
+CPPFLAGS="-D_GNU_SOURCE" CFLAGS="$optcflags" CXXFLAGS="$optcflags" \
+LDFLAGS="$optldflags -Wl,-rpath-link=$butch_root_dir$butch_prefix/lib" \
+  ./configure -C --prefix="$butch_prefix" --disable-nls $xconfflags \
+  --with-xinput=yes \
+  --without-libjasper \
+  --with-included-loaders=png
 
-for i in demos tests po po-properties ; do
-  printf 'all:\n\ttrue\n\ninstall:\n\ttrue\n\nclean:\n\ttrue\n\ndistclean:\n\ttrue' \
-    > "$i"/Makefile
-done
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
+#[ -n "$CROSS_COMPILE" ] && "$K"/libtool.cross.gen --sysroot="$butch_root_dir"
 
-make -j$MAKE_THREADS
+make V=1 -j$MAKE_THREADS
 make DESTDIR="$butch_install_dir" install
-
-dest="$butch_install_dir""$butch_prefix"
-mkdir -p "$dest"/share/doc/gtk+-2.24.10 &&
-cp -R docs/faq/html "$dest"/share/doc/gtk+-2.24.10/faq &&
-cp -R docs/tutorial/html "$dest"/share/doc/gtk+-2.24.10/tutorial &&
-install -m644 docs/*.txt "$dest"/share/doc/gtk+-2.24.10
-
-
-if [ -z "$CROSS_COMPILE" ] ; then
-LD_LIBRARY_PATH="$dest"/lib \
-  "$dest"/bin/gtk-query-immodules-2.0 > "$dest"/etc/gtk-2.0/gtk.immodules
-else
-	echo "XXXXXXX WARNING gtk-query-immodules-2.0 needs to be run on the target rootfs XXXXXXX"
-fi
-
-cat > "$dest"/etc/gtk-2.0/gtkrc << "EOF"
-include "/share/themes/Clearlooks/gtk-2.0/gtkrc"
-gtk-icon-theme-name = "elementary"
-EOF
-
-# add missing pkgconfig dependency
-sed -i 's@gio-2.0@gio-2.0 gmodule-2.0@' "$dest"/lib/pkgconfig/gtk+-x11-2.0.pc
-
-- 
1.8.4