rpms/kdepimlibs/F-9 kdepimlibs-4.1.2-system-libical.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 kdepimlibs.spec, 1.43, 1.44 sources, 1.22, 1.23
Kevin Kofler
kkofler at fedoraproject.org
Thu Jan 8 10:08:03 UTC 2009
- Previous message (by thread): rpms/kdepimlibs/F-10 .cvsignore, 1.27, 1.28 kdepimlibs.spec, 1.55, 1.56 sources, 1.28, 1.29
- Next message (by thread): rpms/kdepimlibs/F-10 kdepimlibs-4.1.4-system-libical.patch, NONE, 1.1 kdepimlibs.spec, 1.56, 1.57 kdepimlibs-4.1.2-system-libical.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/kdepimlibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8041/F-9
Modified Files:
.cvsignore kdepimlibs.spec sources
Added Files:
kdepimlibs-4.1.2-system-libical.patch
Log Message:
* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
- update to 4.1.4
- reenable system libical, #469228 reportedly fixed upstream now
- also use the system libical on F9
kdepimlibs-4.1.2-system-libical.patch:
--- NEW FILE kdepimlibs-4.1.2-system-libical.patch ---
diff -Nur kdepimlibs-4.1.2/cmake/modules/FindLibical.cmake kdepimlibs-4.1.2-system-libical/cmake/modules/FindLibical.cmake
--- kdepimlibs-4.1.2/cmake/modules/FindLibical.cmake 2008-05-21 13:05:50.000000000 +0200
+++ kdepimlibs-4.1.2-system-libical/cmake/modules/FindLibical.cmake 2008-10-27 08:51:37.000000000 +0100
@@ -1,29 +1,89 @@
# Find Libical
#
-# LIBICAL_FOUND - system has Libical
-# LIBICAL_INCLUDE_DIRS - the Libical include directory
+# LIBICAL_FOUND - system has Libical with the minimum version needed
+# LIBICAL_INCLUDE_DIRS - the Libical include directories
# LIBICAL_LIBRARIES - The libraries needed to use Libical
+# LIBICAL_VERSION = The value of ICAL_VERSION defined in ical.h
# Copyright (c) 2008, Allen Winter <winter at kde.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-SET (LIBICAL_FIND_REQUIRED ${Libical_FIND_REQUIRED})
-if (LIBICAL_INCLUDE_DIR AND LIBICAL_LIBRARIES)
+if(NOT LIBICAL_MIN_VERSION)
+ set(LIBICAL_MIN_VERSION "0.33")
+endif(NOT LIBICAL_MIN_VERSION)
+
+if (WIN32)
+ file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR)
+ string(REPLACE "\\" "/" _program_FILES_DIR "${_program_FILES_DIR}")
+endif(WIN32)
+
+set(LIBICAL_FIND_REQUIRED ${Libical_FIND_REQUIRED})
+if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
# Already in cache, be silent
set(LIBICAL_FIND_QUIETLY TRUE)
-else (LIBICAL_INCLUDE_DIR AND LIBICAL_LIBRARIES)
+endif(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
+
+#set the root from the LIBICAL_BASE environment
+string(REPLACE "\\" "/" libical_root "$ENV{LIBICAL_BASE}")
+#override the root from LIBICAL_BASE defined to cmake
+if(DEFINED LIBICAL_BASE)
+ string(REPLACE "\\" "/" libical_root ${LIBICAL_BASE})
+endif(DEFINED LIBICAL_BASE)
+
+find_path(LIBICAL_INCLUDE_DIRS NAMES ical.h
+ PATH_SUFFIXES libical
+ PATHS ${libical_root}/include ${_program_FILES_DIR}/libical/include /usr/local/include /usr/include
+ NO_CMAKE_SYSTEM_PATH
+)
+
+find_library(LIBICAL_LIBRARY NAMES ical libical
+ PATHS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib /usr/local/lib /usr/lib
+ NO_CMAKE_SYSTEM_PATH
+)
+find_library(LIBICALSS_LIBRARY NAMES icalss libicalss
+ PATHS ${libical_root}/lib ${_program_FILES_DIR}/libical/lib /usr/local/lib /usr/lib
+ NO_CMAKE_SYSTEM_PATH
+)
+set(LIBICAL_LIBRARIES ${LIBICAL_LIBRARY} ${LIBICALSS_LIBRARY})
+
+if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
+ set(FIND_LIBICAL_VERSION_SOURCE
+ "#include <ical.h>\n int main()\n {\n printf(\"%s\",ICAL_VERSION);return 1;\n }\n")
+ set(FIND_LIBICAL_VERSION_SOURCE_FILE ${CMAKE_BINARY_DIR}/CMakeTmp/FindLIBICAL.cxx)
+ file(WRITE "${FIND_LIBICAL_VERSION_SOURCE_FILE}" "${FIND_LIBICAL_VERSION_SOURCE}")
+
+ set(FIND_LIBICAL_VERSION_ADD_INCLUDES
+ "-DINCLUDE_DIRECTORIES:STRING=${LIBICAL_INCLUDE_DIRS}")
+
+ try_run(RUN_RESULT COMPILE_RESULT
+ ${CMAKE_BINARY_DIR}
+ ${FIND_LIBICAL_VERSION_SOURCE_FILE}
+ CMAKE_FLAGS "${FIND_LIBICAL_VERSION_ADD_INCLUDES}"
+ RUN_OUTPUT_VARIABLE LIBICAL_VERSION)
+
+ if(COMPILE_RESULT AND RUN_RESULT EQUAL 1)
+ message(STATUS "Found Libical version ${LIBICAL_VERSION}")
+ macro_ensure_version(${LIBICAL_MIN_VERSION} ${LIBICAL_VERSION} LIBICAL_VERSION_OK)
+ if(NOT LIBICAL_VERSION_OK)
+ message(STATUS "Libcal version ${LIBICAL_VERSION} is too old. At least version ${LIBICAL_MIN_VERSION} is needed.")
+ set(LIBICAL_INCLUDE_DIRS "")
+ set(LIBICAL_LIBRARIES "")
+ endif(NOT LIBICAL_VERSION_OK)
+ else(COMPILE_RESULT AND RUN_RESULT EQ 1)
+ #Enable this line the 13 october
+ #message(FATAL_ERROR "Unable to compile or run the libical version detection program.")
+ #Delete this line the 13 october
+ message(STATUS "Unable to compile or run the libical version detection program.")
+ endif(COMPILE_RESULT AND RUN_RESULT EQUAL 1)
- find_path(LIBICAL_INCLUDE_DIR ical.h)
- find_library(LIBICAL_LIBRARIES NAMES ical )
+endif(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
- include(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICAL DEFAULT_MSG
- LIBICAL_LIBRARIES LIBICAL_INCLUDE_DIR)
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICAL DEFAULT_MSG LIBICAL_LIBRARIES LIBICAL_INCLUDE_DIRS)
- mark_as_advanced(LIBICAL_INCLUDE_DIR LIBICAL_LIBRARIES)
+mark_as_advanced(LIBICAL_INCLUDE_DIRS LIBICAL_LIBRARIES)
-endif (LIBICAL_INCLUDE_DIR AND LIBICAL_LIBRARIES)
diff -Nur kdepimlibs-4.1.2/kcal/CMakeLists.txt kdepimlibs-4.1.2-system-libical/kcal/CMakeLists.txt
--- kdepimlibs-4.1.2/kcal/CMakeLists.txt 2008-07-03 07:05:12.000000000 +0200
+++ kdepimlibs-4.1.2-system-libical/kcal/CMakeLists.txt 2008-10-27 08:56:38.000000000 +0100
@@ -1,209 +1,32 @@
project(kcal)
-# was used by libical, but not anymore
-#if (UNIX)
-# add_definitions(-DICAL_UNIX_NEWLINE=1)
-#endif (UNIX)
-
-add_definitions(-DPACKAGE_DATA_DIR=\\""${DATA_INSTALL_DIR}/libical"\\" ) # added manually
+find_package(Libical REQUIRED)
add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5800)
include (ConfigureChecks.cmake)
-configure_file (libical/config-libical.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/libical/config-libical.h)
if(KDE4_BUILD_TESTS)
add_definitions(-DCOMPILING_TESTS)
endif(KDE4_BUILD_TESTS)
include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/libical/src/libicalss/
- ${CMAKE_CURRENT_BINARY_DIR}/libical/src/libicalss/
+ ${LIBICAL_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/versit/
- ${CMAKE_CURRENT_SOURCE_DIR}/libical/src/libical/
- ${CMAKE_CURRENT_BINARY_DIR}/libical/src/libical/
- ${CMAKE_CURRENT_BINARY_DIR}/libical # for config.h
- ${CMAKE_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kabc
${CMAKE_BINARY_DIR}/kabc
${KDE4_INCLUDE_DIR}
)
-set(ICALSCRIPTS ${CMAKE_SOURCE_DIR}/kcal/libical/scripts/ )
-
-set(PROPERTYDEPS
- ${ICALSCRIPTS}/mkderivedproperties.pl
- ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/properties.csv
- ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.h.in
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.c.in
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h
- COMMAND ${PERL_EXECUTABLE} -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedproperties.pl -i
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.h.in
- -h ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/properties.csv
- ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h
- DEPENDS ${PROPERTYDEPS} )
-
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c
- COMMAND ${PERL_EXECUTABLE} -I${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedproperties.pl -i
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.c.in
- -c ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/properties.csv
- ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c
- DEPENDS ${PROPERTYDEPS} ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h )
-
-
-# files generated via add_custom_command are added automatically to the clean files, Alex
-#macro_additional_clean_files(
-# ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c
-# ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h
-#)
-
-
-set(PARAMETERDEPS
- ${ICALSCRIPTS}/mkderivedparameters.pl
- ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/parameters.csv
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.c.in
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.h.in
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h
- COMMAND ${PERL_EXECUTABLE} -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedparameters.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.h.in
- -h ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/parameters.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h
- DEPENDS ${PARAMETERDEPS} )
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c
- COMMAND ${PERL_EXECUTABLE} -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedparameters.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.c.in
- -c ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/parameters.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c
- DEPENDS ${PARAMETERDEPS} ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h )
-
-#files generated via add_custom_command are added automatically to the clean files, Alex
-#macro_additional_clean_files(
-# ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c
-# ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h
-#)
-
-
-set(RESTRICTIONDEPS
- ${ICALSCRIPTS}/mkrestrictiontable.pl
- ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/restrictions.csv
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalrestriction.c.in
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c
- COMMAND ${PERL_EXECUTABLE} -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkrestrictiontable.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalrestriction.c.in
- ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/restrictions.csv > ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c
- DEPENDS ${RESTRICTIONDEPS} )
-
-
-#files generated via add_custom_command are added automatically to the clean files, Alex
-#macro_additional_clean_files( ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c)
-
-set(VALUEDEPS
- ${CMAKE_SOURCE_DIR}/kcal/libical/scripts/mkderivedvalues.pl
- ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.c.in
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.h.in
-)
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h
- COMMAND ${PERL_EXECUTABLE} -I${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedvalues.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.h.in -h ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h
- DEPENDS ${VALUEDEPS} )
-
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c
- COMMAND ${PERL_EXECUTABLE} -I${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedvalues.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.c.in -c ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c
- DEPENDS ${VALUEDEPS} ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h )
-
-#files generated via add_custom_command are added automatically to the clean files, Alex
-#macro_additional_clean_files(
-# ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h
-# ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c
-#)
-
-
-
set(libversit_SRCS
${CMAKE_SOURCE_DIR}/kcal/versit/vcc.c
${CMAKE_SOURCE_DIR}/kcal/versit/vobject.c
)
-# Keep absolute paths here, they are used in tests/CMakeLists.txt too.
-set(libical_SRCS
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/caldate.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalarray.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalattach.c
- ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalrecur.c
- ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalcomponent.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalenums.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalerror.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalmemory.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalmime.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalparameter.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalparser.c
- ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalproperty.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icaltime.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalduration.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalperiod.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icaltimezone.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icaltypes.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalvalue.c
- ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/pvl.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/sspm.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/vsnprintf.c
-)
-
-set(libicalss_SRCS
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libicalss/icalclassify.c
- ${CMAKE_SOURCE_DIR}/kcal/libical/src/libicalss/icalclassify.h
-)
-
-
-macro_additional_clean_files(${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h)
-
-if(WIN32)
- set(TOPS "\"${CMAKE_SOURCE_DIR}\"")
- set(TOPB "\"${CMAKE_BINARY_DIR}\"")
-else(WIN32)
- set(TOPS "${CMAKE_SOURCE_DIR}")
- set(TOPB "${CMAKE_BINARY_DIR}")
-endif(WIN32)
-
-add_custom_command(OUTPUT
- ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h
- COMMAND
- ${CMAKE_COMMAND}
- -DTOPS:FILEPATH=${TOPS}
- -DTOPB:FILEPATH=${TOPB}
- -DKDE_FILE_H_FILE:FILEPATH=${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h
- -P ${CMAKE_SOURCE_DIR}/kcal/ical_file.cmake
- DEPENDS
- ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h
- ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h
- ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h
-)
-
-macro_additional_clean_files(${CMAKE_BINARY_DIR}/libical/src/libicalss/icalss.h)
-
-add_custom_command(OUTPUT
- ${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h
- COMMAND
- ${CMAKE_COMMAND}
- -DTOP:FILEPATH=${TOPS}
- -DKDE_FILE_H_FILE:FILEPATH=${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h
- -P ${CMAKE_SOURCE_DIR}/kcal/icalss_file.cmake
-)
-
-
########### next target ###############
-set(kcal_LIB_SRCS ${libversit_SRCS} ${libical_SRCS} ${libicalss_SRCS}
+set(kcal_LIB_SRCS ${libversit_SRCS}
incidencebase.cpp
incidence.cpp
journal.cpp
@@ -258,18 +81,11 @@
kde4_add_library(kcal SHARED ${kcal_LIB_SRCS})
-target_link_libraries(kcal ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} kresources kabc kpimutils )
+target_link_libraries(kcal ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} kresources kabc kpimutils ${LIBICAL_LIBRARIES})
set_target_properties(kcal PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
install(TARGETS kcal ${INSTALL_TARGETS_DEFAULT_ARGS} COMPONENT Devel)
-# hack to force ical[ss].h creation
-add_custom_target(ical-headers DEPENDS
- ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h
- ${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h
-)
-add_dependencies(kcal ical-headers)
-
########### next target ###############
set(kcal_local_PART_SRCS resourcelocal_plugin.cpp )
@@ -296,7 +112,6 @@
install(TARGETS kcal_localdir DESTINATION ${PLUGIN_INSTALL_DIR})
-add_subdirectory( libical )
add_subdirectory( tests )
########### install files ###############
diff -Nur kdepimlibs-4.1.2/kcal/tests/CMakeLists.txt kdepimlibs-4.1.2-system-libical/kcal/tests/CMakeLists.txt
--- kdepimlibs-4.1.2/kcal/tests/CMakeLists.txt 2008-06-03 11:34:13.000000000 +0200
+++ kdepimlibs-4.1.2-system-libical/kcal/tests/CMakeLists.txt 2008-10-27 08:49:28.000000000 +0100
@@ -2,20 +2,20 @@
include_directories(
${CMAKE_SOURCE_DIR}/kcal
- ${CMAKE_BINARY_DIR}/kcal/libical/src
+ ${LIBICAL_INCLUDE_DIRS}
)
MACRO(KCAL_UNIT_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_unit_test(${_testname} NOGUI ${_testname}.cpp)
- target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kcal ${QT_QTTEST_LIBRARY})
+ target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kcal ${QT_QTTEST_LIBRARY} ${LIBICAL_LIBRARIES})
ENDFOREACH(_testname)
ENDMACRO(KCAL_UNIT_TESTS)
MACRO(KCAL_EXECUTABLE_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_executable(${_testname} NOGUI TEST ${_testname}.cpp)
- target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kcal ${QT_QTTEST_LIBRARY})
+ target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kcal ${QT_QTTEST_LIBRARY} ${LIBICAL_LIBRARIES})
ENDFOREACH(_testname)
ENDMACRO(KCAL_EXECUTABLE_TESTS)
@@ -82,32 +82,32 @@
FOREACH( file ${testFiles} )
GET_FILENAME_COMPONENT( fn ${file} NAME)
- ADD_TEST( RecurNext-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurrence "next" ${file} )
+ ADD_TEST( RecurNext-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurrence.shell "next" ${file} )
ENDFOREACH(file)
FOREACH( file ${testFiles} )
GET_FILENAME_COMPONENT( fn ${file} NAME)
- ADD_TEST( RecurPrev-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurprevious "prev" ${file} )
+ ADD_TEST( RecurPrev-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurprevious.shell "prev" ${file} )
ENDFOREACH(file)
FOREACH( file ${testFiles} )
GET_FILENAME_COMPONENT( fn ${file} NAME)
- ADD_TEST( RecursOn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurson "recurson" ${file} )
+ ADD_TEST( RecursOn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testrecurson.shell "recurson" ${file} )
ENDFOREACH(file)
FOREACH( file ${compatFiles} )
GET_FILENAME_COMPONENT( fn ${file} NAME)
- ADD_TEST( Compat-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/readandwrite "ical" ${file} )
+ ADD_TEST( Compat-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/readandwrite.shell "ical" ${file} )
ENDFOREACH(file)
FOREACH( file ${vCalFilesAsIcal} )
GET_FILENAME_COMPONENT( fn ${file} NAME)
- ADD_TEST( VCalOut-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testvcalexport "vcal" ${file} )
+ ADD_TEST( VCalOut-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/testvcalexport.shell "vcal" ${file} )
ENDFOREACH(file)
FOREACH( file ${vCalFiles} )
GET_FILENAME_COMPONENT( fn ${file} NAME)
- ADD_TEST( VCalIn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/readandwrite "ical" ${file} )
+ ADD_TEST( VCalIn-${fn} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl ${EXECUTABLE_OUTPUT_PATH}/readandwrite.shell "ical" ${file} )
ENDFOREACH(file)
# ADD_TEST( TestRecurrence runtestcase.pl testrecurrence "next" ${CMAKE_CURRENT_SOURCE_DIR} data/RecurrenceRule/ "*.ics" )
diff -Nur kdepimlibs-4.1.2/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref kdepimlibs-4.1.2-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref
--- kdepimlibs-4.1.2/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref 2008-01-05 00:53:12.000000000 +0100
+++ kdepimlibs-4.1.2-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref 2008-10-27 08:44:14.000000000 +0100
@@ -9,7 +9,7 @@
SEQUENCE:4
LAST-MODIFIED:20050520T105750Z
X-ORGANIZER:MAILTO:reinhold at kainhofer.com
-RRULE:MD3 20 20060630T000000
+RRULE:MD3 20 20060630T040000
SUMMARY:20. Mai 2005, 16-17 Uhr, alle 3 Monate am 20., bis 30. Juni 2006
CLASS:PUBLIC
PRIORITY:5
diff -Nur kdepimlibs-4.1.2/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref kdepimlibs-4.1.2-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref
--- kdepimlibs-4.1.2/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref 2008-01-05 00:53:12.000000000 +0100
+++ kdepimlibs-4.1.2-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref 2008-10-27 08:44:36.000000000 +0100
@@ -9,7 +9,7 @@
SEQUENCE:2
LAST-MODIFIED:20050520T105740Z
X-ORGANIZER:MAILTO:reinhold at kainhofer.com
-RRULE:W2 MO WE FR 20050630T000000
+RRULE:W2 MO WE FR 20050630T040000
SUMMARY:20. Mai 2005, 14-15 Uhr, alle 2 Wochen am Mo/Mi/Fr, bis 30. Juni 2005
CLASS:PUBLIC
PRIORITY:5
diff -Nur kdepimlibs-4.1.2/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref kdepimlibs-4.1.2-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref
--- kdepimlibs-4.1.2/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref 2008-01-05 00:53:12.000000000 +0100
+++ kdepimlibs-4.1.2-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref 2008-10-27 08:45:07.000000000 +0100
@@ -9,7 +9,7 @@
SEQUENCE:1
LAST-MODIFIED:20050520T104819Z
X-ORGANIZER:MAILTO:reinhold at kainhofer.com
-RRULE:D3 20050630T000000
+RRULE:D3 20050630T040000
SUMMARY:20. Mai 2005, 13-14 Uhr, alle 3 Tage, bis 30. Juni 2005
CLASS:PUBLIC
PRIORITY:5
diff -Nur kdepimlibs-4.1.2/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref kdepimlibs-4.1.2-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref
--- kdepimlibs-4.1.2/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref 2008-01-05 00:53:12.000000000 +0100
+++ kdepimlibs-4.1.2-system-libical/kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref 2008-10-27 09:04:55.000000000 +0100
@@ -9,7 +9,7 @@
SEQUENCE:1
LAST-MODIFIED:20050520T105327Z
X-ORGANIZER:MAILTO:reinhold at kainhofer.com
-RRULE:MP3 1- TH 20061231T000000
+RRULE:MP3 1- TH 20061231T050000
SUMMARY:20. Mai 2005, 20-21 Uhr, alle 3 Monate am letzten Do, bis 31. 12. 2006
CLASS:PUBLIC
PRIORITY:5
diff -Nur kdepimlibs-4.1.2/kcal/tests/testicaltimezones.cpp kdepimlibs-4.1.2-system-libical/kcal/tests/testicaltimezones.cpp
--- kdepimlibs-4.1.2/kcal/tests/testicaltimezones.cpp 2008-01-05 00:53:16.000000000 +0100
+++ kdepimlibs-4.1.2-system-libical/kcal/tests/testicaltimezones.cpp 2008-10-27 08:40:27.000000000 +0100
@@ -33,7 +33,7 @@
QTEST_KDEMAIN( ICalTimeZonesTest, NoGUI )
extern "C" {
- #include "kcal/libical/src/libical/ical.h"
+ #include <ical.h>
}
#include "kcal/icaltimezones.h"
using namespace KCal;
@@ -72,22 +72,22 @@
"TZOFFSETFROM:-0400\r\n"
"TZOFFSETTO:-0500\r\n"
"TZNAME:WST\r\n"
- "END:STANDARD\r\n\r\n"
+ "END:STANDARD\r\n"
"BEGIN:DAYLIGHT\r\n"
"DTSTART:19870405T020000\r\n"
"RRULE:FREQ=YEARLY;UNTIL=19970406T070000Z;BYDAY=1SU;BYMONTH=4\r\n"
"TZOFFSETFROM:-0500\r\n"
"TZOFFSETTO:-0400\r\n"
"TZNAME:WDT1\r\n"
- "END:DAYLIGHT\r\n\r\n"
+ "END:DAYLIGHT\r\n"
"BEGIN:DAYLIGHT\r\n"
"DTSTART:19990425T020000\r\n"
"RDATE;VALUE=DATE-TIME:20000430T020000\r\n"
"TZOFFSETFROM:-0500\r\n"
"TZOFFSETTO:-0400\r\n"
"TZNAME:WDT2\r\n"
- "END:DAYLIGHT\r\n\r\n"
- "END:VTIMEZONE\r\n\r\n";
+ "END:DAYLIGHT\r\n"
+ "END:VTIMEZONE\r\n";
// Standard time only
static const char *VTZ_other =
@@ -101,8 +101,8 @@
"TZOFFSETFROM:+0000\r\n"
"TZOFFSETTO:+0300\r\n"
"TZNAME:OST\r\n"
- "END:STANDARD\r\n\r\n"
- "END:VTIMEZONE\r\n\r\n";
+ "END:STANDARD\r\n"
+ "END:VTIMEZONE\r\n";
// CALENDAR component header and footer
static const char *calendarHeader =
@@ -183,6 +183,7 @@
QCOMPARE(tz.vtimezone(), QByteArray(VTZ_Western));
ICalTimeZone tz1(tz);
+
QCOMPARE(tz1.name(), tz.name());
QCOMPARE(tz1.url(), tz.url());
QCOMPARE(tz1.city(), tz.city());
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 4 Nov 2008 15:41:44 -0000 1.23
+++ .cvsignore 8 Jan 2009 10:07:32 -0000 1.24
@@ -1 +1 @@
-kdepimlibs-4.1.3.tar.bz2
+kdepimlibs-4.1.4.tar.bz2
Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/kdepimlibs.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kdepimlibs.spec 4 Nov 2008 15:41:44 -0000 1.43
+++ kdepimlibs.spec 8 Jan 2009 10:07:32 -0000 1.44
@@ -11,9 +11,15 @@
%define rest 1
#endif
+%if 0%{?fedora} >= 9
+# Use system libical (requires libical-devel >= 0.33)
+# Disabled for now because of #469228
+%define with_libical 1
+%endif
+
Name: kdepimlibs
-Version: 4.1.3
+Version: 4.1.4
Release: 1%{?dist}
Summary: K Desktop Environment 4 - PIM Libraries
@@ -21,7 +27,9 @@
Group: System Environment/Libraries
URL: http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepimlibs-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepimlibs-%{version}.tar.bz2
+# Use system libical (will be in 4.2)
+Patch100: kdepimlibs-4.1.2-system-libical.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: kdelibs4 >= %{version}
@@ -34,12 +42,11 @@
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: libXpm-devel libXtst-devel
BuildRequires: openldap-devel
+%if 0%{?with_libical}
+BuildRequires: libical-devel >= 0.33
+%endif
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-# work around circular dependency from kdelibs4-devel
-# pulling in phonon-backend-xine
-#BuildRequires: phonon-backend-gstreamer
-
## upstream patches
%if 0%{?apidocs}
@@ -76,6 +83,11 @@
%prep
%setup -q -n kdepimlibs-%{version}
+%if 0%{?with_libical}
+# use system libical
+%patch100 -p1
+rm -rf kcal/libical
+%endif
%build
@@ -141,7 +153,9 @@
%defattr(-,root,root,-)
%{_kde4_appsdir}/akonadi-kde/
%{_kde4_appsdir}/kabc/
+%if !0%{?with_libical}
%{_kde4_appsdir}/libical/
+%endif
%{_kde4_appsdir}/kconf_update/*
%{_kde4_datadir}/config.kcfg/*
%{_datadir}/dbus-1/interfaces/*
@@ -167,8 +181,19 @@
%changelog
-* Tue Nov 4 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.3-1
-- KDE 4.1.3
+* Thu Jan 08 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-1
+- update to 4.1.4
+- reenable system libical, #469228 reportedly fixed upstream now
+- also use the system libical on F9
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
+
+* Sat Nov 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-4
+- turn off system libical for now, crashes KOrganizer (#469228)
+
+* Tue Oct 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-3
+- build against the system libical (F10+ only for now)
* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 4 Nov 2008 15:41:44 -0000 1.22
+++ sources 8 Jan 2009 10:07:32 -0000 1.23
@@ -1 +1 @@
-e6db27f7074d31cdad26fb705ece2825 kdepimlibs-4.1.3.tar.bz2
+9546430309b1f34707bffdceec0fbc4b kdepimlibs-4.1.4.tar.bz2
- Previous message (by thread): rpms/kdepimlibs/F-10 .cvsignore, 1.27, 1.28 kdepimlibs.spec, 1.55, 1.56 sources, 1.28, 1.29
- Next message (by thread): rpms/kdepimlibs/F-10 kdepimlibs-4.1.4-system-libical.patch, NONE, 1.1 kdepimlibs.spec, 1.56, 1.57 kdepimlibs-4.1.2-system-libical.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list