| 1 |
commit: 5997acdb424e5071c46b4b9fd42cb583b28fba45 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 11 20:48:47 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 11 20:48:55 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5997acdb |
| 7 |
|
| 8 |
kde-apps/akonadi: Build akonadixml unconditionally |
| 9 |
|
| 10 |
kde-apps/akonadiconsole depends on it. |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.3 |
| 13 |
|
| 14 |
kde-apps/akonadi/akonadi-16.12.49.9999.ebuild | 4 +++- |
| 15 |
kde-apps/akonadi/akonadi-9999.ebuild | 3 ++- |
| 16 |
.../akonadi/files/akonadi-16.12.3-akonadixml.patch | 22 ++++++++++++++++++++++ |
| 17 |
3 files changed, 27 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-apps/akonadi/akonadi-16.12.49.9999.ebuild b/kde-apps/akonadi/akonadi-16.12.49.9999.ebuild |
| 20 |
index 74c041d5d5..c0f6dc55b7 100644 |
| 21 |
--- a/kde-apps/akonadi/akonadi-16.12.49.9999.ebuild |
| 22 |
+++ b/kde-apps/akonadi/akonadi-16.12.49.9999.ebuild |
| 23 |
@@ -42,7 +42,7 @@ COMMON_DEPEND=" |
| 24 |
$(add_qt_dep qtxml) |
| 25 |
x11-misc/shared-mime-info |
| 26 |
sqlite? ( dev-db/sqlite:3 ) |
| 27 |
- tools? ( xml? ( dev-libs/libxml2 ) ) |
| 28 |
+ xml? ( dev-libs/libxml2 ) |
| 29 |
" |
| 30 |
DEPEND="${COMMON_DEPEND} |
| 31 |
dev-libs/boost |
| 32 |
@@ -62,6 +62,7 @@ PATCHES=( |
| 33 |
"${FILESDIR}/${PN}-16.12.0-mysql56-crash.patch" |
| 34 |
"${FILESDIR}/${PN}-16.12.1-revert-abs-path.patch" |
| 35 |
"${FILESDIR}/${PN}-16.12.1-rename-header.patch" |
| 36 |
+ "${FILESDIR}/${PN}-16.12.3-akonadixml.patch" |
| 37 |
) |
| 38 |
|
| 39 |
pkg_setup() { |
| 40 |
@@ -99,6 +100,7 @@ src_configure() { |
| 41 |
local mycmakeargs=( |
| 42 |
-DAKONADI_BUILD_QSQLITE=$(usex sqlite) |
| 43 |
-DBUILD_TOOLS=$(usex tools) |
| 44 |
+ $(cmake-utils_use_find_package xml LibXml2) |
| 45 |
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON |
| 46 |
) |
| 47 |
|
| 48 |
|
| 49 |
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild |
| 50 |
index 91792b8665..744cc3ac40 100644 |
| 51 |
--- a/kde-apps/akonadi/akonadi-9999.ebuild |
| 52 |
+++ b/kde-apps/akonadi/akonadi-9999.ebuild |
| 53 |
@@ -42,7 +42,7 @@ COMMON_DEPEND=" |
| 54 |
$(add_qt_dep qtxml) |
| 55 |
x11-misc/shared-mime-info |
| 56 |
sqlite? ( dev-db/sqlite:3 ) |
| 57 |
- tools? ( xml? ( dev-libs/libxml2 ) ) |
| 58 |
+ xml? ( dev-libs/libxml2 ) |
| 59 |
" |
| 60 |
DEPEND="${COMMON_DEPEND} |
| 61 |
dev-libs/boost |
| 62 |
@@ -95,6 +95,7 @@ src_configure() { |
| 63 |
local mycmakeargs=( |
| 64 |
-DAKONADI_BUILD_QSQLITE=$(usex sqlite) |
| 65 |
-DBUILD_TOOLS=$(usex tools) |
| 66 |
+ $(cmake-utils_use_find_package xml LibXml2) |
| 67 |
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON |
| 68 |
) |
| 69 |
|
| 70 |
|
| 71 |
diff --git a/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch b/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch |
| 72 |
new file mode 100644 |
| 73 |
index 0000000000..6acd5b86dc |
| 74 |
--- /dev/null |
| 75 |
+++ b/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch |
| 76 |
@@ -0,0 +1,22 @@ |
| 77 |
+commit 2fe8bf8b73b9f5f5d19c87099b71a71f2595e70f |
| 78 |
+Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 79 |
+Date: Sat Feb 11 21:29:05 2017 +0100 |
| 80 |
+ |
| 81 |
+ Build akonadixml unconditionally |
| 82 |
+ |
| 83 |
+ It makes more sense now that akonadiconsole depends on it. |
| 84 |
+ |
| 85 |
+ REVIEW: 129941 |
| 86 |
+ |
| 87 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 88 |
+index 4141947..4e79dc0 100644 |
| 89 |
+--- a/src/CMakeLists.txt |
| 90 |
++++ b/src/CMakeLists.txt |
| 91 |
+@@ -16,6 +16,4 @@ add_subdirectory(core) |
| 92 |
+ add_subdirectory(agentbase) |
| 93 |
+ add_subdirectory(widgets) |
| 94 |
+ add_subdirectory(selftest) |
| 95 |
+-if(BUILD_TOOLS) |
| 96 |
+- add_subdirectory(xml) |
| 97 |
+-endif() |
| 98 |
++add_subdirectory(xml) |
Archives