From b01ad35c28ad635ba8709781510427006e9dcc6c Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 2 Sep 2015 09:41:04 +0200 Subject: Updated deps for KDE-5_15.09 Added: ConsoleKit2 LoginKit lmdb Removed (use the Slackware version): PyQt libepoxy sip Removed (no longer used); akonadi-qt5 grantlee-qt5 --- .../akonadi-qt5-coinstallable-libs.patch | 113 ------------------- deps/akonadi-qt5/akonadi-qt5.SlackBuild | 123 --------------------- deps/akonadi-qt5/doinst.sh | 5 - deps/akonadi-qt5/slack-desc | 19 ---- 4 files changed, 260 deletions(-) delete mode 100644 deps/akonadi-qt5/akonadi-qt5-coinstallable-libs.patch delete mode 100755 deps/akonadi-qt5/akonadi-qt5.SlackBuild delete mode 100644 deps/akonadi-qt5/doinst.sh delete mode 100644 deps/akonadi-qt5/slack-desc (limited to 'deps/akonadi-qt5') diff --git a/deps/akonadi-qt5/akonadi-qt5-coinstallable-libs.patch b/deps/akonadi-qt5/akonadi-qt5-coinstallable-libs.patch deleted file mode 100644 index 3f6ddea..0000000 --- a/deps/akonadi-qt5/akonadi-qt5-coinstallable-libs.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff -uar akonadi-1.12.91.orig/AkonadiConfig.cmake.in akonadi-1.12.91/AkonadiConfig.cmake.in ---- akonadi-1.12.91.orig/AkonadiConfig.cmake.in 2014-07-09 22:14:29.000000000 +0200 -+++ akonadi-1.12.91/AkonadiConfig.cmake.in 2014-07-29 09:18:23.555430363 +0200 -@@ -32,7 +32,7 @@ - set(AKONADI_TARGET_PREFIX @AKONADI_TARGET_PREFIX@) - - # Load the exported targets. --if(NOT TARGET Akonadi__akonadiprotocolinternals) -+if(NOT TARGET Akonadi__akonadiprotocolinternalsqt5) - get_filename_component(_currentDir "${CMAKE_CURRENT_LIST_FILE}" PATH) - include("${_currentDir}/AkonadiTargetsWithPrefix.cmake") - endif() -@@ -41,4 +41,4 @@ - set(AKONADI_${_prefix}_LIBRARIES ${AKONADI_TARGET_PREFIX}${_lib}) - endmacro() - --_akonadi_set_lib_vars(COMMON akonadiprotocolinternals) -+_akonadi_set_lib_vars(COMMON akonadiprotocolinternalsqt5) -diff -uar akonadi-1.12.91.orig/CMakeLists.txt akonadi-1.12.91/CMakeLists.txt ---- akonadi-1.12.91.orig/CMakeLists.txt 2014-07-09 22:14:29.000000000 +0200 -+++ akonadi-1.12.91/CMakeLists.txt 2014-07-29 09:18:23.588430155 +0200 -@@ -332,7 +332,7 @@ - - add_subdirectory(interfaces) - add_subdirectory(libs) --set(AKONADI_PROTOCOLINTERNALS_LIBS ${akonadiprotocolinternals_LIB_DEPENDS} akonadiprotocolinternals) -+set(AKONADI_PROTOCOLINTERNALS_LIBS ${akonadiprotocolinternals_LIB_DEPENDS} akonadiprotocolinternalsqt5) - - add_subdirectory(shared) - add_subdirectory(agentserver) -Only in akonadi-1.12.91: CMakeLists.txt.orig -diff -uar akonadi-1.12.91.orig/akonadi.pc.cmake akonadi-1.12.91/akonadi.pc.cmake ---- akonadi-1.12.91.orig/akonadi.pc.cmake 2014-07-09 22:14:29.000000000 +0200 -+++ akonadi-1.12.91/akonadi.pc.cmake 2014-07-29 09:18:23.645430154 +0200 -@@ -7,5 +7,5 @@ - Description: Akonadi server and infrastructure needed to build client libraries and applications - Version: @AKONADI_VERSION@ - Requires: QtCore QtSql QtDBus --Libs: -L${libdir} -lakonadiprotocolinternals -+Libs: -L${libdir} -lakonadiprotocolinternalsqt5 - Cflags: -I${includedir} -diff -uar akonadi-1.12.91.orig/asapcat/CMakeLists.txt akonadi-1.12.91/asapcat/CMakeLists.txt ---- akonadi-1.12.91.orig/asapcat/CMakeLists.txt 2014-07-09 22:14:29.000000000 +0200 -+++ akonadi-1.12.91/asapcat/CMakeLists.txt 2014-07-29 09:18:23.672430153 +0200 -@@ -1,7 +1,7 @@ - project(asapcat) - - #set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_ENABLE_EXCEPTIONS}" ) --set(AKONADI_PROTOCOLINTERNALS_LIBS ${akonadiprotocolinternals_LIB_DEPENDS} akonadiprotocolinternals) -+set(AKONADI_PROTOCOLINTERNALS_LIBS ${akonadiprotocolinternals_LIB_DEPENDS} akonadiprotocolinternalsqt5) - - set(asapcat_srcs - main.cpp -diff -uar akonadi-1.12.91.orig/libs/CMakeLists.txt akonadi-1.12.91/libs/CMakeLists.txt ---- akonadi-1.12.91.orig/libs/CMakeLists.txt 2014-07-09 22:14:29.000000000 +0200 -+++ akonadi-1.12.91/libs/CMakeLists.txt 2014-07-29 09:20:29.132426304 +0200 -@@ -12,16 +12,16 @@ - xdgbasedirs.cpp - ) - --add_library(akonadiprotocolinternals ${LIBRARY_TYPE} ${akonadiprotocolinternals_srcs}) -+add_library(akonadiprotocolinternalsqt5 ${LIBRARY_TYPE} ${akonadiprotocolinternals_srcs}) - --target_link_libraries(akonadiprotocolinternals ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY}) --set_target_properties(akonadiprotocolinternals PROPERTIES -+target_link_libraries(akonadiprotocolinternalsqt5 ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY}) -+set_target_properties(akonadiprotocolinternalsqt5 PROPERTIES - VERSION ${AKONADI_VERSION} - SOVERSION ${AKONADI_SOVERSION} - DEFINE_SYMBOL MAKE_AKONADIPROTOCOLINTERNALS_LIB - ) - --install(TARGETS akonadiprotocolinternals EXPORT akonadiLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) -+install(TARGETS akonadiprotocolinternalsqt5 EXPORT akonadiLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) - - install(FILES - ${Akonadi_BINARY_DIR}/akonadiprotocolinternals_export.h -diff -uar akonadi-1.12.91.orig/libs/tests/CMakeLists.txt akonadi-1.12.91/libs/tests/CMakeLists.txt ---- akonadi-1.12.91.orig/libs/tests/CMakeLists.txt 2014-07-09 22:14:29.000000000 +0200 -+++ akonadi-1.12.91/libs/tests/CMakeLists.txt 2014-07-29 09:18:23.729430152 +0200 -@@ -6,7 +6,7 @@ - get_filename_component(_name ${_source} NAME_WE) - add_executable(${_name} ${_source}) - add_test(akonadi-${_name} ${_name}) -- target_link_libraries(${_name} akonadiprotocolinternals ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARIES}) -+ target_link_libraries(${_name} akonadiprotocolinternalsqt5 ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARIES}) - endmacro() - - add_unit_test(notificationmessagetest.cpp) -diff -uar akonadi-1.12.91.orig/rds/CMakeLists.txt akonadi-1.12.91/rds/CMakeLists.txt ---- akonadi-1.12.91.orig/rds/CMakeLists.txt 2014-07-09 22:14:29.000000000 +0200 -+++ akonadi-1.12.91/rds/CMakeLists.txt 2014-07-29 09:18:23.758430151 +0200 -@@ -1,7 +1,7 @@ - project(akonadi_rds) - - #set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_ENABLE_EXCEPTIONS}" ) --set(AKONADI_PROTOCOLINTERNALS_LIBS ${akonadiprotocolinternals_LIB_DEPENDS} akonadiprotocolinternals) -+set(AKONADI_PROTOCOLINTERNALS_LIBS ${akonadiprotocolinternals_LIB_DEPENDS} akonadiprotocolinternalsqt5) - - ########### next target ############### - -diff -uar akonadi-1.12.91.orig/server/akonadictl/CMakeLists.txt akonadi-1.12.91/server/akonadictl/CMakeLists.txt ---- akonadi-1.12.91.orig/server/akonadictl/CMakeLists.txt 2014-07-09 22:14:29.000000000 +0200 -+++ akonadi-1.12.91/server/akonadictl/CMakeLists.txt 2014-07-29 09:18:23.788430150 +0200 -@@ -16,7 +16,7 @@ - set_target_properties(akonadictl PROPERTIES OUTPUT_NAME akonadictl) - target_link_libraries(akonadictl - akonadi_shared -- akonadiprotocolinternals -+ akonadiprotocolinternalsqt5 - ${QT_QTCORE_LIBRARY} - ${QT_QTDBUS_LIBRARY} - ${AKONADI_PROTOCOLINTERNALS_LIBS} diff --git a/deps/akonadi-qt5/akonadi-qt5.SlackBuild b/deps/akonadi-qt5/akonadi-qt5.SlackBuild deleted file mode 100755 index d9bccbf..0000000 --- a/deps/akonadi-qt5/akonadi-qt5.SlackBuild +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/sh - -# Slackware build script for akonadi - -# Copyright 2008 Robby Workman, Northport, Alabama, USA -# Copyright 2008, 2009, 2010, 2011, 2014, 2015 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. - - -PKGNAM=akonadi-qt5 -SRCNAM=akonadi -VERSION=${VERSION:-1.13.0} -BUILD=${BUILD:-3} - -NUMJOBS=${NUMJOBS:--j7} - -# Automatically determine the architecture we're building on: -MARCH=$( uname -m ) -if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - 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 [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -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 - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 -cd $SRCNAM-$VERSION || exit 1 - -# Allow akonadi-qt5 libraries to co-exist with akonadi: -cat $CWD/akonadi-qt5-coinstallable-libs.patch | patch -p1 --verbose || 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 {} \; - -# 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=man \ - -DQT_PLUGINS_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ - -DQT5_BUILD=ON \ - -DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=ON \ - -DWITH_SOPRANO=OFF \ - -DAKONADI_BUILD_TESTS=OFF \ - .. - 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 -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/akonadi-qt5/doinst.sh b/deps/akonadi-qt5/doinst.sh deleted file mode 100644 index aab1b9e..0000000 --- a/deps/akonadi-qt5/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/deps/akonadi-qt5/slack-desc b/deps/akonadi-qt5/slack-desc deleted file mode 100644 index ade9732..0000000 --- a/deps/akonadi-qt5/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-qt5: akonadi-qt5 (PIM storage service) -akonadi-qt5: -akonadi-qt5: akonadi is an extensible cross-desktop storage service for PIM data -akonadi-qt5: and meta data providing concurrent read, write, and query access. -akonadi-qt5: It will provide a unique desktop wide object identification and -akonadi-qt5: retrieval. -akonadi-qt5: This package contains Qt5 bindings. -akonadi-qt5: -akonadi-qt5: Homepage: http://www.kdepim.org/akonadi/ -akonadi-qt5: -akonadi-qt5: -- cgit v1.2.3