Fix build issue per bug #271057. Remove old.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

6 files changed, 162 insertions, 112 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 425c43368eff..7221e6bf0fe8 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.49 2009/05/22 16:17:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.50 2009/05/25 14:52:05 scarabeus Exp $
+
+  25 May 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  -files/0.2.0-picasa.patch, kipi-plugins-0.1.7.ebuild,
+  -kipi-plugins-0.2.0-r1.ebuild, +files/kipi-plugins-libgpod-0.7.patch:
+  Fix build issue per bug #271057. Remove old.
 
 *kipi-plugins-0.3.0 (22 May 2009)
 
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index f89954dad737..737366a8b5bb 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -1,27 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 0.2.0-picasa.patch 711 RMD160 db2e8ae5521873b422e74f2c6168e939236a9e47 SHA1 65a32dbab601647bafa5092d35b625bf206920f6 SHA256 19b6895c2efa1114d5eaa61eb548b8a120adb2c6e7783cf213aed341b5a6e714
 AUX kipi-plugins-0.1.4-header.diff 422 RMD160 1a09afcdb7175dfdd0b4cb14a17f3af9c562dbaf SHA1 bb2fac9eea4fdf9aaacce6f2de385920043281da SHA256 8fa0a98b51928fc9710c7ff2d7e12138cb2480ad1506b626be5f6912288ab6da
 AUX kipi-plugins-0.1.4-ipod-191195.patch 1100 RMD160 e93a5430f8d9e74575759a14c923cc07603728f4 SHA1 0044a5c31c9f6995d06afb93680c566ac99b1948 SHA256 ff9feba1085bbe2fdd47b3c400fdb5feea70824d2feb9559fafeac3951054191
 AUX kipi-plugins-default_chroma_opt.patch 376 RMD160 4f6f8584dae11f5646d0f8cf630bb9114cac1ea4 SHA1 34b5b3c6318e2b4b7b9236326d0ec6e1302bee36 SHA256 81f680e9efca3faa19bb051bf8a3ec9f5f17a85eaf1ef05abf96803a9cc8a7d0
+AUX kipi-plugins-libgpod-0.7.patch 5336 RMD160 b2cfbf87ffaf72a231b66704c15e18dd26afa70a SHA1 16d73b76827b42c7b9a2fc0a8af2a930b02cd12e SHA256 e7649915095464b3e88ed8205fd1871cf7282a07d2d48bcaa12eb05b293462ad
 DIST kipi-plugins-0.1.4.tar.bz2 8529867 RMD160 bc8b6d0d9bc8b30afbaf5ac5ccbc4862aa3a80e2 SHA1 53d3609a257dfc0e429681438c60486cf4815fc6 SHA256 eb7ceed6eb6893ccabee1aebf5c08379199a96eade2886daf54445664c786d53
 DIST kipi-plugins-0.1.6.tar.bz2 8838095 RMD160 040c1014998f1ed15c0b160a56503ba49f40f504 SHA1 786b5863079be5804792155b02543b7db107724a SHA256 ca3f86e34a6c77db25d0c0fa8219e618ee6320cdc417e9d5e83520ff0320ff75
 DIST kipi-plugins-0.1.7.tar.bz2 8836654 RMD160 f66473c11e66f9e06aa6772c7952b640b565def9 SHA1 520b6b9d36a8c5b8893c3a6b5a1a14f6b9cbd216 SHA256 3c8a73d0658935b75fc0e0ed48f66cd72225249152bce969f4c9676c7038124b
-DIST kipi-plugins-0.2.0.tar.bz2 3333605 RMD160 48acc6cd1179f5d4020d5c82fc14a64f0c43dd41 SHA1 9984fa4b5b096467f8355b06c19e6ad68ccc6a6f SHA256 e8696e8a70004f8e99fae5daef532ce026dc61f3cc5cddbaa0080dc2f429587b
 DIST kipi-plugins-0.3.0.tar.bz2 3547558 RMD160 f07893d049c8830900747a6d1e9f0a0247ca525f SHA1 a9c57258d72f1d157df08887ef4aeb407b00df36 SHA256 bebcaf149be6fac3e7cbc15da2c0df1d900e9fcc28f00e3d53051b314531c7ad
 EBUILD kipi-plugins-0.1.4-r1.ebuild 1600 RMD160 2f932ddd53bf80b8735370c8961b011ae611b140 SHA1 b3a4165121594108cbdafd129019e0b35665b176 SHA256 56feae0d2e837b4b5ea32f84b91737779e63b59ba22f23fcf60e040d3630934e
 EBUILD kipi-plugins-0.1.4-r2.ebuild 1393 RMD160 9a6194ad1423dd10fd1f11429e429a71bddbb7a4 SHA1 77128db229ee3d49dde9c4bcee35a605780af5f2 SHA256 885d775abf7d4cc7c9394f622b967ec7b7626dcb2e1c14dd4b524a52dbc3d227
 EBUILD kipi-plugins-0.1.6.ebuild 2165 RMD160 4db73f83090ef5c4be7e48e633e63931bbda58e9 SHA1 e87b409222ea5d8b8e52f6d25cc360cb7c8ac613 SHA256 7c916f345eb327f919cc6a611422601532344310c7a06360416ef084bdf86dfe
-EBUILD kipi-plugins-0.1.7.ebuild 1923 RMD160 53b0d451b55127419b62909cae545b0845f1beeb SHA1 4515b992a5edc36ee13524fa79ed480c0f1e2306 SHA256 c8e409728e765b064fab222852f0ee8a0d932a09865ac89fa7cee8b021c627ae
-EBUILD kipi-plugins-0.2.0-r1.ebuild 2198 RMD160 ecbef692f3ae65ef2f1268be573a06917a1e4a79 SHA1 9ab3d1ef46f3a9ab2ec69184d6b721211f38ade0 SHA256 27b3b4cea3c05b9ca71a25319ae8b0926448352c5bba56edbdfa84b8dacc2ce3
+EBUILD kipi-plugins-0.1.7.ebuild 1978 RMD160 a284c854a2f5ee967dc4c1905b6f5e1ad35f9527 SHA1 781085df1c75f0216aa651c7017fe2f51dfa6813 SHA256 5728afbd0ddb5fcab5a01de28e06fd0abf1c9e506d9b6179ddb195a50d62f9ec
 EBUILD kipi-plugins-0.3.0.ebuild 2149 RMD160 564f949cdab5cd126db7f90fe3cd4987a078b466 SHA1 c322686855eb410a8dda279d8ffa3fb1f7e52410 SHA256 ddaa58c76fd4168fb6951d333618163d218703075a979d57265f08e81175f836
-MISC ChangeLog 9315 RMD160 fa82b27420f004385510e6e4598d8de056107aae SHA1 e8542efdd7b58dcf223a0e550e37f5e2d8238a82 SHA256 77496c397e0cb6fc1520efb7be990932e608e10ddb99298016121a092c73f171
+MISC ChangeLog 9543 RMD160 0545d62fcf87f08be59ef8838c67d02466539476 SHA1 7d911bd2dae083cd78ad77bfe34be4075b0e7cda SHA256 ee5f7a4a3c81ecd4c4d47ac3500777a28d7e8757ae10bca9bf3061ab38234a87
 MISC metadata.xml 334 RMD160 e2eb335e36d56e157d7ec99a4e69dc9363d7030b SHA1 c011597782306d847f8c99e16aa39fb7dbf72f24 SHA256 9fc059997dc429d52b950644823e1b1ac5b623d822025b741f5f851919826e42
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoW0EAACgkQHB6c3gNBRYejiACgrlciI5jgbMvTI6ThjF6j38RI
-PrQAoKmnzS7OQfKb5yB+3evBAUo5kUgE
-=mTcD
------END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/files/0.2.0-picasa.patch b/media-plugins/kipi-plugins/files/0.2.0-picasa.patch
deleted file mode 100644
index 60dd4970ce3d..000000000000
--- a/media-plugins/kipi-plugins/files/0.2.0-picasa.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- trunk/extragear/graphics/kipi-plugins/picasawebexport/picasawebtalker.cpp	2009/03/21 20:09:51	942469
-+++ trunk/extragear/graphics/kipi-plugins/picasawebexport/picasawebtalker.cpp	2009/03/21 20:11:49	942470
-@@ -758,10 +758,7 @@
- 
-                     if(detailsNode.nodeName() == "title")
-                     {
--                        album_title = "Not fetched";
--
--                        if(detailsNode.toElement().attribute("type")=="text")
--                            album_title = detailsNode.toElement().text();
-+                        album_title = detailsNode.toElement().text();
- 
-                         //this is what is obtained from data.
-                         fps.title = album_title;
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-libgpod-0.7.patch b/media-plugins/kipi-plugins/files/kipi-plugins-libgpod-0.7.patch
new file mode 100644
index 000000000000..9c5df951cf99
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-libgpod-0.7.patch
@@ -0,0 +1,148 @@
+--- branches/extragear/kde3/libs/kipi-plugins/configure.in.bot	2009/01/31 14:25:40	919106
++++ branches/extragear/kde3/libs/kipi-plugins/configure.in.bot	2009/01/31 14:27:58	919107
+@@ -124,7 +124,7 @@
+   if test "x$have_libgpod" != "xyes"; then
+     echo "-- libgpod found.................. NO"
+     echo ""
+-    echo "iPodExport plugin needs the libgpod library, version 0.4.2 or greater. This plugin will not be compiled!"
++    echo "iPodExport plugin needs the libgpod library, version 0.7.0 or greater. This plugin will not be compiled!"
+     echo "To complile this plugin, please install libgpod development package."
+     echo "libgpod website is at http://gtkpod.org/libgpod.html"
+     echo ""
+@@ -132,8 +132,18 @@
+   else
+     echo "-- libgpod found.................. YES"
+   fi
++  if test "x$have_gdk" != "xyes"; then
++    echo "-- gdk found...................... NO"
++    echo ""
++    echo "iPodExport plugin needs the GDK (GTK+ Drawing Kit) library, the part of GTK2. This plugin will not be compiled!"
++    echo "To complile this plugin, please install GDK development package."
++    echo ""
++    all_tests=bad
++  else
++    echo "-- GDK found...................... YES"
++  fi
+ else
+-  echo "-- libgpod library......... NOT NEEDED"
++  echo "-- libgpod and gdk library......... NOT NEEDED"
+ fi
+ 
+ echo ""
+
+--- branches/extragear/kde3/libs/kipi-plugins/configure.in.in	2009/01/31 14:25:40	919106
++++ branches/extragear/kde3/libs/kipi-plugins/configure.in.in	2009/01/31 14:27:58	919107
+@@ -234,7 +234,7 @@
+ 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 @@
+ 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])
+@@ -343,6 +343,36 @@
+         else
+             AC_MSG_WARN([libgpod is required for the iPod export plugin.])
+         fi
++
++    fi
++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
+
+--- branches/extragear/kde3/libs/kipi-plugins/ipodexport/Makefile.am	2009/01/31 14:25:40	919106
++++ branches/extragear/kde3/libs/kipi-plugins/ipodexport/Makefile.am	2009/01/31 14:27:58	919107
+@@ -2,6 +2,7 @@
+ INCLUDES    = $(KIPI_PLUGINS_COMMON_INCLUDE) \
+               $(LIBKIPI_CFLAGS) \
+               $(LIBGPOD_CFLAGS) \
++              $(GDK_CFLAGS) \
+               $(all_includes)
+ 
+ METASOURCES = AUTO
+@@ -17,7 +18,7 @@
+ 
+ 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
+ 
+--- branches/extragear/kde3/libs/kipi-plugins/ipodexport/ipodexportdialog.cpp	2009/01/31 14:25:40	919106
++++ branches/extragear/kde3/libs/kipi-plugins/ipodexport/ipodexportdialog.cpp	2009/01/31 14:27:58	919107
+@@ -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 @@
+         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 +369,9 @@
+ //     QPixmap pix;
+ //     pix.convertFromImage( image );
+ //     m_ipodPreview->setPixmap( pix );
++
++    // memory release
++    gdk_pixbuf_unref ( gpixbuf );
+ }
+ 
+ void
+
diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild b/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild
index f1f8659e9555..3528ac824fc4 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild,v 1.2 2009/02/12 01:51:19 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild,v 1.3 2009/05/25 14:52:05 scarabeus Exp $
 
 EAPI=2
 
@@ -29,7 +29,7 @@ DEPEND="calendar? ( || ( kde-base/libkcal:3.5 kde-base/kdepim:3.5 ) )
 		opengl? ( x11-libs/qt:3[opengl] )
 		tiff? ( >=media-libs/tiff-3.6 )
 		>=dev-libs/libxslt-1.1
-		ipod? ( >=media-libs/libgpod-0.6.0 )"
+		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )"
 RDEPEND="${DEPEND}
 		>=media-gfx/imagemagick-6.2.4
 		>=media-video/mjpegtools-1.6.0
@@ -53,7 +53,9 @@ src_unpack() {
 	rm -f "${S}"/configure
 
 	# Set default for the -S option for images2mpeg to work correctly, bug #208133
-	epatch "${FILESDIR}/${PN}-default_chroma_opt.patch"
+	epatch \
+		"${FILESDIR}/${PN}-default_chroma_opt.patch" \
+		"${FILESDIR}/${PN}-libgpod-0.7.patch"
 
 	cd "${WORKDIR}/${P}/po"
 	for X in ${LANGS} ; do
diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.2.0-r1.ebuild b/media-plugins/kipi-plugins/kipi-plugins-0.2.0-r1.ebuild
deleted file mode 100644
index 83c8de942363..000000000000
--- a/media-plugins/kipi-plugins/kipi-plugins-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.2.0-r1.ebuild,v 1.2 2009/04/06 12:02:02 scarabeus Exp $
-
-EAPI="2"
-
-KDE_MINIMAL="4.2"
-OPENGL_REQUIRED="optional"
-KDE_LINGUAS="ar be ca cs da de el es et fr ga gl hi is it ja km lt lv ms nb nds nl
-nn oc pa pl pt pt_BR ro ru se sk sv th tr uk zn_CN"
-inherit kde4-base
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface (libkipi)."
-HOMEPAGE="http://www.kipi-plugins.org"
-SRC_URI="mirror://sourceforge/kipi/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdr calendar debug +imagemagick ipod mjpeg redeyes scanner"
-SLOT="2"
-
-DEPEND="
-	>=dev-libs/expat-2.0.1
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=kde-base/libkdcraw-${KDE_MINIMAL}
-	>=kde-base/libkexiv2-${KDE_MINIMAL}
-	>=kde-base/libkipi-${KDE_MINIMAL}
-	media-libs/jpeg
-	media-libs/libpng
-	>=media-libs/tiff-3.5
-	calendar? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
-	ipod? ( media-libs/libgpod )
-	opengl? ( virtual/opengl )
-	redeyes? ( media-libs/opencv )
-	scanner? (
-		media-gfx/sane-backends
-		>=kde-base/libksane-${KDE_MINIMAL}
-	)
-"
-RDEPEND="${DEPEND}
-	cdr? ( app-cdr/k3b )
-	imagemagick? ( media-gfx/imagemagick )
-	mjpeg? ( media-video/mjpegtools )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PV}-picasa.patch" )
-
-src_configure() {
-	# This Plugin hard depends on libksane, deactivate it if use flag scanner is
-	# not set.
-	if ! use scanner; then
-		sed -i \
-			-e '/acquireimages/ s:^:#DONOTCOMPILE :' \
-			"${S}"/CMakeLists.txt || die "Sed deactivating scanner support failed."
-	fi
-
-	# Fix linking
-	sed -i \
-		-e '/KDE4_KDEUI_LIBS/ c\\${KDE4_KIO_LIBS}'\
-		"${S}"/common/libkipiplugins/CMakeLists.txt \
-		|| die "Sed fixing kipi linking failed."
-
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with calendar KdepimLibs)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with scanner KSane)
-		$(cmake-utils_use_with scanner Sane)
-		$(cmake-utils_use_with ipod Gpod)
-		$(cmake-utils_use_with ipod GLIB2)
-		$(cmake-utils_use_with ipod GObject)
-		$(cmake-utils_use_with redeyes OpenCV)"
-
-	kde4-base_src_configure
-}