summaryrefslogtreecommitdiffstats
path: root/deps/akonadi-qt5
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-01-09 00:06:49 +0100
committer Eric Hameleers <alien@slackware.com>2015-01-09 00:06:49 +0100
commitda1be5a21ba06235b67a999f696ec66e35dc17a1 (patch)
tree6df637d821a6ac0ad65f8caaf967ea2a6956a862 /deps/akonadi-qt5
parentb1b35d20ce6b70330b23a9d056dcb44b58795bd6 (diff)
downloadktown-da1be5a21ba06235b67a999f696ec66e35dc17a1.tar.gz
ktown-da1be5a21ba06235b67a999f696ec66e35dc17a1.tar.xz
Prepare for new KDE 5: Frameworks 5.6.0, Plasma 5.1.2, Applications 14.12.0.
KDE 5_1501 ========== This is going to be KDE 5 for Slackware-current, composed of Frameworks 5.6.0, Plasma 5.1.2 and Applications 14.12.0. Note that there is still a lot of KDE 4 stuff in here, which is necessary to support all the Applications that have not yet been ported to KDE Frameworks 5. The Applications 15.04 (march 2015) release should offer a lot more KF5 ports. Preliminary build procedure (not verified 100% yet): ---------------------------------------------------- - (crude) get rid of Slackware's KDE: removepkg /var/log/packages/*-4.10.5-* - build all the deps using "updates.SlackBuild" script in the "deps/" directory - note that extra-cmake-modules is required here as well as when building the frameworks, so I just copied it from frameworks to deps. - logoff/login to activate Qt5 profile script. - removepkg akonadi-qt5 or else kdepimlibs-4.14.3 picks up Qt5 dependencies and its compilation will fail as a result - build all the KDE 4 stuff in the "kde/" directory, using "./KDE.SlackBuild kde libs kdebase:nepomuk-core kdepimlibs kdebase kdebindings kdebase:kde-workspace k depim extragear" - installpkg akonadi-qt5 - build the remaining KDE 5 stuff in the "kde/" directory, using "./KDE.SlackBui ld frameworks plasma plasma-extra polkit-kde applications" - build kdei ============================================================================== Eric Hameleers / alien at slackware dot com / 09-jan-2015
Diffstat (limited to 'deps/akonadi-qt5')
-rw-r--r--deps/akonadi-qt5/akonadi-qt5-coinstallable-libs.patch113
-rw-r--r--deps/akonadi-qt5/akonadi-qt5-coinstallable-libs.patch.gzbin1469 -> 0 bytes
-rwxr-xr-xdeps/akonadi-qt5/akonadi-qt5.SlackBuild8
3 files changed, 117 insertions, 4 deletions
diff --git a/deps/akonadi-qt5/akonadi-qt5-coinstallable-libs.patch b/deps/akonadi-qt5/akonadi-qt5-coinstallable-libs.patch
new file mode 100644
index 0000000..3f6ddea
--- /dev/null
+++ b/deps/akonadi-qt5/akonadi-qt5-coinstallable-libs.patch
@@ -0,0 +1,113 @@
+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-coinstallable-libs.patch.gz b/deps/akonadi-qt5/akonadi-qt5-coinstallable-libs.patch.gz
deleted file mode 100644
index 3fe4565..0000000
--- a/deps/akonadi-qt5/akonadi-qt5-coinstallable-libs.patch.gz
+++ /dev/null
Binary files differ
diff --git a/deps/akonadi-qt5/akonadi-qt5.SlackBuild b/deps/akonadi-qt5/akonadi-qt5.SlackBuild
index d3233ba..0d6852a 100755
--- a/deps/akonadi-qt5/akonadi-qt5.SlackBuild
+++ b/deps/akonadi-qt5/akonadi-qt5.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for akonadi
# Copyright 2008 Robby Workman, Northport, Alabama, USA
-# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, 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
@@ -26,8 +26,8 @@
PKGNAM=akonadi-qt5
SRCNAM=akonadi
-VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.13.0}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
@@ -72,7 +72,7 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
cd $SRCNAM-$VERSION || exit 1
# Allow akonadi-qt5 libraries to co-exist with akonadi:
-zcat $CWD/akonadi-qt5-coinstallable-libs.patch.gz | patch -p1 --verbose || exit 1
+cat $CWD/akonadi-qt5-coinstallable-libs.patch | patch -p1 --verbose || exit 1
chown -R root:root .
find . \