Fix build with latest libgpod, and depend on it. Bump PKGREVISION.

Patches from upstream, based on
http://lists.kde.org/?l=kde-commits&m=123341209907417&w=2


(wiz)

$NetBSD: patch-aa,v 1.11 2009/02/15 14:41:40 wiz Exp $

--- kipi-plugins/ipodexport/Makefile.in.orig	2008-12-13 11:20:38.000000000 +0000
+++ kipi-plugins/ipodexport/Makefile.in
@@ -384,6 +384,7 @@ xdg_menudir = @xdg_menudir@
 INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) \
               $(LIBKIPI_CFLAGS) \
               $(LIBGPOD_CFLAGS) \
+              $(GDK_CFLAGS) \
               $(all_includes)
 
 #>- METASOURCES = AUTO
@@ -396,7 +397,7 @@ kipiplugin_ipodexport_la_SOURCES = plugi
                                    imagelist.cpp
 
 kipiplugin_ipodexport_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
-kipiplugin_ipodexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIBGPOD_LIBS) $(all_libraries)
+kipiplugin_ipodexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIBGPOD_LIBS) $(GDK_LIBS) $(all_libraries)
 kde_services_DATA = kipiplugin_ipodexport.desktop
 #>- all: all-am
 #>+ 1

$NetBSD: patch-ab,v 1.7 2009/02/15 14:41:40 wiz Exp $

--- kipi-plugins/ipodexport/ipodexportdialog.cpp.orig	2008-12-13 11:20:05.000000000 +0000
+++ kipi-plugins/ipodexport/ipodexportdialog.cpp
@@ -47,6 +47,10 @@
 #include <libkipi/imagedialog.h>
 #endif
 
+extern "C" {
+#include <gdk-pixbuf/gdk-pixbuf.h>
+}
+
 #define debug() kdDebug()
 
 using namespace IpodExport;
@@ -344,9 +348,13 @@ UploadDialog::ipodItemSelected( QListVie
         return;
 
     Itdb_Artwork *artwork = item->artwork();
-    Itdb_Thumb *thumb = itdb_artwork_get_thumb_by_type( artwork, ITDB_THUMB_PHOTO_SMALL );
+    GdkPixbuf *gpixbuf = NULL;
 
-    if( !thumb )
+    // First arg in itdb_artwork_get_pixbuf(...) is pointer to Itdb_Device struct,
+    // in kipiplugin-ipodexport it is m_itdb->device. i hope it _is_ initialiezed
+    gpixbuf = (GdkPixbuf*) itdb_artwork_get_pixbuf( m_itdb->device, artwork, -1, -1 );
+
+    if( !gpixbuf )
     {
         debug() << "no thumb was found" << endl;
         return;
@@ -361,6 +369,9 @@ UploadDialog::ipodItemSelected( QListVie
 //     QPixmap pix;
 //     pix.convertFromImage( image );
 //     m_ipodPreview->setPixmap( pix );
+
+    // memory release
+    gdk_pixbuf_unref ( gpixbuf );
 }
 
 void

$NetBSD: patch-ac,v 1.7 2009/02/15 14:41:40 wiz Exp $

--- kipi-plugins/configure.in.in.orig	2008-12-13 11:20:05.000000000 +0000
+++ kipi-plugins/configure.in.in
@@ -234,7 +234,7 @@ KIPI_PLUGIN_PRE([gpssync], [GPS Synchron
 KIPI_PLUGIN_PRE([htmlexport], [HTML Gallery], [xslt])
 #KIPI_PLUGIN_PRE([imagesgallery], [Images Gallery])      # ???
 KIPI_PLUGIN_PRE([imageviewer], [Viewer], [opengl])
-KIPI_PLUGIN_PRE([ipodexport], [iPod Export], [libgpod])
+KIPI_PLUGIN_PRE([ipodexport], [iPod Export], [libgpod] [gdk])
 KIPI_PLUGIN_PRE([jpeglossless], [JPEG Lossless]) # Does it depend on tiff?
 KIPI_PLUGIN_PRE([kameraklient], [Kamera Klient], [gphoto])
 KIPI_PLUGIN_PRE([metadataedit], [Metadata Editor])
@@ -329,7 +329,7 @@ have_libgpod=no
 if test "x$build_libgpod" != "xno"; then
     if test "$PKGCONFIGFOUND" = "yes" ; then
 
-        KDE_PKG_CHECK_MODULES(LIBGPOD, libgpod-1.0 >= 0.4.2 gobject-2.0, have_libgpod=yes,have_libgpod=no)
+        KDE_PKG_CHECK_MODULES(LIBGPOD, libgpod-1.0 >= 0.7.0 gobject-2.0, have_libgpod=yes,have_libgpod=no)
 
         if test "x$have_libgpod" = "xyes"; then
             AC_DEFINE(HAVE_LIBGPOD, 1, [have libgpod])
@@ -348,6 +348,35 @@ fi
 
 #------------------------------------------------------------------
 #
+# Check for GDK - ipod export plugin
+#
+#------------------------------------------------------------------
+
+have_gdk=no
+
+if test "x$build_libgpod" != "xno"; then
+    if test "$PKGCONFIGFOUND" = "yes" ; then
+
+        KDE_PKG_CHECK_MODULES(GDK, gdk-2.0 >= 2.10.0, have_gdk=yes,have_gdk=no)
+
+        if test "x$have_gdk" = "xyes"; then
+            AC_DEFINE(HAVE_GDK, 1, [have gdk])
+            ac_cppflags_save=$CPPFLAGS
+            ac_cflags_save=$CFLAGS
+            ac_ldflags_save=$LDFLAGS
+
+            CPPFLAGS="$CPPFLAGS $GDK_INCLUDES"
+            CFLAGS="$CFLAGS $GDK_CFLAGS"
+            LDFLAGS="$LDFLAGS $GDK_LIBS"
+        else
+            AC_MSG_WARN([GDK is required for the iPod export plugin.])
+        fi
+
+    fi
+fi
+
+#------------------------------------------------------------------
+#
 # Check for libkcal - iCalendar support library
 #
 #------------------------------------------------------------------