diff -Nurd -x'*~' kdepimlibs-4.4.1.orig/CMakeLists.txt kdepimlibs-4.4.1/CMakeLists.txt --- kdepimlibs-4.4.1.orig/CMakeLists.txt 2010-02-26 13:30:44.000000000 -0500 +++ kdepimlibs-4.4.1/CMakeLists.txt 2013-03-24 23:03:05.000000000 -0400 @@ -39,8 +39,6 @@ endif (WIN32) macro_log_feature(Boost_FOUND "Boost" "Boost C++ Libraries" "http://www.boost.org" TRUE ${Boost_MINIMUM_VERSION} "The Boost libraries boost and boost-graph are required by several critical KDEPIM apps.") -#FindGpgme.cmake already handles the log message but we must ensure it is required. -find_package(Gpgme REQUIRED) # configure macros if (GPGME_FOUND) include (gpgme++/ConfigureChecks.cmake) @@ -65,8 +63,6 @@ ############### Now, we add the KDEPIMLibs components ############### # These targets will always be built add_subdirectory(cmake) -add_subdirectory(gpgme++) -add_subdirectory(qgpgme) if (NOT KDEPIM_ONLY_KLEO) add_subdirectory(kabc) diff -Nurd -x'*~' kdepimlibs-4.4.1.orig/cmake/modules/FindLibical.cmake kdepimlibs-4.4.1/cmake/modules/FindLibical.cmake --- kdepimlibs-4.4.1.orig/cmake/modules/FindLibical.cmake 2009-02-26 04:11:32.000000000 -0500 +++ kdepimlibs-4.4.1/cmake/modules/FindLibical.cmake 2013-03-24 22:59:35.000000000 -0400 @@ -68,6 +68,9 @@ set(LIBICAL_INCLUDE_DIRS "") set(LIBICAL_LIBRARIES "") endif(NOT LIBICAL_VERSION_OK) + if((LIBICAL_VERSION VERSION_EQUAL 0.46) OR (LIBICAL_VERSION VERSION_GREATER 0.46)) + set(USE_ICAL_0_46 TRUE) + endif() else(COMPILE_RESULT AND RUN_RESULT EQUAL 1) message(FATAL_ERROR "Unable to compile or run the libical version detection program.") endif(COMPILE_RESULT AND RUN_RESULT EQUAL 1) diff -Nurd -x'*~' kdepimlibs-4.4.1.orig/kcal/CMakeLists.txt kdepimlibs-4.4.1/kcal/CMakeLists.txt --- kdepimlibs-4.4.1.orig/kcal/CMakeLists.txt 2010-01-06 11:59:10.000000000 -0500 +++ kdepimlibs-4.4.1/kcal/CMakeLists.txt 2013-03-24 23:04:38.000000000 -0400 @@ -6,6 +6,11 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5800) +# Workaround a SIC change in libical 0.46 +if(USE_ICAL_0_46) + add_definitions(-DUSE_ICAL_0_46) +endif() + include (ConfigureChecks.cmake) if(KDE4_BUILD_TESTS) diff -Nurd -x'*~' kdepimlibs-4.4.1.orig/kcal/icalformat.cpp kdepimlibs-4.4.1/kcal/icalformat.cpp --- kdepimlibs-4.4.1.orig/kcal/icalformat.cpp 2009-10-26 05:14:10.000000000 -0400 +++ kdepimlibs-4.4.1/kcal/icalformat.cpp 2013-03-24 23:02:12.000000000 -0400 @@ -36,7 +36,7 @@ #include "icaltimezones.h" extern "C" { - #include + #include #include #include #include diff -Nurd -x'*~' kdepimlibs-4.4.1.orig/kcal/icalformat_p.cpp kdepimlibs-4.4.1/kcal/icalformat_p.cpp --- kdepimlibs-4.4.1.orig/kcal/icalformat_p.cpp 2009-11-21 04:43:29.000000000 -0500 +++ kdepimlibs-4.4.1/kcal/icalformat_p.cpp 2013-03-24 23:01:57.000000000 -0400 @@ -41,7 +41,7 @@ #include "journal.h" extern "C" { - #include + #include #include #include } @@ -784,7 +784,11 @@ if ( att->isUri() ) { attach = icalattach_new_from_url( att->uri().toUtf8().data() ); } else { +#ifdef USE_ICAL_0_46 + attach = icalattach_new_from_data ( ( const char * )att->data(), 0, 0 ); +#else attach = icalattach_new_from_data ( ( unsigned char * )att->data(), 0, 0 ); +#endif } icalproperty *p = icalproperty_new_attach( attach ); diff -Nurd -x'*~' kdepimlibs-4.4.1.orig/kcal/icalformat_p.h kdepimlibs-4.4.1/kcal/icalformat_p.h --- kdepimlibs-4.4.1.orig/kcal/icalformat_p.h 2008-01-14 20:47:33.000000000 -0500 +++ kdepimlibs-4.4.1/kcal/icalformat_p.h 2013-03-24 23:02:03.000000000 -0400 @@ -36,7 +36,7 @@ #include "freebusy.h" #include "scheduler.h" -#include +#include #include