mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

- Update to 1.2.1

Browse Source
This commit is contained in:
Martin Wilke 2009-11-27 00:46:33 +00:00
parent 0891a793aa
commit 253e47f5dc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=244812
2 changed files with 73 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/akonadi/Makefile
View File

@ -19,6 +19,10 @@ BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \
${LOCALBASE}/bin/mysqld_safe:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
RUN_DEPENDS= ${QT_PREFIX}/lib/qt4/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin
# Let process generate meaningful backtrace on core dump
LIB_DEPENDS+= execinfo.1:${PORTSDIR}/devel/libexecinfo
CMAKE_ARGS+= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
USE_BZIP2= yes
USE_QT_VER= 4
QT_COMPONENTS= corelib network qtestlib dbus sql \

69
databases/akonadi/files/patch-1053201 Normal file
View File

@ -0,0 +1,69 @@
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