diff options
| author | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2012-09-10 16:45:39 +0200 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2012-09-10 16:45:39 +0200 |
| commit | a81bb139d86be7c033a505b8c2f48a9b1c59a816 (patch) | |
| tree | e0add5391f463379220e2ffad734b33ba90db44e | |
| parent | 3fa0edc9ec589087851d87032af68feefbdc5c88 (diff) | |
| download | kde-a81bb139d86be7c033a505b8c2f48a9b1c59a816.tar.gz kde-a81bb139d86be7c033a505b8c2f48a9b1c59a816.tar.bz2 kde-a81bb139d86be7c033a505b8c2f48a9b1c59a816.zip | |
Save and reexport Boost header location, bug 434144; patch by Alex Turbov
(Portage version: 2.2.0_alpha124/git/Linux x86_64, unsigned Manifest commit)
| -rw-r--r-- | kde-base/kdepimlibs/files/kdepimlibs-4.9.1-boostincludes.patch | 15 | ||||
| -rw-r--r-- | kde-base/kdepimlibs/kdepimlibs-4.9.49.9999.ebuild | 2 | ||||
| -rw-r--r-- | kde-base/kdepimlibs/kdepimlibs-9999.ebuild | 2 |
3 files changed, 19 insertions, 0 deletions
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 00000000000..2df44a73308 --- /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.49.9999.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.9.49.9999.ebuild index cde880a1dc8..c90a296e3f6 100644 --- a/kde-base/kdepimlibs/kdepimlibs-4.9.49.9999.ebuild +++ b/kde-base/kdepimlibs/kdepimlibs-4.9.49.9999.ebuild @@ -37,6 +37,8 @@ DEPEND=" # bug #418071 RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-4.9.1-boostincludes.patch" ) + src_prepare() { kde4-base_src_prepare diff --git a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild index cde880a1dc8..c90a296e3f6 100644 --- a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild +++ b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild @@ -37,6 +37,8 @@ DEPEND=" # bug #418071 RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-4.9.1-boostincludes.patch" ) + src_prepare() { kde4-base_src_prepare |