Package: gthumb
Severity: normal
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
The attached patch allows preventing an FTBFS when building gthumb on GTK 2.19.
- -- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.32-15-generic (SMP w/1 CPU core)
Locale: LANG=fi_FI.UTF-8, LC_CTYPE=fi_FI.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages gthumb depends on:
pn gthumb-data <none> (no description available)
pn libatk1.0-0 <none> (no description available)
ii libc6 2.10.2-6 Embedded GNU C Library: Shared lib
pn libcairo2 <none> (no description available)
pn libclutter-1.0-0 <none> (no description available)
pn libclutter-gtk-0.10-0 <none> (no description available)
pn libexiv2-6 <none> (no description available)
pn libfontconfig1 <none> (no description available)
ii libfreetype6 2.3.11-1 FreeType 2 font engine, shared lib
ii libgcc1 1:4.4.3-3 GCC support library
pn libgconf2-4 <none> (no description available)
pn libgl1-mesa-glx | libgl <none> (no description available)
ii libglib2.0-0 2.22.4-1 The GLib library of C routines
pn libgstreamer-plugins-ba <none> (no description available)
pn libgstreamer0.10-0 <none> (no description available)
pn libgtk2.0-0 <none> (no description available)
pn libjpeg62 <none> (no description available)
pn libopenraw1 <none> (no description available)
pn libpango1.0-0 <none> (no description available)
ii libstdc++6 4.4.3-3 The GNU Standard C++ Library v3
pn libtiff4 <none> (no description available)
pn libunique-1.0-0 <none> (no description available)
ii libx11-6 2:1.3.3-1 X11 client-side library
pn libxcomposite1 <none> (no description available)
pn libxdamage1 <none> (no description available)
ii libxext6 2:1.1.1-2 X11 miscellaneous extension librar
pn libxfixes3 <none> (no description available)
ii libxml2 2.7.6.dfsg-2+b1 GNOME XML library
ii zlib1g 1:1.2.3.4.dfsg-3 compression library - runtime
Versions of packages gthumb recommends:
pn gvfs-bin <none> (no description available)
gthumb suggests no packages.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEARECAAYFAkuY3yAACgkQeXr56x4Muc1VEACaA0hx7Hb7cqaXscj/lLgBDoYm
j3AAn1/JOS8ck9v6P2Fk4pM/DXeVgXsr
=4d81
-----END PGP SIGNATURE-----
Index: gthumb-2.11.1/gthumb/eggfileformatchooser.c
===================================================================
--- gthumb-2.11.1.orig/gthumb/eggfileformatchooser.c 2010-03-03 17:48:18.152697763 +0100
+++ gthumb-2.11.1/gthumb/eggfileformatchooser.c 2010-03-03 17:48:21.000000000 +0100
@@ -632,7 +632,7 @@
GtkWidget *toplevel;
toplevel = gtk_widget_get_toplevel (widget);
- if (!GTK_WIDGET_TOPLEVEL (toplevel))
+ if (!gtk_widget_is_toplevel (toplevel))
return NULL;
else
return GTK_WINDOW (toplevel);
Index: gthumb-2.11.1/gthumb/gth-file-tool.c
===================================================================
--- gthumb-2.11.1.orig/gthumb/gth-file-tool.c 2010-03-03 17:48:18.128698066 +0100
+++ gthumb-2.11.1/gthumb/gth-file-tool.c 2010-03-03 17:48:21.000000000 +0100
@@ -194,7 +194,7 @@
{
if (self->priv->window == NULL) {
self->priv->window = gtk_widget_get_toplevel (GTK_WIDGET (self));
- if (! GTK_WIDGET_TOPLEVEL (self->priv->window))
+ if (! gtk_widget_is_toplevel (self->priv->window))
self->priv->window = NULL;
}
return self->priv->window;
Index: gthumb-2.11.1/gthumb/gth-tags-entry.c
===================================================================
--- gthumb-2.11.1.orig/gthumb/gth-tags-entry.c 2010-03-03 17:48:18.172707358 +0100
+++ gthumb-2.11.1/gthumb/gth-tags-entry.c 2010-03-03 17:48:21.000000000 +0100
@@ -614,7 +614,7 @@
GdkGeometry geometry;
toplevel = gtk_widget_get_toplevel (widget);
- if (! GTK_WIDGET_TOPLEVEL (toplevel))
+ if (! gtk_widget_is_toplevel (toplevel))
return;
geometry.max_height = -1;
Index: gthumb-2.11.1/po/POTFILES.skip
===================================================================
--- gthumb-2.11.1.orig/po/POTFILES.skip 2010-03-03 17:50:20.264695857 +0100
+++ gthumb-2.11.1/po/POTFILES.skip 2010-03-03 17:59:54.495711606 +0100
@@ -15,3 +15,6 @@
#.pc/16-fix_crop_dialog_usability.patch/data/glade/gthumb_crop.glade
#.pc/16-fix_crop_dialog_usability.patch/src/dlg-crop.c
#.pc/17-dont_follow_symlinks_on_dups_search.patch/src/dlg-duplicates.c
+.pc/18-build_with_gtk2.19.patch/gthumb/eggfileformatchooser.c
+.pc/18-build_with_gtk2.19.patch/gthumb/gth-tags-entry.c
+
