diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2012-11-11 14:52:55 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2012-11-11 14:52:55 +0000 |
| commit | 1eaf70ccba865d13e1fd46aba750bed026167383 (patch) | |
| tree | 9b9d4fd88d11a3b6eca96a6ebeb643e0d224c53f /kde-base | |
| parent | Add ~x86 keyword (diff) | |
| download | gentoo-2-1eaf70ccba865d13e1fd46aba750bed026167383.tar.gz gentoo-2-1eaf70ccba865d13e1fd46aba750bed026167383.tar.bz2 gentoo-2-1eaf70ccba865d13e1fd46aba750bed026167383.zip | |
Backport a patch from upstream fixing a configure failure, wrt bug #442214.
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdepimlibs/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdepimlibs/files/kdepimlibs-4.9.3-configure.patch | 27 | ||||
| -rw-r--r-- | kde-base/kdepimlibs/kdepimlibs-4.9.3.ebuild | 7 |
3 files changed, 37 insertions, 3 deletions
diff --git a/kde-base/kdepimlibs/ChangeLog b/kde-base/kdepimlibs/ChangeLog index fc100d342d28..24301b8e4a10 100644 --- a/kde-base/kdepimlibs/ChangeLog +++ b/kde-base/kdepimlibs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdepimlibs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.166 2012/11/08 23:26:25 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.167 2012/11/11 14:52:55 kensington Exp $ + + 11 Nov 2012; Michael Palimaka <kensington@gentoo.org> + +files/kdepimlibs-4.9.3-configure.patch, kdepimlibs-4.9.3.ebuild: + Backport a patch from upstream fixing a configure failure, wrt bug #442214. *kdepimlibs-4.9.3 (08 Nov 2012) diff --git a/kde-base/kdepimlibs/files/kdepimlibs-4.9.3-configure.patch b/kde-base/kdepimlibs/files/kdepimlibs-4.9.3-configure.patch new file mode 100644 index 000000000000..3ae993968451 --- /dev/null +++ b/kde-base/kdepimlibs/files/kdepimlibs-4.9.3-configure.patch @@ -0,0 +1,27 @@ +From 9d7e2f01702a7c713184a2f3434a5b92563375c3 Mon Sep 17 00:00:00 2001 +From: Stephen Kelly <steveire@gmail.com> +Date: Sun, 12 Feb 2012 17:16:51 +0100 +Subject: [PATCH] Remove include which only generates errors because it is + obsolete. + +REVIEW: 107255 +--- + gpgme++/CMakeLists.txt | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/gpgme++/CMakeLists.txt b/gpgme++/CMakeLists.txt +index 00c51a2..674d5d3 100644 +--- a/gpgme++/CMakeLists.txt ++++ b/gpgme++/CMakeLists.txt +@@ -117,8 +117,6 @@ if ( GPGME_PTH_FOUND ) + install(TARGETS gpgmepp-pth EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) + endif() + +- +-include( CMakeExportBuildSettings ) + # this writes way too much, but do we care? + EXPORT_LIBRARY_DEPENDENCIES( ${CMAKE_CURRENT_BINARY_DIR}/GpgmeppLibraryDepends.cmake ) + +-- +1.8.0 + diff --git a/kde-base/kdepimlibs/kdepimlibs-4.9.3.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.9.3.ebuild index 574454011afc..e3b067562901 100644 --- a/kde-base/kdepimlibs/kdepimlibs-4.9.3.ebuild +++ b/kde-base/kdepimlibs/kdepimlibs-4.9.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.9.3.ebuild,v 1.1 2012/11/08 23:26:25 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.9.3.ebuild,v 1.2 2012/11/11 14:52:55 kensington Exp $ EAPI=4 @@ -35,7 +35,10 @@ DEPEND=" # bug #418071 RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-4.9.1-boostincludes.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-4.9.1-boostincludes.patch" + "${FILESDIR}/${PN}-4.9.3-configure.patch" +) src_prepare() { kde4-base_src_prepare |