commit: 5997acdb424e5071c46b4b9fd42cb583b28fba45
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 20:48:47 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 20:48:55 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5997acdb
kde-apps/akonadi: Build akonadixml unconditionally
kde-apps/akonadiconsole depends on it.
Package-Manager: portage-2.3.3
kde-apps/akonadi/akonadi-16.12.49.9999.ebuild | 4 +++-
kde-apps/akonadi/akonadi-9999.ebuild | 3 ++-
.../akonadi/files/akonadi-16.12.3-akonadixml.patch | 22 ++++++++++++++++++++++
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-16.12.49.9999.ebuild
b/kde-apps/akonadi/akonadi-16.12.49.9999.ebuild
index 74c041d5d5..c0f6dc55b7 100644
--- a/kde-apps/akonadi/akonadi-16.12.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-16.12.49.9999.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
sqlite? ( dev-db/sqlite:3 )
- tools? ( xml? ( dev-libs/libxml2 ) )
+ xml? ( dev-libs/libxml2 )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -62,6 +62,7 @@ PATCHES=(
"${FILESDIR}/${PN}-16.12.0-mysql56-crash.patch"
"${FILESDIR}/${PN}-16.12.1-revert-abs-path.patch"
"${FILESDIR}/${PN}-16.12.1-rename-header.patch"
+ "${FILESDIR}/${PN}-16.12.3-akonadixml.patch"
)
pkg_setup() {
@@ -99,6 +100,7 @@ src_configure() {
local mycmakeargs=(
-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
+ $(cmake-utils_use_find_package xml LibXml2)
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
)
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild
b/kde-apps/akonadi/akonadi-9999.ebuild
index 91792b8665..744cc3ac40 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
sqlite? ( dev-db/sqlite:3 )
- tools? ( xml? ( dev-libs/libxml2 ) )
+ xml? ( dev-libs/libxml2 )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -95,6 +95,7 @@ src_configure() {
local mycmakeargs=(
-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
+ $(cmake-utils_use_find_package xml LibXml2)
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
)
diff --git a/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch
b/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch
new file mode 100644
index 0000000000..6acd5b86dc
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch
@@ -0,0 +1,22 @@
+commit 2fe8bf8b73b9f5f5d19c87099b71a71f2595e70f
+Author: Andreas Sturmlechner <[email protected]>
+Date: Sat Feb 11 21:29:05 2017 +0100
+
+ Build akonadixml unconditionally
+
+ It makes more sense now that akonadiconsole depends on it.
+
+ REVIEW: 129941
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 4141947..4e79dc0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -16,6 +16,4 @@ add_subdirectory(core)
+ add_subdirectory(agentbase)
+ add_subdirectory(widgets)
+ add_subdirectory(selftest)
+-if(BUILD_TOOLS)
+- add_subdirectory(xml)
+-endif()
++add_subdirectory(xml)
