Package: kipi-plugins
Version: 0.1.7-2
Severity: important

libgpod 0.7.0 is ready to be uploaded to unstable. kipi-plugins
in unstable doesn't build with this new version:
/tmp/buildd/kipi-plugins-0.1.7/./kipi-plugins/ipodexport/ipodexportdialog.cpp: 
In member function 'void 
IpodExport::UploadDialog::ipodItemSelected(QListViewItem*)':
/tmp/buildd/kipi-plugins-0.1.7/./kipi-plugins/ipodexport/ipodexportdialog.cpp:347:
 
error: 'ITDB_THUMB_PHOTO_SMALL' was not declared in this scope
/tmp/buildd/kipi-plugins-0.1.7/./kipi-plugins/ipodexport/ipodexportdialog.cpp:347:
 
error: 'itdb_artwork_get_thumb_by_type' was not declared in this scope

The following patch seems to fix that, but requires to change the
dependency from libgpod-nogtk to libgpod:
(Patch found by Adeodato Simó)

diff -u kipi-plugins-0.1.7/debian/control kipi-plugins-0.1.7/debian/control
--- kipi-plugins-0.1.7/debian/control
+++ kipi-plugins-0.1.7/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Mark Purcell <m...@debian.org>, Achim Bohnet <a...@mpe.mpg.de>, 
Fathi Boudra <f...@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), pkg-config, kdelibs4-dev,
- libexiv2-dev (>= 0.16), libgphoto2-2-dev, libgpod-nogtk-dev,
+ libexiv2-dev (>= 0.16), libgphoto2-2-dev, libgpod-dev,
  libkcal2-dev, libkdcraw-dev (>= 0.1.4), libkexiv2-dev (>= 0.1.6),
  libkipi0-dev (>= 0.1.5), libltdl3-dev, libtiff4-dev, libxslt1-dev
 Standards-Version: 3.8.0
--- kipi-plugins-0.1.7.orig/debian/patches/30_kipi_new_libgpod.diff
+++ kipi-plugins-0.1.7/debian/patches/30_kipi_new_libgpod.diff
@@ -0,0 +1,42 @@
+This comes from http://websvn.kde.org/?view=rev&revision=918089.
+
+--- kipi-plugins-0.1.7-2/kipi-plugins/ipodexport/ipodexportdialog.cpp~ 
2009-03-08 21:50:26.000000000 +0100
++++ kipi-plugins-0.1.7-2/kipi-plugins/ipodexport/ipodexportdialog.cpp  
2009-03-08 21:51:55.000000000 +0100
+@@ -11,6 +11,11 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
++// System Includes
++extern "C" {
++#include <gdk-pixbuf/gdk-pixbuf.h>
++}
++
+ #include "ipodheader.h"
+ #include "imagelist.h"
+ #include "imagelistitem.h"
+@@ -344,9 +349,13 @@
+         return;
+ 
+     Itdb_Artwork *artwork = item->artwork();
+-    Itdb_Thumb *thumb = itdb_artwork_get_thumb_by_type( artwork, 
ITDB_THUMB_PHOTO_SMALL );
++    GdkPixbuf *gpixbuf = NULL;
++    
++    // 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( !thumb )
++    if( !gpixbuf )
+     {
+         debug() << "no thumb was found" << endl;
+         return;
+@@ -361,6 +370,9 @@
+ //     QPixmap pix;
+ //     pix.convertFromImage( image );
+ //     m_ipodPreview->setPixmap( pix );
++    
++    // memory release
++    gdk_pixbuf_unref ( gpixbuf );
+ }
+ 
+ void


-- System Information:
Debian Release: 5.0
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.26-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash



_______________________________________________
pkg-kde-extras mailing list
pkg-kde-extras@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-kde-extras

Reply via email to