diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-11-05 19:26:07 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-11-05 19:26:07 +0000 |
| commit | bca1e08ce02f430d57dad4a4f8521f93a959e5de (patch) | |
| tree | 97ee7c713cc29d02a185c9a6a2da11b531c9f1d9 | |
| parent | arm/sparc stable wrt #388769 (diff) | |
| download | gentoo-2-bca1e08ce02f430d57dad4a4f8521f93a959e5de.tar.gz gentoo-2-bca1e08ce02f430d57dad4a4f8521f93a959e5de.tar.bz2 gentoo-2-bca1e08ce02f430d57dad4a4f8521f93a959e5de.zip | |
Only build panorama plugin if useflag is set, bug 386157
(Portage version: 2.1.10.32/cvs/Linux x86_64)
| -rw-r--r-- | media-plugins/kipi-plugins/ChangeLog | 9 | ||||
| -rw-r--r-- | media-plugins/kipi-plugins/files/kipi-plugins-2.2.0-panorama.patch | 16 | ||||
| -rw-r--r-- | media-plugins/kipi-plugins/kipi-plugins-2.2.0-r1.ebuild (renamed from media-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild) | 4 |
3 files changed, 27 insertions, 2 deletions
diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog index 4bf41385575d..34faf0547830 100644 --- a/media-plugins/kipi-plugins/ChangeLog +++ b/media-plugins/kipi-plugins/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-plugins/kipi-plugins # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.103 2011/10/16 11:01:42 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.104 2011/11/05 19:26:07 dilfridge Exp $ + +*kipi-plugins-2.2.0-r1 (05 Nov 2011) + + 05 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> + -kipi-plugins-2.2.0.ebuild, +kipi-plugins-2.2.0-r1.ebuild, + +files/kipi-plugins-2.2.0-panorama.patch: + Only build panorama plugin if useflag is set, bug 386157 16 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> kipi-plugins-1.9.0.ebuild, -kipi-plugins-2.0.0.ebuild, diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-2.2.0-panorama.patch b/media-plugins/kipi-plugins/files/kipi-plugins-2.2.0-panorama.patch new file mode 100644 index 000000000000..fbe832a64b3d --- /dev/null +++ b/media-plugins/kipi-plugins/files/kipi-plugins-2.2.0-panorama.patch @@ -0,0 +1,16 @@ +diff -ruN digikam-2.2.0.orig/extra/kipi-plugins/CMakeLists.txt digikam-2.2.0/extra/kipi-plugins/CMakeLists.txt +--- digikam-2.2.0.orig/extra/kipi-plugins/CMakeLists.txt 2011-10-03 12:34:09.000000000 +0200 ++++ digikam-2.2.0/extra/kipi-plugins/CMakeLists.txt 2011-11-05 20:14:23.000000000 +0100 +@@ -389,7 +389,11 @@ + ADD_SUBDIRECTORY(batchprocessimages) + ADD_SUBDIRECTORY(rajceexport) + ADD_SUBDIRECTORY(kmlexport) +- ADD_SUBDIRECTORY(panorama) ++ ++ IF(ENABLE_panorama) ++ ADD_SUBDIRECTORY(panorama) ++ ENDIF(ENABLE_panorama) ++ + ADD_SUBDIRECTORY(photolayoutseditor) + + # Plugins which are optional depencies. diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.2.0-r1.ebuild index 5f0dc5f56758..377affca711d 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-2.2.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild,v 1.2 2011/10/16 11:01:42 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.2.0-r1.ebuild,v 1.1 2011/11/05 19:26:07 dilfridge Exp $ EAPI=4 @@ -71,6 +71,7 @@ S=${WORKDIR}/${MY_P}/extra/${PN} PATCHES=( "${FILESDIR}/${PN}-1.7.0-expoblending.patch" "${FILESDIR}/${PN}-2.0.0-tests.patch" + "${FILESDIR}/${PN}-2.2.0-panorama.patch" ) src_prepare() { @@ -110,6 +111,7 @@ src_configure() { $(cmake-utils_use_with crypt QCA2) $(cmake-utils_use_with scanner Sane) $(cmake-utils_use_enable expoblending) + $(cmake-utils_use_enable panorama) ) kde4-base_src_configure |