diff --git a/gtk/.footprint b/gtk/.footprint index 6e2dc8299..f7a555a25 100644 --- a/gtk/.footprint +++ b/gtk/.footprint @@ -335,21 +335,21 @@ drwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/printbackends/ drwxr-xr-x root/root usr/lib/gtk-2.0/include/ -rw-r--r-- root/root usr/lib/gtk-2.0/include/gdkconfig.h -rw-r--r-- root/root usr/lib/libgdk-x11-2.0.la -lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.1200.0 -lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.1200.0 --rwxr-xr-x root/root usr/lib/libgdk-x11-2.0.so.0.1200.0 +lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.1200.1 +lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.1200.1 +-rwxr-xr-x root/root usr/lib/libgdk-x11-2.0.so.0.1200.1 -rwxr-xr-x root/root usr/lib/libgdk_pixbuf-2.0.la -lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so -> libgdk_pixbuf-2.0.so.0.1200.0 -lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so.0 -> libgdk_pixbuf-2.0.so.0.1200.0 --rwxr-xr-x root/root usr/lib/libgdk_pixbuf-2.0.so.0.1200.0 +lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so -> libgdk_pixbuf-2.0.so.0.1200.1 +lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so.0 -> libgdk_pixbuf-2.0.so.0.1200.1 +-rwxr-xr-x root/root usr/lib/libgdk_pixbuf-2.0.so.0.1200.1 -rwxr-xr-x root/root usr/lib/libgdk_pixbuf_xlib-2.0.la -lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so -> libgdk_pixbuf_xlib-2.0.so.0.1200.0 -lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib-2.0.so.0.1200.0 --rwxr-xr-x root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0.1200.0 +lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so -> libgdk_pixbuf_xlib-2.0.so.0.1200.1 +lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib-2.0.so.0.1200.1 +-rwxr-xr-x root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0.1200.1 -rw-r--r-- root/root usr/lib/libgtk-x11-2.0.la -lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.1200.0 -lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.1200.0 --rwxr-xr-x root/root usr/lib/libgtk-x11-2.0.so.0.1200.0 +lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.1200.1 +lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.1200.1 +-rwxr-xr-x root/root usr/lib/libgtk-x11-2.0.so.0.1200.1 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/gdk-2.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gdk-pixbuf-2.0.pc diff --git a/gtk/.md5sum b/gtk/.md5sum index aaf88ae40..a9a421659 100644 --- a/gtk/.md5sum +++ b/gtk/.md5sum @@ -1,6 +1,5 @@ eb8046ca31ce7a56b1e36816e9537545 gdk-pixbuf.loaders b50c279539fca50a496d7feafae350d4 gdkwindow.patch -e9c280afec29b11772af5a7c807abf41 gtk+-2.12.0.tar.bz2 +c46f34addc2fe3ea6756055d59fb8856 gtk+-2.12.1.tar.bz2 3c88561a89724dfe9d807077ba0603c8 gtk-register.sh b203b162788dd918a922be347ca1bf5d gtk.immodules -bdf79fd8a435bad46d51b407d0e961b4 gtkiconcache.patch diff --git a/gtk/Pkgfile b/gtk/Pkgfile index 1cdccc095..2d8be4cf4 100644 --- a/gtk/Pkgfile +++ b/gtk/Pkgfile @@ -1,19 +1,18 @@ # Description: A multi-platform toolkit for creating graphical user interfaces # URL: http://www.gtk.org/ -# Maintainer: Matt Housh, jaeger at morpheus dot net +# Maintainer: Matt Housh, jaeger at crux dot nu # Depends on: atk, hicolor-icon-theme, libtiff, pango, xorg-libsm, xorg-libxcursor, xorg-libxinerama, xorg-libxrandr name=gtk -version=2.12.0 -release=2 +version=2.12.1 +release=1 source=(ftp://ftp.gtk.org/pub/gtk/2.12/${name}+-$version.tar.bz2 \ - gdk-pixbuf.loaders gtk.immodules gtkiconcache.patch gdkwindow.patch \ + gdk-pixbuf.loaders gtk.immodules gdkwindow.patch \ gtk-register.sh) build () { cd gtk+-$version - patch -p1 -i $SRC/gtkiconcache.patch patch -p0 -i $SRC/gdkwindow.patch ./configure --prefix=/usr \ diff --git a/gtk/gdk-pixbuf.loaders b/gtk/gdk-pixbuf.loaders index 1af89ddf8..ba82b4d28 100644 --- a/gtk/gdk-pixbuf.loaders +++ b/gtk/gdk-pixbuf.loaders @@ -1,6 +1,6 @@ # GdkPixbuf Image Loader Modules file # Automatically generated file, do not edit -# Created by gdk-pixbuf-query-loaders from gtk+-2.12.0 +# Created by gdk-pixbuf-query-loaders from gtk+-2.12.1 # # LoaderDir = /usr/lib/gtk-2.0/2.10.0/loaders # @@ -8,7 +8,10 @@ "wbmp" 4 "gtk20" "The WBMP image format" "image/vnd.wap.wbmp" "" "wbmp" "" -" " "z" 1 +" " "zz" 1 +" `" "z " 1 +" @" "z " 1 +" " "z " 1 "/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.so" "jpeg" 5 "gtk20" "The JPEG image format" diff --git a/gtk/gtk.immodules b/gtk/gtk.immodules index 4061cbc50..d53f7bba8 100644 --- a/gtk/gtk.immodules +++ b/gtk/gtk.immodules @@ -1,6 +1,6 @@ # GTK+ Input Method Modules file # Automatically generated file, do not edit -# Created by gtk-query-immodules-2.0 from gtk+-2.12.0 +# Created by /usr/bin/gtk-query-immodules-2.0 from gtk+-2.12.1 # # ModulesPath = /root/.gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/root/.gtk-2.0/2.10.0/immodules:/root/.gtk-2.0/i686-pc-linux-gnu/immodules:/root/.gtk-2.0/immodules:/usr/lib/gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/usr/lib/gtk-2.0/2.10.0/immodules:/usr/lib/gtk-2.0/i686-pc-linux-gnu/immodules:/usr/lib/gtk-2.0/immodules # diff --git a/gtk/gtkiconcache.patch b/gtk/gtkiconcache.patch deleted file mode 100644 index 245ec11ef..000000000 --- a/gtk/gtkiconcache.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- trunk/gtk/gtkiconcache.c 2007/09/14 01:01:59 18822 -+++ trunk/gtk/gtkiconcache.c 2007/09/14 02:11:01 18823 -@@ -127,14 +127,19 @@ - info.n_directories = 0; - info.flags = CHECK_OFFSETS|CHECK_STRINGS; - -- if (!_gtk_icon_cache_validate (&info)) -+#ifdef G_ENABLE_DEBUG -+ if (gtk_debug_flags & GTK_DEBUG_ICONTHEME) - { -- g_mapped_file_free (map); -- g_warning ("Icon cache '%s' is invalid\n", cache_filename); -+ if (!_gtk_icon_cache_validate (&info)) -+ { -+ g_mapped_file_free (map); -+ g_warning ("Icon cache '%s' is invalid\n", cache_filename); - -- goto done; -+ goto done; -+ } - } -- -+#endif -+ - GTK_NOTE (ICONTHEME, g_print ("found cache for %s\n", path)); - - cache = g_new0 (GtkIconCache, 1);