[gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/, app-office/akonadi-server/files/

[gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/, app-office/akonadi-server/files/

[Michael Palimaka]

commit:     efdfc785873f650e3867cef7b672c271cbe3a74f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  7 11:28:31 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan  7 11:28:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=efdfc785

[app-office/akonadi-server] Fix breakage when Qt5 is installed.

Package-Manager: portage-2.1.11.38

---
 .../akonadi-server/akonadi-server-1.9.0.ebuild     |    3 ++
 .../files/akonadi-server-1.9.0-qt5.patch           |   24 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.9.0.ebuild b/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
index 1cfcc99..aa7fea1 100644
--- a/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.9.0.ebuild
@@ -44,6 +44,8 @@ REQUIRED_USE="|| ( sqlite mysql postgres )"
 
 RESTRICT=test
 
+PATCHES=( "${FILESDIR}/${P}-qt5.patch" )
+
 pkg_setup() {
 	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
 	# reverse driver check to keep the order
@@ -83,6 +85,7 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-DAKONADI_USE_STRIGI_SEARCH=OFF
+		-DWITH_QT5=OFF
 		$(cmake-utils_use test AKONADI_BUILD_TESTS)
 		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
 	)

diff --git a/app-office/akonadi-server/files/akonadi-server-1.9.0-qt5.patch b/app-office/akonadi-server/files/akonadi-server-1.9.0-qt5.patch
new file mode 100644
index 0000000..132557a
--- /dev/null
+++ b/app-office/akonadi-server/files/akonadi-server-1.9.0-qt5.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e0efd25..efcdbe0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,6 +21,7 @@ option(AKONADI_BUILD_QSQLITE "Build the Sqlite backend." TRUE)
+ option(AKONADI_USE_STRIGI_SEARCH "Build Akonadi with strigi as search engine." FALSE)
+ option(INSTALL_QSQLITE_IN_QT_PREFIX "Install the QSQLite plugin in QT_PLUGIN_DIR" FALSE)
+ option(STATIC_LIBRARY "Build Akonadi as a static library." FALSE)
++OPTION(WITH_QT5 "Build against Qt5." TRUE)
+ 
+ if(NOT DEFINED DATABASE_BACKEND)
+   set(DATABASE_BACKEND "MYSQL" CACHE STRING "The default database backend to use for Akonadi. Can be either MYSQL, POSTGRES or SQLITE")
+@@ -128,7 +129,10 @@ set_default_db_backend(${DATABASE_BACKEND})
+ set(QT_USE_IMPORTED_TARGETS TRUE) # Qt 4 only
+ set(QT_MIN_VERSION 4.6.0)         # Qt 4 only
+ 
+-find_package(Qt5Core QUIET)
++if (WITH_QT5)
++  find_package(Qt5Core QUIET)
++endif()
++
+ if (Qt5Core_FOUND)
+   find_package(Qt5Gui REQUIRED)
+   find_package(Qt5Widgets REQUIRED)

[gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/, app-office/akonadi-server/files/

[Michael Palimaka]

commit:     5233458b4150a75223fb37652569deb7403030e6
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 13:54:50 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 13:54:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5233458b

[app-office/akonadi-server] Match upstream changes for building Qt5 support. Remove unused patch.

Package-Manager: portage-2.1.11.57

---
 .../akonadi-server/akonadi-server-9999.ebuild      |    2 +-
 .../files/akonadi-server-1.9.0-qt5.patch           |   24 --------------------
 2 files changed, 1 insertions(+), 25 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 737c938..4840149 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -102,7 +102,7 @@ src_configure() {
 		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
 		$(cmake-utils_use test AKONADI_BUILD_TESTS)
 		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake-utils_use qt5 QT5_BUILD)
 	)
 
 	cmake-utils_src_configure

diff --git a/app-office/akonadi-server/files/akonadi-server-1.9.0-qt5.patch b/app-office/akonadi-server/files/akonadi-server-1.9.0-qt5.patch
deleted file mode 100644
index 132557a..0000000
--- a/app-office/akonadi-server/files/akonadi-server-1.9.0-qt5.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e0efd25..efcdbe0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,6 +21,7 @@ option(AKONADI_BUILD_QSQLITE "Build the Sqlite backend." TRUE)
- option(AKONADI_USE_STRIGI_SEARCH "Build Akonadi with strigi as search engine." FALSE)
- option(INSTALL_QSQLITE_IN_QT_PREFIX "Install the QSQLite plugin in QT_PLUGIN_DIR" FALSE)
- option(STATIC_LIBRARY "Build Akonadi as a static library." FALSE)
-+OPTION(WITH_QT5 "Build against Qt5." TRUE)
- 
- if(NOT DEFINED DATABASE_BACKEND)
-   set(DATABASE_BACKEND "MYSQL" CACHE STRING "The default database backend to use for Akonadi. Can be either MYSQL, POSTGRES or SQLITE")
-@@ -128,7 +129,10 @@ set_default_db_backend(${DATABASE_BACKEND})
- set(QT_USE_IMPORTED_TARGETS TRUE) # Qt 4 only
- set(QT_MIN_VERSION 4.6.0)         # Qt 4 only
- 
--find_package(Qt5Core QUIET)
-+if (WITH_QT5)
-+  find_package(Qt5Core QUIET)
-+endif()
-+
- if (Qt5Core_FOUND)
-   find_package(Qt5Gui REQUIRED)
-   find_package(Qt5Widgets REQUIRED)

[gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/, app-office/akonadi-server/files/

[Michael Palimaka]

commit:     5e076006093d71958e51fad0a5da87feec405386
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Feb  3 16:18:09 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 16:09:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5e076006

app-office/akonadi-server: Add 1.13.1 snapshot

 .../akonadi-server-1.13.1_pre20160203.ebuild       | 131 +++++++++++++++++++++
 .../akonadi-server-1.13.0-mysql56-crash.patch      |  20 ++++
 app-office/akonadi-server/metadata.xml             |   8 ++
 3 files changed, 159 insertions(+)

diff --git a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203.ebuild b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203.ebuild
new file mode 100644
index 0000000..3a7685a
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-r3
+	EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
+	SRC_URI=""
+	KEYWORDS=""
+else
+	if [[ $PV = *_pre* ]]; then
+		COMMIT_ID="18ed37d89b8185ac15a8bfe245de8a88d17f2c64"
+		SRC_URI="https://quickgit.kde.org/?p=akonadi.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN/-server/}"
+	else
+		SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+		S="${WORKDIR}/${P/-server/}"
+	fi
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+inherit cmake-utils ${scm_eclass}
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="https://pim.kde.org/akonadi"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+mysql postgres sqlite test"
+
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+CDEPEND="
+	dev-libs/boost:=
+	x11-misc/shared-mime-info
+	>=dev-qt/qtcore-4.8.5:4
+	>=dev-qt/qtdbus-4.8.5:4
+	>=dev-qt/qtgui-4.8.5:4
+	>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
+	>=dev-qt/qttest-4.8.5:4
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${CDEPEND}
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql[server] )
+"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-1.13.0-mysql56-crash.patch" )
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \
+			&& die "Sorry, but gcc-4.6 and earlier won't work (see bug #520102)."
+	fi
+}
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, SQLite PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about MySQL is recommend by upstream
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn
+		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
+		ewarn "user configuration. This is the backend recommended by KDE upstream."
+		ewarn "In particular, kde-apps/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
+		-DWITH_SOPRANO=FALSE
+		-DAKONADI_BUILD_TESTS=$(usex test)
+		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
+		-DQT5_BUILD=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	export $(dbus-launch)
+	cmake-utils_src_test
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}

diff --git a/app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch b/app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch
new file mode 100644
index 0000000..2049618
--- /dev/null
+++ b/app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch
@@ -0,0 +1,20 @@
+diff -aruN akonadi-1.13.0.old/server/src/storage/dbconfigmysql.cpp akonadi-1.13.0/server/src/storage/dbconfigmysql.cpp
+--- akonadi-1.13.0.old/server/src/storage/dbconfigmysql.cpp	2014-08-10 06:38:58.000000000 -0400
++++ akonadi-1.13.0/server/src/storage/dbconfigmysql.cpp	2015-01-08 15:08:36.906134212 -0500
+@@ -76,6 +76,7 @@
+       << QLatin1String( "/usr/local/sbin" )
+       << QLatin1String( "/usr/local/libexec" )
+       << QLatin1String( "/usr/libexec" )
++      << QLatin1String( "/usr/share/mysql/scripts" )
+       << QLatin1String( "/opt/mysql/libexec" )
+       << QLatin1String( "/opt/local/lib/mysql5/bin" )
+       << QLatin1String( "/opt/mysql/sbin" );
+@@ -278,7 +279,7 @@
+   // first run, some MySQL versions need a mysql_install_db run for that
+   const QString confFile = XdgBaseDirs::findResourceFile( "config", QLatin1String( "akonadi/mysql-global.conf" ) );
+   if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) {
+-    const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
++    const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ) << QString::fromLatin1( "--basedir=/usr" ) ;
+     QProcess::execute( mMysqlInstallDbPath, arguments );
+   }
+ 

diff --git a/app-office/akonadi-server/metadata.xml b/app-office/akonadi-server/metadata.xml
new file mode 100644
index 0000000..2fdbf33
--- /dev/null
+++ b/app-office/akonadi-server/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>

[gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/, app-office/akonadi-server/files/

[Michael Palimaka]

commit:     c7dbe2c56bcbbcb7478f9407057df292b8e86d15
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Feb 21 17:38:30 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 14:20:36 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c7dbe2c5

app-office/akonadi-server: Fix mysql.conf before it breaks

Backport from git master for mysql versions >=5.7

Package-Manager: portage-2.2.27

 ...=> akonadi-server-1.13.1_pre20160203-r1.ebuild} | 13 +++++---
 .../files/akonadi-server-1.13.1-mysql.conf.patch   | 38 ++++++++++++++++++++++
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203.ebuild b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
similarity index 92%
rename from app-office/akonadi-server/akonadi-server-1.13.1_pre20160203.ebuild
rename to app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
index 3a7685a..e94e994 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
@@ -34,12 +34,12 @@ REQUIRED_USE="|| ( sqlite mysql postgres )"
 
 CDEPEND="
 	dev-libs/boost:=
-	x11-misc/shared-mime-info
 	>=dev-qt/qtcore-4.8.5:4
 	>=dev-qt/qtdbus-4.8.5:4
 	>=dev-qt/qtgui-4.8.5:4
 	>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
 	>=dev-qt/qttest-4.8.5:4
+	x11-misc/shared-mime-info
 	sqlite? ( dev-db/sqlite:3 )
 "
 DEPEND="${CDEPEND}
@@ -54,7 +54,10 @@ RDEPEND="${CDEPEND}
 
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-1.13.0-mysql56-crash.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.13.0-mysql56-crash.patch"
+	"${FILESDIR}/${PN}-1.13.1-mysql.conf.patch"
+)
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
@@ -86,9 +89,9 @@ pkg_setup() {
 	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
 		ewarn
 		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
-		ewarn "user configuration. This is the backend recommended by KDE upstream."
-		ewarn "In particular, kde-apps/kmail-4.10 does not work properly with the sqlite"
-		ewarn "backend anymore."
+		ewarn "user configuration. This is the backend recommended by KDE upstream. PostgreSQL"
+		ewarn "is also known to work very well but requires manual dump and import on major"
+		ewarn "upgrades of the DB."
 		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
 		ewarn "Available drivers are:${AVAILABLE}"
 		ewarn

diff --git a/app-office/akonadi-server/files/akonadi-server-1.13.1-mysql.conf.patch b/app-office/akonadi-server/files/akonadi-server-1.13.1-mysql.conf.patch
new file mode 100644
index 0000000..a090636
--- /dev/null
+++ b/app-office/akonadi-server/files/akonadi-server-1.13.1-mysql.conf.patch
@@ -0,0 +1,38 @@
+From: Daniel Vrátil <dvratil@kde.org>
+Date: Tue, 16 Feb 2016 17:26:22 +0000
+Subject: Drop mysql.conf option removed in MySQL 5.7
+X-Git-Url: http://quickgit.kde.org/?p=akonadi.git&a=commitdiff&h=9a9f7eaa38023f70c6fa85a87359a487ccf7a48c
+---
+Drop mysql.conf option removed in MySQL 5.7
+
+innodb_additional_mem_pool_size option has been deprecated in MySQL 5.6
+and removed in 5.7 so MySQL will no longer start it the option is present
+in mysql.conf.
+
+The option still seems to be supported by MariaDB, but the default value
+we had in the mysql.conf was below the minimum allowed value, so the harm
+in removing the option for MariaDB should be minimal.
+
+If options supported by MySQL and MariaDB begin to diverge more in the future
+we might consider having separate config files for each database.
+
+* 2016-02-21: Adjusted path for 1.13 branch
+---
+
+
+--- a/server/src/storage/mysql-global.conf
++++ b/server/src/storage/mysql-global.conf
+@@ -37,9 +37,9 @@
+ # use InnoDB for transactions and better crash recovery
+ default_storage_engine=innodb
+ 
+-# memory pool InnoDB uses to store data dictionary information and other internal data structures (default:1M)
+-# Deprecated in MySQL >= 5.6.3
+-innodb_additional_mem_pool_size=1M
++# memory pool InnoDB uses to store data dictionary information and other internal data structures (default:8M)
++# Deprecated in MySQL >= 5.6.3, removed in 5.7 (works in MariaDB)
++# innodb_additional_mem_pool_size=8M
+ 
+ # memory buffer InnoDB uses to cache data and indexes of its tables (default:128M)
+ # Larger values means less I/O
+