Add patch for exiv2.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 65 insertions, 2 deletions

diff --git a/kde-misc/krename/ChangeLog b/kde-misc/krename/ChangeLog
index f9ec45d432be..ac3b0fe3d470 100644
--- a/kde-misc/krename/ChangeLog
+++ b/kde-misc/krename/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/krename
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/ChangeLog,v 1.54 2009/10/18 18:21:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/ChangeLog,v 1.55 2009/10/20 17:05:13 scarabeus Exp $
+
+  20 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/4.0.0-fix_exiv2_support.patch, krename-4.0.1.ebuild:
+  Add patch for exiv2.
 
   18 Oct 2009; Markus Meier <maekke@gentoo.org> krename-4.0.1.ebuild:
   x86 stable, bug #288460
diff --git a/kde-misc/krename/files/4.0.0-fix_exiv2_support.patch b/kde-misc/krename/files/4.0.0-fix_exiv2_support.patch
new file mode 100644
index 000000000000..74204c004d03
--- /dev/null
+++ b/kde-misc/krename/files/4.0.0-fix_exiv2_support.patch
@@ -0,0 +1,58 @@
+diff -urN krename-4.0.1.old/CMakeLists.txt krename-4.0.1/CMakeLists.txt
+--- krename-4.0.1.old/CMakeLists.txt	2009-10-20 18:51:45.000000000 +0200
++++ krename-4.0.1/CMakeLists.txt	2009-10-20 18:59:12.000000000 +0200
+@@ -34,6 +34,7 @@
+ macro_log_feature(EXIV2_FOUND "Exiv2" "A library to access image metadata" "http://www.exiv2.org" FALSE "")
+ 
+ IF(EXIV2_FOUND)
++  ADD_DEFINITIONS( -DWITH_EXIV2 )
+   MESSAGE("-- The exiv2 library was found. KRename will be built with exiv2 support.")
+ ELSE(EXIV2_FOUND)
+   MESSAGE("-- The exiv2 library was not found. KRename will not be built with exiv2 support.")
+diff -urN krename-4.0.1.old/src/CMakeLists.txt krename-4.0.1/src/CMakeLists.txt
+--- krename-4.0.1.old/src/CMakeLists.txt	2009-10-20 18:51:45.000000000 +0200
++++ krename-4.0.1/src/CMakeLists.txt	2009-10-20 18:55:35.000000000 +0200
+@@ -25,7 +25,6 @@
+   batchrenamer.cpp
+   customdialog.cpp
+   datetimeplugin.cpp
+-  exiv2plugin.cpp
+   exthistorycombo.cpp
+   filedialogextwidget.cpp
+   fileplugin.cpp
+@@ -51,6 +50,13 @@
+   translitplugin.cpp
+   )
+ 
++IF ( EXIV2_FOUND )
++	SET(krename_SRCS
++		${krename_SRCS}
++		exiv2plugin.cpp
++	)
++ENDIF ( EXIV2_FOUND )
++
+ IF ( TAGLIB_FOUND )
+ 	SET(krename_SRCS 
+ 		${krename_SRCS}
+diff -urN krename-4.0.1.old/src/pluginloader.cpp krename-4.0.1/src/pluginloader.cpp
+--- krename-4.0.1.old/src/pluginloader.cpp	2009-10-20 18:51:45.000000000 +0200
++++ krename-4.0.1/src/pluginloader.cpp	2009-10-20 18:58:44.000000000 +0200
+@@ -21,7 +21,9 @@
+ #include "plugin.h"
+ 
+ #include "datetimeplugin.h"
++#ifdef WITH_EXIV2
+ #include "exiv2plugin.h"
++#endif
+ #include "fileplugin.h"
+ #include "increasecounterplugin.h"
+ #include "permissionsplugin.h"
+@@ -125,7 +127,7 @@
+ #ifndef _WIN32
+     m_plugins.append( new DateTimePlugin( this ) );
+ #endif // _WIN32
+-#ifdef HAVE_EXIV2
++#ifdef WITH_EXIV2
+     m_plugins.append( new Exiv2Plugin( this ) );
+ #endif // HAVE_EXIV2
+ 	m_plugins.append( new IncreaseCounterPlugin( this ) );
diff --git a/kde-misc/krename/krename-4.0.1.ebuild b/kde-misc/krename/krename-4.0.1.ebuild
index 8b511a398f31..bc46987ba6b2 100644
--- a/kde-misc/krename/krename-4.0.1.ebuild
+++ b/kde-misc/krename/krename-4.0.1.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/kde-misc/krename/krename-4.0.1.ebuild,v 1.4 2009/10/18 18:21:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/krename-4.0.1.ebuild,v 1.5 2009/10/20 17:05:13 scarabeus Exp $
 
 EAPI="2"
 
@@ -26,6 +26,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}"/4.0.0-fix_automagicness.patch
 	"${FILESDIR}"/4.0.0-fix_taglib_support.patch
+	"${FILESDIR}"/4.0.0-fix_exiv2_support.patch
 )
 
 src_configure() {