| 1 |
commit: 98a765bf172c7fee6111eb55d60be1c1dc76e810 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Feb 18 23:20:03 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 18 23:21:46 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=98a765bf |
| 7 |
|
| 8 |
kde-apps/knotes: Fix build with 'bundled' noteshared |
| 9 |
|
| 10 |
See also: Gentoo bug 575088 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.27 |
| 13 |
|
| 14 |
.../knotes/files/knotes-15.12.2-add-noteshared.patch | 20 ++++++++++++++++++++ |
| 15 |
kde-apps/knotes/knotes-15.12.2.ebuild | 4 ++++ |
| 16 |
kde-apps/knotes/knotes-15.12.49.9999.ebuild | 4 ++++ |
| 17 |
3 files changed, 28 insertions(+) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..5b705cc |
| 22 |
--- /dev/null |
| 23 |
+++ b/kde-apps/knotes/files/knotes-15.12.2-add-noteshared.patch |
| 24 |
@@ -0,0 +1,20 @@ |
| 25 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 26 |
+index e85ecc9..540c201 100644 |
| 27 |
+--- a/CMakeLists.txt |
| 28 |
++++ b/CMakeLists.txt |
| 29 |
+@@ -275,7 +275,6 @@ if (NOT KDEPIM_BUILD_WITH_INSTALLED_LIB) |
| 30 |
+ add_subdirectory(libfollowupreminder) |
| 31 |
+ add_subdirectory(libsendlater) |
| 32 |
+ add_subdirectory(libgravatar) |
| 33 |
+-add_subdirectory(noteshared) |
| 34 |
+ add_subdirectory(libkdepim) |
| 35 |
+ add_subdirectory(calendarsupport) |
| 36 |
+ add_subdirectory(eventviews) |
| 37 |
+@@ -324,6 +323,7 @@ add_subdirectory(akregator) |
| 38 |
+ add_subdirectory(importwizard) |
| 39 |
+ add_subdirectory(kaddressbook) |
| 40 |
+ add_subdirectory(mboximporter) |
| 41 |
++add_subdirectory(noteshared) |
| 42 |
+ add_subdirectory(knotes) |
| 43 |
+ add_subdirectory(ktnef) |
| 44 |
+ add_subdirectory(pimsettingexporter) |
| 45 |
|
| 46 |
diff --git a/kde-apps/knotes/knotes-15.12.2.ebuild b/kde-apps/knotes/knotes-15.12.2.ebuild |
| 47 |
index 1470fcb..b5bff7a 100644 |
| 48 |
--- a/kde-apps/knotes/knotes-15.12.2.ebuild |
| 49 |
+++ b/kde-apps/knotes/knotes-15.12.2.ebuild |
| 50 |
@@ -70,6 +70,10 @@ else |
| 51 |
S="${WORKDIR}/${KMNAME}-${PV}" |
| 52 |
fi |
| 53 |
|
| 54 |
+# ONLY for 15.12 branch: special handling for |
| 55 |
+# KDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE except noteshared |
| 56 |
+PATCHES=( "${FILESDIR}/${PN}-15.12.2-add-noteshared.patch" ) |
| 57 |
+ |
| 58 |
src_prepare() { |
| 59 |
kde5_src_prepare |
| 60 |
|
| 61 |
|
| 62 |
diff --git a/kde-apps/knotes/knotes-15.12.49.9999.ebuild b/kde-apps/knotes/knotes-15.12.49.9999.ebuild |
| 63 |
index 36fbcb1..b738eaa 100644 |
| 64 |
--- a/kde-apps/knotes/knotes-15.12.49.9999.ebuild |
| 65 |
+++ b/kde-apps/knotes/knotes-15.12.49.9999.ebuild |
| 66 |
@@ -70,6 +70,10 @@ else |
| 67 |
S="${WORKDIR}/${KMNAME}-${PV}" |
| 68 |
fi |
| 69 |
|
| 70 |
+# ONLY for 15.12 branch: special handling for |
| 71 |
+# KDEPIM_BUILD_WITH_INSTALLED_LIB=TRUE except noteshared |
| 72 |
+PATCHES=( "${FILESDIR}/${PN}-15.12.2-add-noteshared.patch" ) |
| 73 |
+ |
| 74 |
src_prepare() { |
| 75 |
kde5_src_prepare |
Archives