From f344eb28345f88e195ce65dd35afdb55be71361a Mon Sep 17 00:00:00 2001 From: fluffy Date: Tue, 11 May 2010 14:49:33 +0000 Subject: - Upadte Akonadi to 1.3.1 release With hat on: kde@ --- databases/akonadi/Makefile | 3 +- databases/akonadi/distinfo | 6 +-- databases/akonadi/files/patch-1053201 | 69 ----------------------------------- databases/akonadi/pkg-plist | 11 ++---- 4 files changed, 8 insertions(+), 81 deletions(-) delete mode 100644 databases/akonadi/files/patch-1053201 diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile index 5c5fe212c948..db6602a7797b 100644 --- a/databases/akonadi/Makefile +++ b/databases/akonadi/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= akonadi -PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTVERSION= 1.3.1 CATEGORIES= databases kde ipv6 MASTER_SITES= http://download.akonadi-project.org/ DIST_SUBDIR= KDE diff --git a/databases/akonadi/distinfo b/databases/akonadi/distinfo index d2fd26daa2f4..f2d15aeb29cd 100644 --- a/databases/akonadi/distinfo +++ b/databases/akonadi/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/akonadi-1.2.1.tar.bz2) = f9c1d000844f31c67360078ddf60bec2 -SHA256 (KDE/akonadi-1.2.1.tar.bz2) = ee2bd0802d8202652388dd78959628716968f974b8f254de7055a0d74cba2134 -SIZE (KDE/akonadi-1.2.1.tar.bz2) = 177290 +MD5 (KDE/akonadi-1.3.1.tar.bz2) = e6eef3ed5c28d55f4b6530544e379413 +SHA256 (KDE/akonadi-1.3.1.tar.bz2) = 4b9e99c20d0195ef7e477b399fed21e0533b9863f66a0650bfbddf18b73676dd +SIZE (KDE/akonadi-1.3.1.tar.bz2) = 193500 diff --git a/databases/akonadi/files/patch-1053201 b/databases/akonadi/files/patch-1053201 deleted file mode 100644 index e6b67aded329..000000000000 --- a/databases/akonadi/files/patch-1053201 +++ /dev/null @@ -1,69 +0,0 @@ -Index: server/control/CMakeLists.txt -=================================================================== ---- server/control/CMakeLists.txt (revision 1053200) -+++ server/control/CMakeLists.txt (working copy) -@@ -43,7 +43,7 @@ - target_link_libraries(akonadi_control ${QT_QTMAIN_LIBRARY}) - endif (WIN32) - --target_link_libraries(akonadi_control ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${AKONADI_PROTOCOLINTERNALS_LIBS} ${Boost_PROGRAM_OPTIONS_LIBRARY}) -+target_link_libraries(akonadi_control ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${AKONADI_PROTOCOLINTERNALS_LIBS} ${AKONADI_SYSTEM_LIBS} ${Boost_PROGRAM_OPTIONS_LIBRARY}) - - install(TARGETS akonadi_control DESTINATION ${BIN_INSTALL_DIR}) - -Index: server/akonadictl/CMakeLists.txt -=================================================================== ---- server/akonadictl/CMakeLists.txt (revision 1053200) -+++ server/akonadictl/CMakeLists.txt (working copy) -@@ -16,6 +16,6 @@ - automoc4_add_executable(akonadictl ${akonadictl_SRCS}) - set_target_properties(akonadictl PROPERTIES OUTPUT_NAME akonadictl) - --target_link_libraries(akonadictl ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${AKONADI_PROTOCOLINTERNALS_LIBS} ${Boost_PROGRAM_OPTIONS_LIBRARY}) -+target_link_libraries(akonadictl ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${AKONADI_PROTOCOLINTERNALS_LIBS} ${AKONADI_SYSTEM_LIBS} ${Boost_PROGRAM_OPTIONS_LIBRARY}) - - install(TARGETS akonadictl DESTINATION ${BIN_INSTALL_DIR}) -Index: server/CMakeLists.txt -=================================================================== ---- server/CMakeLists.txt (revision 1053200) -+++ server/CMakeLists.txt (working copy) -@@ -169,6 +169,7 @@ - ${QT_QTDBUS_LIBRARY} - ${QT_QTXML_LIBRARY} - ${AKONADI_PROTOCOLINTERNALS_LIBS} -+ ${AKONADI_SYSTEM_LIBS} - ${Boost_PROGRAM_OPTIONS_LIBRARY} - ${SOPRANO_LIBRARIES} - ) -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt (revision 1053200) -+++ CMakeLists.txt (working copy) -@@ -24,6 +24,7 @@ - - include(MacroLogFeature) - include(InstallSettings) -+include(CheckFunctionExists) - include(CheckIncludeFiles) - include(MacroWriteBasicCMakeVersionFile) - -@@ -132,7 +133,19 @@ - - ############### Configure checks ############### - -+set (AKONADI_SYSTEM_LIBS) -+ - check_include_files(execinfo.h HAVE_EXECINFO_H) -+if (HAVE_EXECINFO_H) -+ check_function_exists(backtrace BACKTRACE_IN_LIBC) -+ if (NOT BACKTRACE_IN_LIBC) -+ find_library (EXECINFO_LIBRARY NAMES execinfo) -+ if (EXECINFO_LIBRARY) -+ set (AKONADI_SYSTEM_LIBS ${AKONADI_SYSTEM_LIBS} ${EXECINFO_LIBRARY}) -+ endif (EXECINFO_LIBRARY) -+ endif (NOT BACKTRACE_IN_LIBC) -+endif (HAVE_EXECINFO_H) -+ - check_include_files(unistd.h HAVE_UNISTD_H) - - # set the output paths diff --git a/databases/akonadi/pkg-plist b/databases/akonadi/pkg-plist index 88a7e08069cf..20bb9a8c1ed7 100644 --- a/databases/akonadi/pkg-plist +++ b/databases/akonadi/pkg-plist @@ -2,6 +2,7 @@ bin/akonadi_control bin/akonadictl bin/akonadiserver include/akonadi/private/akonadiprotocolinternals_export.h +include/akonadi/private/capabilities_p.h include/akonadi/private/imapparser_p.h include/akonadi/private/imapset_p.h include/akonadi/private/notificationmessage_p.h @@ -11,10 +12,10 @@ lib/cmake/Akonadi/AkonadiConfig.cmake lib/cmake/Akonadi/AkonadiConfigVersion.cmake lib/libakonadiprivate.so lib/libakonadiprivate.so.1 -lib/libakonadiprivate.so.1.2.1 +lib/libakonadiprivate.so.1.3.1 lib/libakonadiprotocolinternals.so lib/libakonadiprotocolinternals.so.1 -lib/libakonadiprotocolinternals.so.1.2.1 +lib/libakonadiprotocolinternals.so.1.3.1 libdata/pkgconfig/akonadi.pc share/config/akonadi/mysql-global.conf share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml @@ -23,18 +24,14 @@ share/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.xml share/dbus-1/interfaces/org.freedesktop.Akonadi.ControlManager.xml share/dbus-1/interfaces/org.freedesktop.Akonadi.DebugInterface.xml share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationManager.xml +share/dbus-1/interfaces/org.freedesktop.Akonadi.Preprocessor.xml share/dbus-1/interfaces/org.freedesktop.Akonadi.Resource.xml -share/dbus-1/interfaces/org.freedesktop.Akonadi.Search.xml -share/dbus-1/interfaces/org.freedesktop.Akonadi.SearchQuery.xml -share/dbus-1/interfaces/org.freedesktop.Akonadi.SearchQueryIterator.xml share/dbus-1/interfaces/org.freedesktop.Akonadi.Server.xml share/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml share/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml share/dbus-1/services/org.freedesktop.Akonadi.Control.service share/mime/packages/akonadi-mime.xml @dirrm share/config/akonadi -@dirrmtry share/apps/cmake/modules -@dirrmtry share/apps/cmake @dirrm lib/cmake/Akonadi @dirrm lib/cmake @dirrmtry include/akonadi/private -- cgit