From 9e7eeeb15721964613819f03de5e79777c434b19 Mon Sep 17 00:00:00 2001 From: Matt Housh Date: Fri, 8 Sep 2006 15:14:35 +0000 Subject: [PATCH] gtk: updated to version 2.10.3 --- gtk/.footprint | 24 ++++++------ gtk/.md5sum | 7 ++-- gtk/Pkgfile | 7 ++-- gtk/gdk-pixbuf.loaders | 2 +- gtk/gtk+-2.10.1-stock-icon.diff | 65 --------------------------------- gtk/gtk.immodules | 2 +- 6 files changed, 20 insertions(+), 87 deletions(-) delete mode 100644 gtk/gtk+-2.10.1-stock-icon.diff diff --git a/gtk/.footprint b/gtk/.footprint index bfe874a99..fb64e8de5 100644 --- a/gtk/.footprint +++ b/gtk/.footprint @@ -324,21 +324,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.1000.1 -lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.1000.1 --rwxr-xr-x root/root usr/lib/libgdk-x11-2.0.so.0.1000.1 +lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.1000.3 +lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.1000.3 +-rwxr-xr-x root/root usr/lib/libgdk-x11-2.0.so.0.1000.3 -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.1000.1 -lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so.0 -> libgdk_pixbuf-2.0.so.0.1000.1 --rwxr-xr-x root/root usr/lib/libgdk_pixbuf-2.0.so.0.1000.1 +lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so -> libgdk_pixbuf-2.0.so.0.1000.3 +lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so.0 -> libgdk_pixbuf-2.0.so.0.1000.3 +-rwxr-xr-x root/root usr/lib/libgdk_pixbuf-2.0.so.0.1000.3 -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.1000.1 -lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib-2.0.so.0.1000.1 --rwxr-xr-x root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0.1000.1 +lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so -> libgdk_pixbuf_xlib-2.0.so.0.1000.3 +lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib-2.0.so.0.1000.3 +-rwxr-xr-x root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0.1000.3 -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.1000.1 -lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.1000.1 --rwxr-xr-x root/root usr/lib/libgtk-x11-2.0.so.0.1000.1 +lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.1000.3 +lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.1000.3 +-rwxr-xr-x root/root usr/lib/libgtk-x11-2.0.so.0.1000.3 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 783ef648e..637084b2f 100644 --- a/gtk/.md5sum +++ b/gtk/.md5sum @@ -1,4 +1,3 @@ -501ae79b5b7a93a8338e999274f4dcbb gdk-pixbuf.loaders -17510dcd6cb2672d9e530beb9bee86a4 gtk+-2.10.1-stock-icon.diff -7f1d39031d50de8228211aa3230d4acd gtk+-2.10.1.tar.bz2 -a6ab21dcf3d52be4b2c002d6a74dddf9 gtk.immodules +ee4914619a3c81a81a2e0cdd65588c6f gdk-pixbuf.loaders +c662ca204e204edfd8b8b917b9a852aa gtk+-2.10.3.tar.bz2 +1d688ced93edd366e19ec8df47d20218 gtk.immodules diff --git a/gtk/Pkgfile b/gtk/Pkgfile index d68080266..007f4ae8b 100644 --- a/gtk/Pkgfile +++ b/gtk/Pkgfile @@ -4,14 +4,13 @@ # Depends on: atk, pango, libtiff, hicolor-icon-theme name=gtk -version=2.10.1 -release=2 +version=2.10.3 +release=1 source=(ftp://ftp.gtk.org/pub/gtk/v2.10/${name}+-$version.tar.bz2 \ - gdk-pixbuf.loaders gtk.immodules $name+-$version-stock-icon.diff) + gdk-pixbuf.loaders gtk.immodules) build () { cd gtk+-$version - patch -p1 -i $SRC/$name+-$version-stock-icon.diff ./configure --prefix=/usr make make DESTDIR=$PKG install diff --git a/gtk/gdk-pixbuf.loaders b/gtk/gdk-pixbuf.loaders index f49057df8..8c7d59130 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.10.1 +# Created by gdk-pixbuf-query-loaders from gtk+-2.10.3 # # LoaderDir = /usr/lib/gtk-2.0/2.10.0/loaders # diff --git a/gtk/gtk+-2.10.1-stock-icon.diff b/gtk/gtk+-2.10.1-stock-icon.diff deleted file mode 100644 index b809c24b7..000000000 --- a/gtk/gtk+-2.10.1-stock-icon.diff +++ /dev/null @@ -1,65 +0,0 @@ ---- gtk+-2.10.1/gtk/gtkfilesystem.c.orig 2006-08-07 22:23:22.436475760 +0200 -+++ gtk+-2.10.1/gtk/gtkfilesystem.c 2006-08-07 22:25:38.673764544 +0200 -@@ -301,15 +301,21 @@ - GtkIconTheme *icon_theme; - - icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget)); -- pixbuf = gtk_icon_theme_load_icon (icon_theme, info->icon_name, -- pixel_size, 0, NULL); -+ if (gtk_icon_theme_has_icon (icon_theme, info->icon_name)) -+ pixbuf = gtk_icon_theme_load_icon (icon_theme, info->icon_name, -+ pixel_size, 0, NULL); - } - } - - if (!pixbuf) - { - /* load a fallback icon */ -- pixbuf = gtk_widget_render_icon (widget, GTK_STOCK_FILE, GTK_ICON_SIZE_SMALL_TOOLBAR, NULL); -+ pixbuf = gtk_widget_render_icon (widget, -+ gtk_file_info_get_is_folder (info) -+ ? GTK_STOCK_DIRECTORY : GTK_STOCK_FILE, -+ GTK_ICON_SIZE_SMALL_TOOLBAR, -+ NULL); -+ - if (!pixbuf && error) - g_set_error (error, - GTK_FILE_SYSTEM_ERROR, -@@ -648,7 +654,7 @@ - GError **error) - { - gchar *icon_name; -- GdkPixbuf *pixbuf; -+ GdkPixbuf *pixbuf = NULL; - - g_return_val_if_fail (GTK_IS_FILE_SYSTEM (file_system), NULL); - g_return_val_if_fail (volume != NULL, NULL); -@@ -658,15 +664,22 @@ - - icon_name = gtk_file_system_volume_get_icon_name (file_system, volume, - error); -- if (!icon_name) -+ if (icon_name) - { -- return NULL; -+ GtkIconTheme *icon_theme; -+ -+ icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget)); -+ if (gtk_icon_theme_has_icon (icon_theme, icon_name)) -+ pixbuf = gtk_icon_theme_load_icon (icon_theme, -+ icon_name, pixel_size, 0, NULL); -+ g_free (icon_name); - } - -- pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget)), -- icon_name, pixel_size, 0, NULL); -- g_free (icon_name); -- -+ if (!pixbuf) -+ pixbuf = gtk_widget_render_icon (widget, -+ GTK_STOCK_HARDDISK, -+ GTK_ICON_SIZE_SMALL_TOOLBAR, -+ NULL); - return pixbuf; - } - diff --git a/gtk/gtk.immodules b/gtk/gtk.immodules index 91dceb0a7..aec97ff18 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.10.1 +# Created by gtk-query-immodules-2.0 from gtk+-2.10.3 # # 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 #