* [gentoo-commits] proj/kde:master commit in: kde-apps/libakonadi/, kde-apps/libakonadi/files/
@ 2015-11-29 15:29 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2015-11-29 15:29 UTC (permalink / raw
To: gentoo-commits
commit: 1bf3cac70302330c900e912d51537bf33d5822fb
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Nov 28 17:11:22 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 17:13:23 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1bf3cac7
kde-apps/libakonadi: Add missing VIRTUALX_REQUIRED, built test tools
Package-Manager: portage-2.2.26
.../libakonadi-15.11.80-testtools-optional.patch | 53 ++++++++++++++++++++++
.../libakonadi/libakonadi-15.12.49.9999.ebuild | 9 +++-
kde-apps/libakonadi/libakonadi-9999.ebuild | 9 +++-
3 files changed, 67 insertions(+), 4 deletions(-)
diff --git a/kde-apps/libakonadi/files/libakonadi-15.11.80-testtools-optional.patch b/kde-apps/libakonadi/files/libakonadi-15.11.80-testtools-optional.patch
new file mode 100644
index 0000000..5267653
--- /dev/null
+++ b/kde-apps/libakonadi/files/libakonadi-15.11.80-testtools-optional.patch
@@ -0,0 +1,53 @@
+commit 4647731b1fb5dfeb68d9f7b54653c050e52e48e6
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat Nov 28 17:48:46 2015 +0100
+
+ [akonadi] Make build of testing tools possible without BUILD_TESTING
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6ee9cbe..7e8df8c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,6 +43,8 @@ else()
+ set(KF5Akonadi_DATA_DIR "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_DATADIR_KF5}/akonadi")
+ endif()
+
++option(BUILD_TOOLS "Build and install tools for testing purposes." TRUE)
++
+ ########### Find packages ###########
+ find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
+@@ -93,7 +95,14 @@ add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
+ configure_file(akonadiprivate_export.h.in "${CMAKE_CURRENT_BINARY_DIR}/akonadiprivate_export.h")
+
+ add_subdirectory(src)
+-if(BUILD_TESTING)
++# add testrunner (application for managing a self-contained test
++# environment)
++if(BUILD_TOOLS)
++ add_subdirectory(autotests/testrunner)
++ add_subdirectory(autotests/testresource)
++ add_subdirectory(autotests/testsearchplugin)
++endif()
++if(BUILD_TOOLS AND BUILD_TESTING)
+ add_subdirectory(autotests)
+ add_subdirectory(tests)
+ endif()
+diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
+index 37dc10f..dc69a26 100644
+--- a/autotests/CMakeLists.txt
++++ b/autotests/CMakeLists.txt
+@@ -25,13 +25,6 @@ include_directories(
+ ${Boost_INCLUDE_DIR}
+ )
+
+-# add testrunner (application for managing a self-contained test
+-# environment)
+-
+-add_subdirectory(testrunner)
+-add_subdirectory(testresource)
+-add_subdirectory(testsearchplugin)
+-
+ # convenience macro to add akonadi qtestlib unit-tests
+ macro(add_akonadi_test _source)
+ set(_test ${_source})
diff --git a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild b/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
index 9fb8aa2..8bdb137 100644
--- a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
+++ b/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
@@ -7,6 +7,7 @@ EAPI=5
KDE_DOXYGEN=true
KDE_TEST=true
KMNAME=kdepimlibs
+VIRTUALX_REQUIRED=test
inherit kde5
DESCRIPTION="Common akonadi libraries for PIM apps"
@@ -57,8 +58,11 @@ REQUIRED_USE="test? ( tools )"
S="${WORKDIR}/${P}/akonadi"
src_prepare() {
- use tools || sed -e "/add_subdirectory(xml)/ s/^/#/" \
- -i src/CMakeLists.txt
+ epatch "${FILESDIR}/${PN}-15.11.80-testtools-optional.patch"
+ if ! use tools ; then
+ sed -e "/add_subdirectory(xml)/ s/^/#DONT/" \
+ -i src/CMakeLists.txt || die
+ fi
kde5_src_prepare
}
@@ -66,6 +70,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package designer Qt5Designer)
+ $(cmake-utils_use_build tools)
$(cmake-utils_use_build test TESTING)
)
kde5_src_configure
diff --git a/kde-apps/libakonadi/libakonadi-9999.ebuild b/kde-apps/libakonadi/libakonadi-9999.ebuild
index 9fb8aa2..8bdb137 100644
--- a/kde-apps/libakonadi/libakonadi-9999.ebuild
+++ b/kde-apps/libakonadi/libakonadi-9999.ebuild
@@ -7,6 +7,7 @@ EAPI=5
KDE_DOXYGEN=true
KDE_TEST=true
KMNAME=kdepimlibs
+VIRTUALX_REQUIRED=test
inherit kde5
DESCRIPTION="Common akonadi libraries for PIM apps"
@@ -57,8 +58,11 @@ REQUIRED_USE="test? ( tools )"
S="${WORKDIR}/${P}/akonadi"
src_prepare() {
- use tools || sed -e "/add_subdirectory(xml)/ s/^/#/" \
- -i src/CMakeLists.txt
+ epatch "${FILESDIR}/${PN}-15.11.80-testtools-optional.patch"
+ if ! use tools ; then
+ sed -e "/add_subdirectory(xml)/ s/^/#DONT/" \
+ -i src/CMakeLists.txt || die
+ fi
kde5_src_prepare
}
@@ -66,6 +70,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package designer Qt5Designer)
+ $(cmake-utils_use_build tools)
$(cmake-utils_use_build test TESTING)
)
kde5_src_configure
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/libakonadi/, kde-apps/libakonadi/files/
@ 2015-12-18 16:04 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2015-12-18 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 6d1d167125f1054c910ed578e16233273e8cc43d
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Dec 17 22:45:31 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 16:03:41 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6d1d1671
kde-apps/libakonadi: Fix possible crash on exit
Package-Manager: portage-2.2.24
.../libakonadi-15.12.0-fix-possible-crash.patch | 59 +++++++++++++++
kde-apps/libakonadi/libakonadi-15.12.0-r1.ebuild | 83 ++++++++++++++++++++++
2 files changed, 142 insertions(+)
diff --git a/kde-apps/libakonadi/files/libakonadi-15.12.0-fix-possible-crash.patch b/kde-apps/libakonadi/files/libakonadi-15.12.0-fix-possible-crash.patch
new file mode 100644
index 0000000..5c3144c
--- /dev/null
+++ b/kde-apps/libakonadi/files/libakonadi-15.12.0-fix-possible-crash.patch
@@ -0,0 +1,59 @@
+From: Weng Xuetian <wengxt@gmail.com>
+Date: Thu, 17 Dec 2015 16:19:36 +0000
+Subject: Fix possible crash upon application exits (e.g. kmail)
+X-Git-Url: http://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=c6bf33a9018587e96a350bfd0b2bffde1859db27
+---
+Fix possible crash upon application exits (e.g. kmail)
+
+Qt lambda connection will not automatically disconnect if no context
+qobject is provided. Since SessionPrivate is not a qobject, disconnect
+the connection in the destructor to prevent accessing deleted object.
+
+REVIEW: 126395
+---
+
+
+--- a/src/core/session.cpp
++++ b/src/core/session.cpp
+@@ -301,15 +301,16 @@
+ // Shutdown the thread before QApplication event loop quits - the
+ // thread()->wait() mechanism in ConnectionThread dtor crashes sometimes
+ // when called from QApplication destructor
+- QObject::connect(qApp, &QCoreApplication::aboutToQuit,
+- [this]() {
+- delete connThread;
+- connThread = Q_NULLPTR;
+- });
++ connThreadCleanUp = QObject::connect(qApp, &QCoreApplication::aboutToQuit,
++ [this]() {
++ delete connThread;
++ connThread = Q_NULLPTR;
++ });
+ }
+
+ SessionPrivate::~SessionPrivate()
+ {
++ QObject::disconnect(connThreadCleanUp);
+ delete connThread;
+ }
+
+
+--- a/src/core/session_p.h
++++ b/src/core/session_p.h
+@@ -29,6 +29,7 @@
+
+ #include <QtCore/QQueue>
+ #include <QtCore/QThreadStorage>
++#include <QtCore/QMetaObject>
+ #include <QFile>
+
+ class QIODevice;
+@@ -125,6 +126,7 @@
+ Session *mParent;
+ QThread *thread;
+ ConnectionThread *connThread;
++ QMetaObject::Connection connThreadCleanUp;
+ QByteArray sessionId;
+ bool connected;
+ qint64 theNextTag;
+
diff --git a/kde-apps/libakonadi/libakonadi-15.12.0-r1.ebuild b/kde-apps/libakonadi/libakonadi-15.12.0-r1.ebuild
new file mode 100644
index 0000000..391ec29
--- /dev/null
+++ b/kde-apps/libakonadi/libakonadi-15.12.0-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_DOXYGEN=true
+KDE_TEST=true
+KMNAME=kdepimlibs
+VIRTUALX_REQUIRED=test
+inherit kde5
+
+DESCRIPTION="Common akonadi libraries for PIM apps"
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-2.1"
+IUSE="designer tools"
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT="test"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdesignerplugin)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_kdeapps_dep akonadi)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsql:5
+ dev-qt/qtxml:5
+ dev-qt/qtwidgets:5
+ designer? ( dev-qt/designer:5 )
+ tools? ( dev-libs/libxml2 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+ !kde-apps/kdepimlibs
+ !kde-base/kdepimlibs:4
+"
+
+REQUIRED_USE="test? ( tools )"
+
+if [[ ${KDE_BUILD_TYPE} = live ]] ; then
+ S="${WORKDIR}/${P}/akonadi"
+else
+ S="${WORKDIR}/${KMNAME}-${PV}/akonadi"
+fi
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-15.11.80-testtools-optional.patch" \
+ "${FILESDIR}/${PN}-15.12.0-fix-possible-crash.patch"
+
+ if ! use tools ; then
+ sed -e "/add_subdirectory(xml)/ s/^/#DONT/" \
+ -i src/CMakeLists.txt || die
+ fi
+
+ kde5_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package designer Qt5Designer)
+ $(cmake-utils_use_build tools)
+ $(cmake-utils_use_build test TESTING)
+ )
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/libakonadi/, kde-apps/libakonadi/files/
@ 2016-01-17 12:57 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2016-01-17 12:57 UTC (permalink / raw
To: gentoo-commits
commit: 29fa8033e84586abd55419d920590576494de472
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jan 17 12:48:22 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 12:48:55 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=29fa8033
kde-apps/libakonadi: Fix testtools patch
Package-Manager: portage-2.2.26
.../libakonadi-15.12.0-fix-possible-crash.patch | 59 ----------------------
.../libakonadi-15.12.2-testtools-optional.patch | 57 +++++++++++++++++++++
.../libakonadi/libakonadi-15.12.49.9999.ebuild | 6 +--
kde-apps/libakonadi/libakonadi-9999.ebuild | 6 +--
4 files changed, 63 insertions(+), 65 deletions(-)
diff --git a/kde-apps/libakonadi/files/libakonadi-15.12.0-fix-possible-crash.patch b/kde-apps/libakonadi/files/libakonadi-15.12.0-fix-possible-crash.patch
deleted file mode 100644
index 5c3144c..0000000
--- a/kde-apps/libakonadi/files/libakonadi-15.12.0-fix-possible-crash.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Weng Xuetian <wengxt@gmail.com>
-Date: Thu, 17 Dec 2015 16:19:36 +0000
-Subject: Fix possible crash upon application exits (e.g. kmail)
-X-Git-Url: http://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=c6bf33a9018587e96a350bfd0b2bffde1859db27
----
-Fix possible crash upon application exits (e.g. kmail)
-
-Qt lambda connection will not automatically disconnect if no context
-qobject is provided. Since SessionPrivate is not a qobject, disconnect
-the connection in the destructor to prevent accessing deleted object.
-
-REVIEW: 126395
----
-
-
---- a/src/core/session.cpp
-+++ b/src/core/session.cpp
-@@ -301,15 +301,16 @@
- // Shutdown the thread before QApplication event loop quits - the
- // thread()->wait() mechanism in ConnectionThread dtor crashes sometimes
- // when called from QApplication destructor
-- QObject::connect(qApp, &QCoreApplication::aboutToQuit,
-- [this]() {
-- delete connThread;
-- connThread = Q_NULLPTR;
-- });
-+ connThreadCleanUp = QObject::connect(qApp, &QCoreApplication::aboutToQuit,
-+ [this]() {
-+ delete connThread;
-+ connThread = Q_NULLPTR;
-+ });
- }
-
- SessionPrivate::~SessionPrivate()
- {
-+ QObject::disconnect(connThreadCleanUp);
- delete connThread;
- }
-
-
---- a/src/core/session_p.h
-+++ b/src/core/session_p.h
-@@ -29,6 +29,7 @@
-
- #include <QtCore/QQueue>
- #include <QtCore/QThreadStorage>
-+#include <QtCore/QMetaObject>
- #include <QFile>
-
- class QIODevice;
-@@ -125,6 +126,7 @@
- Session *mParent;
- QThread *thread;
- ConnectionThread *connThread;
-+ QMetaObject::Connection connThreadCleanUp;
- QByteArray sessionId;
- bool connected;
- qint64 theNextTag;
-
diff --git a/kde-apps/libakonadi/files/libakonadi-15.12.2-testtools-optional.patch b/kde-apps/libakonadi/files/libakonadi-15.12.2-testtools-optional.patch
new file mode 100644
index 0000000..e92bd38
--- /dev/null
+++ b/kde-apps/libakonadi/files/libakonadi-15.12.2-testtools-optional.patch
@@ -0,0 +1,57 @@
+commit 7161f629b39ca84972510eb8333a78c5a5efcec9
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun Jan 17 13:34:17 2016 +0100
+
+ [libakonadi] Make tools optional
+
+diff --git a/akonadi/CMakeLists.txt b/akonadi/CMakeLists.txt
+index c80db92..e36c0ab 100644
+--- a/akonadi/CMakeLists.txt
++++ b/akonadi/CMakeLists.txt
+@@ -43,6 +43,8 @@ else()
+ set(KF5Akonadi_DATA_DIR "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_DATADIR_KF5}/akonadi")
+ endif()
+
++option(BUILD_TOOLS "Build and install tools for testing purposes." TRUE)
++
+ ########### Find packages ###########
+ find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
+@@ -93,12 +95,16 @@ add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
+ configure_file(akonadiprivate_export.h.in "${CMAKE_CURRENT_BINARY_DIR}/akonadiprivate_export.h")
+
+ add_subdirectory(src)
+-add_subdirectory(autotests/testrunner)
+-add_subdirectory(autotests/testresource)
++# add testrunner (application for managing a self-contained test environment)
++if(BUILD_TOOLS)
++ add_subdirectory(autotests/testrunner)
++ add_subdirectory(autotests/testresource)
++ add_subdirectory(autotests/testsearchplugin)
++endif()
+
+-if(BUILD_TESTING)
+- add_subdirectory(autotests)
+- add_subdirectory(tests)
++if(BUILD_TOOLS AND BUILD_TESTING)
++ add_subdirectory(autotests)
++ add_subdirectory(tests)
+ endif()
+ ########### CMake Config Files ###########
+
+diff --git a/akonadi/autotests/CMakeLists.txt b/akonadi/autotests/CMakeLists.txt
+index 308cf22..dc69a26 100644
+--- a/akonadi/autotests/CMakeLists.txt
++++ b/akonadi/autotests/CMakeLists.txt
+@@ -25,11 +25,6 @@ include_directories(
+ ${Boost_INCLUDE_DIR}
+ )
+
+-# add testrunner (application for managing a self-contained test
+-# environment)
+-
+-add_subdirectory(testsearchplugin)
+-
+ # convenience macro to add akonadi qtestlib unit-tests
+ macro(add_akonadi_test _source)
+ set(_test ${_source})
diff --git a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild b/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
index d895446..7890628 100644
--- a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
+++ b/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
@@ -60,7 +60,7 @@ else
S="${WORKDIR}/${KMNAME}-${PV}/akonadi"
fi
-PATCHES=( "${FILESDIR}/${PN}-15.11.80-testtools-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-15.12.2-testtools-optional.patch" )
src_prepare() {
kde5_src_prepare
@@ -73,8 +73,8 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package designer Qt5Designer)
- $(cmake-utils_use_build tools)
- $(cmake-utils_use_build test TESTING)
+ -DBUILD_TESTING=$(usex test)
+ -DBUILD_TOOLS=$(usex tools)
)
kde5_src_configure
}
diff --git a/kde-apps/libakonadi/libakonadi-9999.ebuild b/kde-apps/libakonadi/libakonadi-9999.ebuild
index d895446..7890628 100644
--- a/kde-apps/libakonadi/libakonadi-9999.ebuild
+++ b/kde-apps/libakonadi/libakonadi-9999.ebuild
@@ -60,7 +60,7 @@ else
S="${WORKDIR}/${KMNAME}-${PV}/akonadi"
fi
-PATCHES=( "${FILESDIR}/${PN}-15.11.80-testtools-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-15.12.2-testtools-optional.patch" )
src_prepare() {
kde5_src_prepare
@@ -73,8 +73,8 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package designer Qt5Designer)
- $(cmake-utils_use_build tools)
- $(cmake-utils_use_build test TESTING)
+ -DBUILD_TESTING=$(usex test)
+ -DBUILD_TOOLS=$(usex tools)
)
kde5_src_configure
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-01-17 12:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-17 12:57 [gentoo-commits] proj/kde:master commit in: kde-apps/libakonadi/, kde-apps/libakonadi/files/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2015-12-18 16:04 Michael Palimaka
2015-11-29 15:29 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox