commit: 98a765bf172c7fee6111eb55d60be1c1dc76e810
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Feb 18 23:20:03 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 23:21:46 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=98a765bf
kde-apps/knotes: Fix build with 'bundled' noteshared
See also: Gentoo bug 575088
Package-Manager: portage-2.2.27
.../knotes/files/knotes-15.12.2-add-noteshared.patch | 20 ++++++++++++++++++++
kde-apps/knotes/knotes-15.12.2.ebuild | 4 ++++
kde-apps/knotes/knotes-15.12.49.9999.ebuild | 4 ++++
3 files changed, 28 insertions(+)
diff --git a/kde-apps/knotes/files/knotes-15.12.2-add-noteshared.patch
b/kde-apps/knotes/files/knotes-15.12.2-add-noteshared.patch
new file mode 100644
index 0000000..5b705cc
--- /dev/null
+++ b/kde-apps/knotes/files/knotes-15.12.2-add-noteshared.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e85ecc9..540c201 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -275,7 +275,6 @@ if (NOT KDEPIM_BUILD_WITH_INSTALLED_LIB)
+ add_subdirectory(libfollowupreminder)
+ add_subdirectory(libsendlater)
+ add_subdirectory(libgravatar)
+-add_subdirectory(noteshared)
+ add_subdirectory(libkdepim)
+ add_subdirectory(calendarsupport)
+ add_subdirectory(eventviews)
+@@ -324,6 +323,7 @@ add_subdirectory(akregator)
+ add_subdirectory(importwizard)
+ add_subdirectory(kaddressbook)
+ add_subdirectory(mboximporter)
++add_subdirectory(noteshared)
+ add_subdirectory(knotes)
+ add_subdirectory(ktnef)
+ add_subdirectory(pimsettingexporter)
diff --git a/kde-apps/knotes/knotes-15.12.2.ebuild
b/kde-apps/knotes/knotes-15.12.2.ebuild
index 1470fcb..b5bff7a 100644
--- a/kde-apps/knotes/knotes-15.12.2.ebuild
+++ b/kde-apps/knotes/knotes-15.12.2.ebuild
@@ -70,6 +70,10 @@ else
S="${WORKDIR}/${KMNAME}-${PV}"
fi
+# ONLY for 15.12 branch: special handling for
+# KDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE except noteshared
+PATCHES=( "${FILESDIR}/${PN}-15.12.2-add-noteshared.patch" )
+
src_prepare() {
kde5_src_prepare
diff --git a/kde-apps/knotes/knotes-15.12.49.9999.ebuild
b/kde-apps/knotes/knotes-15.12.49.9999.ebuild
index 36fbcb1..b738eaa 100644
--- a/kde-apps/knotes/knotes-15.12.49.9999.ebuild
+++ b/kde-apps/knotes/knotes-15.12.49.9999.ebuild
@@ -70,6 +70,10 @@ else
S="${WORKDIR}/${KMNAME}-${PV}"
fi
+# ONLY for 15.12 branch: special handling for
+# KDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE except noteshared
+PATCHES=( "${FILESDIR}/${PN}-15.12.2-add-noteshared.patch" )
+
src_prepare() {
kde5_src_prepare
