diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-09-10 14:40:56 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-09-10 14:40:56 +0000 |
| commit | 41ef67885807714fdb2421a70b1a3543730740fd (patch) | |
| tree | d148a00bdd482dd5031c8b318878447756232c78 /kde-base | |
| parent | Version bump. Removed oldest 0.3 version. (diff) | |
| download | gentoo-2-41ef67885807714fdb2421a70b1a3543730740fd.tar.gz gentoo-2-41ef67885807714fdb2421a70b1a3543730740fd.tar.bz2 gentoo-2-41ef67885807714fdb2421a70b1a3543730740fd.zip | |
Save and reexport Boost header location, bug 434144; patch by Alex Turbov
(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdepimlibs/ChangeLog | 9 | ||||
| -rw-r--r-- | kde-base/kdepimlibs/files/kdepimlibs-4.9.1-boostincludes.patch | 15 | ||||
| -rw-r--r-- | kde-base/kdepimlibs/kdepimlibs-4.9.1-r1.ebuild (renamed from kde-base/kdepimlibs/kdepimlibs-4.9.1.ebuild) | 4 |
3 files changed, 26 insertions, 2 deletions
diff --git a/kde-base/kdepimlibs/ChangeLog b/kde-base/kdepimlibs/ChangeLog index cdbf443d22e4..ebdef0368559 100644 --- a/kde-base/kdepimlibs/ChangeLog +++ b/kde-base/kdepimlibs/ChangeLog @@ -1,6 +1,13 @@ # 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.160 2012/09/04 18:45:11 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.161 2012/09/10 14:40:55 dilfridge Exp $ + +*kdepimlibs-4.9.1-r1 (10 Sep 2012) + + 10 Sep 2012; Andreas K. Huettel <dilfridge@gentoo.org> + -kdepimlibs-4.9.1.ebuild, +kdepimlibs-4.9.1-r1.ebuild, + +files/kdepimlibs-4.9.1-boostincludes.patch: + Save and reexport Boost header location, bug 434144; patch by Alex Turbov *kdepimlibs-4.9.1 (04 Sep 2012) diff --git a/kde-base/kdepimlibs/files/kdepimlibs-4.9.1-boostincludes.patch b/kde-base/kdepimlibs/files/kdepimlibs-4.9.1-boostincludes.patch new file mode 100644 index 000000000000..2df44a733084 --- /dev/null +++ b/kde-base/kdepimlibs/files/kdepimlibs-4.9.1-boostincludes.patch @@ -0,0 +1,15 @@ +Make sure that the Boost headers are actually found, since they are +referenced in the kdepimlibs headers. +Patch by Alex Turbov, see https://bugs.kde.org/show_bug.cgi?id=306323 + +--- KdepimLibsConfig.cmake.in.org 2012-08-13 12:46:24.000000000 +0400 ++++ KdepimLibsConfig.cmake.in 2012-09-06 08:53:53.000000000 +0400 +@@ -15,7 +15,7 @@ + set(KDEPIMLIBS_DBUS_INTERFACES_DIR "@KDEPIMLIBS_DBUS_INTERFACES_DIR@") + set(KDEPIMLIBS_DBUS_SERVICES_DIR "@KDEPIMLIBS_DBUS_SERVICES_DIR@") + set(KDEPIMLIBS_INCLUDE_DIR "@KDEPIMLIBS_INCLUDE_DIR@") +-set(KDEPIMLIBS_INCLUDE_DIRS "@KDEPIMLIBS_INCLUDE_DIR@" "@KDEPIMLIBS_INCLUDE_DIR@/KDE") ++set(KDEPIMLIBS_INCLUDE_DIRS "@KDEPIMLIBS_INCLUDE_DIR@" "@KDEPIMLIBS_INCLUDE_DIR@/KDE" "@Boost_INCLUDE_DIR@") + set(KDEPIMLIBS_LIB_DIR "@KDEPIMLIBS_LIB_DIR@") + set(KDEPIMLIBS_BIN_DIR "@KDEPIMLIBS_BIN_DIR@") + set(KDEPIMLIBS_LIBEXEC_DIR "@KDEPIMLIBS_LIBEXEC_DIR@") diff --git a/kde-base/kdepimlibs/kdepimlibs-4.9.1.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.9.1-r1.ebuild index 6a77803e8c0a..cc37d4141528 100644 --- a/kde-base/kdepimlibs/kdepimlibs-4.9.1.ebuild +++ b/kde-base/kdepimlibs/kdepimlibs-4.9.1-r1.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.1.ebuild,v 1.1 2012/09/04 18:45:11 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.9.1-r1.ebuild,v 1.1 2012/09/10 14:40:55 dilfridge Exp $ EAPI=4 @@ -37,6 +37,8 @@ DEPEND=" # bug #418071 RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-4.9.1-boostincludes.patch" ) + src_prepare() { kde4-base_src_prepare |