summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kde-base/kdepimlibs/files/kdepimlibs-4.9.1-boostincludes.patch15
-rw-r--r--kde-base/kdepimlibs/kdepimlibs-4.9.49.9999.ebuild2
-rw-r--r--kde-base/kdepimlibs/kdepimlibs-9999.ebuild2
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