From 886e1c5e1377cf105201109ca57c4b4cb6d7743e Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 15 Feb 2009 14:41:40 +0000 Subject: 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 --- graphics/kipi-plugins/Makefile | 8 +++-- graphics/kipi-plugins/distinfo | 5 ++- graphics/kipi-plugins/patches/patch-aa | 21 ++++++++++++ graphics/kipi-plugins/patches/patch-ab | 41 ++++++++++++++++++++++++ graphics/kipi-plugins/patches/patch-ac | 58 ++++++++++++++++++++++++++++++++++ 5 files changed, 130 insertions(+), 3 deletions(-) create mode 100644 graphics/kipi-plugins/patches/patch-aa create mode 100644 graphics/kipi-plugins/patches/patch-ab create mode 100644 graphics/kipi-plugins/patches/patch-ac (limited to 'graphics/kipi-plugins') diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile index ae426dca5e2..c6a0c4ca16c 100644 --- a/graphics/kipi-plugins/Makefile +++ b/graphics/kipi-plugins/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2009/01/07 01:43:49 gdt Exp $ +# $NetBSD: Makefile,v 1.40 2009/02/15 14:41:40 wiz Exp $ DISTNAME= kipi-plugins-0.1.7 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/} EXTRACT_SUFX= .tar.bz2 @@ -21,6 +21,7 @@ SHLIBTOOL_OVERRIDE= # empty REPLACE_BASH= kipi-plugins/mpegencoder/images2mpg .include "../../meta-pkgs/kde3/kde3.mk" +BUILDLINK_API_DEPENDS.libgpod+= libgpod>=0.7.0 .include "../../audio/libgpod/buildlink3.mk" .include "../../devel/libgphoto2/buildlink3.mk" .include "../../graphics/ImageMagick/buildlink3.mk" @@ -29,5 +30,8 @@ BUILDLINK_API_DEPENDS.libkdcraw+= libkdcraw>=0.1.4 .include "../../graphics/libkexiv2/buildlink3.mk" .include "../../graphics/libkipi/buildlink3.mk" .include "../../multimedia/mjpegtools/buildlink3.mk" +# gdk from gtk2 is needed for libgpod artwork support +BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0 +.include "../../x11/gtk2/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/kipi-plugins/distinfo b/graphics/kipi-plugins/distinfo index 5996135b599..dfb6e839120 100644 --- a/graphics/kipi-plugins/distinfo +++ b/graphics/kipi-plugins/distinfo @@ -1,5 +1,8 @@ -$NetBSD: distinfo,v 1.18 2009/01/06 18:54:00 drochner Exp $ +$NetBSD: distinfo,v 1.19 2009/02/15 14:41:40 wiz Exp $ SHA1 (kipi-plugins-0.1.7.tar.bz2) = 520b6b9d36a8c5b8893c3a6b5a1a14f6b9cbd216 RMD160 (kipi-plugins-0.1.7.tar.bz2) = f66473c11e66f9e06aa6772c7952b640b565def9 Size (kipi-plugins-0.1.7.tar.bz2) = 8836654 bytes +SHA1 (patch-aa) = 02e5cb365c7fb4e24c7236b592af3d00eeab1fdf +SHA1 (patch-ab) = db8b5ecc602026d3d6dd39297311d693537b68ce +SHA1 (patch-ac) = 0022166061696e3db820c97be64e2780a63e8b4c diff --git a/graphics/kipi-plugins/patches/patch-aa b/graphics/kipi-plugins/patches/patch-aa new file mode 100644 index 00000000000..fd226a04500 --- /dev/null +++ b/graphics/kipi-plugins/patches/patch-aa @@ -0,0 +1,21 @@ +$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 diff --git a/graphics/kipi-plugins/patches/patch-ab b/graphics/kipi-plugins/patches/patch-ab new file mode 100644 index 00000000000..d3148b6ce32 --- /dev/null +++ b/graphics/kipi-plugins/patches/patch-ab @@ -0,0 +1,41 @@ +$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 + #endif + ++extern "C" { ++#include ++} ++ + #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 diff --git a/graphics/kipi-plugins/patches/patch-ac b/graphics/kipi-plugins/patches/patch-ac new file mode 100644 index 00000000000..476eea61c5c --- /dev/null +++ b/graphics/kipi-plugins/patches/patch-ac @@ -0,0 +1,58 @@ +$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 + # + #------------------------------------------------------------------ -- cgit v1.2.3