Bug#490642: Fix gtk 2.13 build failure

2008-07-14 Thread Milan Zamazal
Thanks for the patch.  I'll forward it upstream.

Regards,

Milan Zamazal



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#490642: Fix gtk 2.13 build failure

2008-07-13 Thread Stefan Ebner
Package: photoprint
Version: 0.3.8b-1 http://packages.debian.org/source/unstable/photoprint


When you update to gtk 2.13 or later to gtk 2.14 photoprint will FTBFS
because it uses obsolete gtk funktions. Here is a patch to avoid it.
Maybe this should also be pushed to upstream!?


Thanks,
Stefan



diff -pruN 0.3.8-1/debian/patches/00list 0.3.8-1ubuntu1/debian/patches/00list
--- 0.3.8-1/debian/patches/00list   2008-07-07 17:18:18.0 +0100
+++ 0.3.8-1ubuntu1/debian/patches/00list2008-07-07 17:16:40.0 
+0100
@@ -1 +1,2 @@
+fix-gtk-ftbfs.dpatch
 10_high-res-crash.dpatch
diff -pruN 0.3.8-1/debian/patches/fix-gtk-ftbfs.dpatch 
0.3.8-1ubuntu1/debian/patches/fix-gtk-ftbfs.dpatch
--- 0.3.8-1/debian/patches/fix-gtk-ftbfs.dpatch 1970-01-01 01:00:00.0 
+0100
+++ 0.3.8-1ubuntu1/debian/patches/fix-gtk-ftbfs.dpatch  2008-07-07 
17:16:40.0 +0100
@@ -0,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-gtk-ftbfs.dpatch by Stefan Ebner [EMAIL PROTECTED]
+## Thanks to Luca Falavigna for providing the fix.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This fixes a FTBFS on ubuntu systems. gtkitemfactory is obsolete.
+
[EMAIL PROTECTED]@
+--- photoprint-0.3.8.orig/pp_layout_single_pageview.h
 photoprint-0.3.8/pp_layout_single_pageview.h
+@@ -4,7 +4,7 @@
+
+ #include gdk/gdk.h
+ #include gtk/gtkwidget.h
+-#include gtk/gtkitemfactory.h
++#include gtk/gtktypeutils.h
+ #include gtk/gtkaccelgroup.h
+ #include gtk/gtkcheckmenuitem.h
+ #include gtk/gtkmenuitem.h
+only in patch2:
+unchanged:
+--- photoprint-0.3.8.orig/pp_layout_nup_pageview.h
 photoprint-0.3.8/pp_layout_nup_pageview.h
+@@ -4,7 +4,7 @@
+
+ #include gdk/gdk.h
+ #include gtk/gtkwidget.h
+-#include gtk/gtkitemfactory.h
++#include gtk/gtktypeutils.h
+ #include gtk/gtkaccelgroup.h
+ #include gtk/gtkcheckmenuitem.h
+ #include gtk/gtkmenuitem.h
+only in patch2:
+unchanged:
+--- photoprint-0.3.8.orig/pp_layout_carousel_pageview.h
 photoprint-0.3.8/pp_layout_carousel_pageview.h
+@@ -4,7 +4,7 @@
+
+ #include gdk/gdk.h
+ #include gtk/gtkwidget.h
+-#include gtk/gtkitemfactory.h
++#include gtk/gtktypeutils.h
+ #include gtk/gtkaccelgroup.h
+ #include gtk/gtkcheckmenuitem.h
+ #include gtk/gtkmenuitem.h
+only in patch2:
+unchanged:
+--- photoprint-0.3.8.orig/pp_layout_poster_pageview.h
 photoprint-0.3.8/pp_layout_poster_pageview.h
+@@ -4,7 +4,7 @@
+
+ #include gdk/gdk.h
+ #include gtk/gtkwidget.h
+-#include gtk/gtkitemfactory.h
++#include gtk/gtktypeutils.h
+ #include gtk/gtkaccelgroup.h
+ #include gtk/gtkcheckmenuitem.h
+ #include gtk/gtkmenuitem.h