diff options
Diffstat (limited to 'source/l/akonadi')
-rw-r--r-- | source/l/akonadi/akonadi-mariadb-10.2.patch | 65 | ||||
-rwxr-xr-x | source/l/akonadi/akonadi.SlackBuild | 130 | ||||
-rw-r--r-- | source/l/akonadi/doinst.sh | 5 | ||||
-rw-r--r-- | source/l/akonadi/mysql-global.conf.patch | 21 | ||||
-rw-r--r-- | source/l/akonadi/slack-desc | 19 |
5 files changed, 0 insertions, 240 deletions
diff --git a/source/l/akonadi/akonadi-mariadb-10.2.patch b/source/l/akonadi/akonadi-mariadb-10.2.patch deleted file mode 100644 index 99b096fb..00000000 --- a/source/l/akonadi/akonadi-mariadb-10.2.patch +++ /dev/null @@ -1,65 +0,0 @@ -commit 22c53fa2aa97c7f0b5d7a1947821c5b3aef9de0f -Author: Heinz Wiesinger <pprkut@liwjatan.at> -Date: Sun Sep 17 15:55:48 2017 +0200 - - Only remove init connections to the database on server shutdown. - - With MariaDB 10.2 libmysqlclient was replaced with libmariadb that - changed how establishing database connections behaves. The MySQL - QSQL driver calls mysql_server_end() on QSqlDatabase::removeDatabase() - if the overall connection count dropped to 0 (which it does when - the init connection is removed). - A future QSqlDatabase:addDatabase() would call mysql_server_init() - again, but this no longer works with libmariadb as that one only - allows calling mysql_server_init() once. Future calls are simply - ignored. - - In order to prevent this from happening we have to keep the - init connection open until the server shuts down, so the connection - count only drops to 0 at shutdown and mysql_server_end() isn't - called before. - - This is a workaround for QTBUG-63108 - -diff --git a/server/src/akonadi.cpp b/server/src/akonadi.cpp -index 5369320c8..6d31f6ff4 100644 ---- a/server/src/akonadi.cpp -+++ b/server/src/akonadi.cpp -@@ -370,12 +370,13 @@ void AkonadiServer::createDatabase() - db.close(); - } - } -- QSqlDatabase::removeDatabase( initCon ); - } - - void AkonadiServer::stopDatabaseProcess() - { - if ( !DbConfig::configuredDatabase()->useInternalServer() ) { -+ // closing initConnection this late to work around QTBUG-63108 -+ QSqlDatabase::removeDatabase(QLatin1String("initConnection")); - return; - } - -diff --git a/server/src/storage/dbconfigmysql.cpp b/server/src/storage/dbconfigmysql.cpp -index 10f99db70..36f1f3a42 100644 ---- a/server/src/storage/dbconfigmysql.cpp -+++ b/server/src/storage/dbconfigmysql.cpp -@@ -395,8 +395,6 @@ void DbConfigMysql::startInternalServer() - db.close(); - } - } -- -- QSqlDatabase::removeDatabase( initCon ); - } - - void DbConfigMysql::stopInternalServer() -@@ -405,6 +403,9 @@ void DbConfigMysql::stopInternalServer() - return; - } - -+ // closing initConnection this late to work around QTBUG-63108 -+ QSqlDatabase::removeDatabase(QLatin1String("initConnection")); -+ - // first, try the nicest approach - if ( !mCleanServerShutdownCommand.isEmpty() ) { - QProcess::execute( mCleanServerShutdownCommand ); diff --git a/source/l/akonadi/akonadi.SlackBuild b/source/l/akonadi/akonadi.SlackBuild deleted file mode 100755 index da12a463..00000000 --- a/source/l/akonadi/akonadi.SlackBuild +++ /dev/null @@ -1,130 +0,0 @@ -#!/bin/sh - -# Slackware build script for akonadi - -# Copyright 2008 Robby Workman, Northport, Alabama, USA -# Copyright 2008, 2009, 2010, 2011, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=akonadi -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-16} - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -# Automatically determine the architecture we're building on: -MARCH=$( uname -m ) -if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - -# Update mysql configuration -zcat $CWD/mysql-global.conf.patch.gz | patch -p1 --verbose || exit 1 - -# Work around problems with MariaDB 10.2 -zcat $CWD/akonadi-mariadb-10.2.patch.gz | patch -p1 --verbose || exit 1 - -# If we do not specify the correct QT_PLUGINS_DIR, then the application -# decides on using $QT4DIR/qt4/plugins instead. -mkdir -p build -cd build - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DMAN_INSTALL_DIR=/usr/man \ - -DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=ON \ - -DQT_PLUGINS_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins \ - .. - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 -cd - - -if [ -d $PKG/usr/man ]; then - gzip -9 $PKG/usr/man/man?/* -fi - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS INSTALL README lgpl-license \ - $PKG/usr/doc/$PKGNAM-$VERSION - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/l/akonadi/doinst.sh b/source/l/akonadi/doinst.sh deleted file mode 100644 index aab1b9e3..00000000 --- a/source/l/akonadi/doinst.sh +++ /dev/null @@ -1,5 +0,0 @@ - -if [ -x /usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database ./usr/share/mime >/dev/null 2>&1 -fi - diff --git a/source/l/akonadi/mysql-global.conf.patch b/source/l/akonadi/mysql-global.conf.patch deleted file mode 100644 index 24bf6ea0..00000000 --- a/source/l/akonadi/mysql-global.conf.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -r -u akonadi-1.13.0.orig/server/src/storage/mysql-global.conf akonadi-1.13.0/server/src/storage/mysql-global.conf ---- akonadi-1.13.0.orig/server/src/storage/mysql-global.conf 2014-08-10 12:38:58.000000000 +0200 -+++ akonadi-1.13.0/server/src/storage/mysql-global.conf 2017-08-31 19:43:35.000000000 +0200 -@@ -37,13 +37,13 @@ - # 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 --innodb_buffer_pool_size=80M -+innodb_buffer_pool_size=128M - - # Create a .ibd file for each table (default:0) - innodb_file_per_table=1 diff --git a/source/l/akonadi/slack-desc b/source/l/akonadi/slack-desc deleted file mode 100644 index e046a887..00000000 --- a/source/l/akonadi/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-----------------------------------------------------| -akonadi: akonadi (PIM storage service) -akonadi: -akonadi: akonadi is an extensible cross-desktop storage service for PIM data -akonadi: and meta data providing concurrent read, write, and query access. -akonadi: It will provide a unique desktop wide object identification and -akonadi: retrieval. -akonadi: -akonadi: Homepage: http://www.kdepim.org/akonadi/ -akonadi: -akonadi: -akonadi: |