rev 14025 - in kde-extras/kipi-plugins/trunk/debian: . patches

Mark Purcell msp at alioth.debian.org
Mon Mar 9 00:36:14 UTC 2009


Author: msp
Date: 2009-03-09 00:36:14 +0000 (Mon, 09 Mar 2009)
New Revision: 14025

Added:
   kde-extras/kipi-plugins/trunk/debian/patches/30_kipi_libgpod7.diff
Modified:
   kde-extras/kipi-plugins/trunk/debian/changelog
   kde-extras/kipi-plugins/trunk/debian/control
Log:
* Fix "Doesn't build with libgpod/0.7.0" (Closes: #518838)
  - Add 30_kipi_libgpod7.diff from dato
  - Add Build-Depends: libgpod-dev (>= 0.7.0) 

Modified: kde-extras/kipi-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/changelog	2009-03-08 23:35:51 UTC (rev 14024)
+++ kde-extras/kipi-plugins/trunk/debian/changelog	2009-03-09 00:36:14 UTC (rev 14025)
@@ -1,3 +1,11 @@
+kipi-plugins (0.1.7-3) UNRELEASED; urgency=low
+
+  * Fix "Doesn't build with libgpod/0.7.0" (Closes: #518838)
+    - Add 30_kipi_libgpod7.diff from dato
+    - Add Build-Depends: libgpod-dev (>= 0.7.0) 
+
+ -- Mark Purcell <msp at debian.org>  Mon, 09 Mar 2009 11:34:42 +1100
+
 kipi-plugins (0.1.7-2) unstable; urgency=low
 
   * Build against libxrandr-dev/unstable

Modified: kde-extras/kipi-plugins/trunk/debian/control
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/control	2009-03-08 23:35:51 UTC (rev 14024)
+++ kde-extras/kipi-plugins/trunk/debian/control	2009-03-09 00:36:14 UTC (rev 14025)
@@ -4,7 +4,7 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Achim Bohnet <ach at mpe.mpg.de>, Fathi Boudra <fabo at 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 (>= 0.7.0),
  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

Added: kde-extras/kipi-plugins/trunk/debian/patches/30_kipi_libgpod7.diff
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/patches/30_kipi_libgpod7.diff	                        (rev 0)
+++ kde-extras/kipi-plugins/trunk/debian/patches/30_kipi_libgpod7.diff	2009-03-09 00:36:14 UTC (rev 14025)
@@ -0,0 +1,40 @@
+--- 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




More information about the pkg-kde-commits mailing list