From kde-commits Sat Nov 20 17:34:49 2010 From: Andreas Holzammer Date: Sat, 20 Nov 2010 17:34:49 +0000 To: kde-commits Subject: kdesupport/emerge/portage/win32libs-sources/libical-src Message-Id: <20101120173449.A77B7AC8A0 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=129027452002308 SVN commit 1199117 by aholzammer: - compile fix M +32 -41 libical-0.44-20100728.diff --- trunk/kdesupport/emerge/portage/win32libs-sources/libical-src/libical-0.44-20100728.diff #1199116:1199117 @@ -1,6 +1,6 @@ diff -Nru libical-0.44.orig/cmake/modules/FindWcecompat.cmake libical-0.44/cmake/modules/FindWcecompat.cmake --- libical-0.44.orig/cmake/modules/FindWcecompat.cmake 1970-01-01 01:00:00.000000000 +0100 -+++ libical-0.44/cmake/modules/FindWcecompat.cmake 2010-11-20 03:28:01.535489700 +0100 ++++ libical-0.44/cmake/modules/FindWcecompat.cmake 2010-11-20 12:20:34.120736800 +0100 @@ -0,0 +1,33 @@ +# Try to find Wcecompat functionality +# Once done this will define @@ -37,7 +37,7 @@ +mark_as_advanced(WCECOMPAT_INCLUDE_DIR WCECOMPAT_LIBRARIES WCECOMPAT_CONST WCECOMPAT_LIB_FOUND) diff -Nru libical-0.44.orig/CMakeLists.txt libical-0.44/CMakeLists.txt --- libical-0.44.orig/CMakeLists.txt 2009-09-27 04:38:55.000000000 +0200 -+++ libical-0.44/CMakeLists.txt 2010-11-20 03:28:01.529489400 +0100 ++++ libical-0.44/CMakeLists.txt 2010-11-20 12:20:34.120736800 +0100 @@ -27,6 +27,15 @@ #cannot use the following line with cmake 2.4.x #cmake_policy(VERSION 2.6) @@ -79,7 +79,7 @@ endif(WIN32) diff -Nru libical-0.44.orig/config.h.cmake libical-0.44/config.h.cmake --- libical-0.44.orig/config.h.cmake 2009-09-27 04:38:55.000000000 +0200 -+++ libical-0.44/config.h.cmake 2010-11-20 03:28:01.537489900 +0100 ++++ libical-0.44/config.h.cmake 2010-11-20 12:20:34.136336800 +0100 @@ -158,3 +158,9 @@ #define strcasecmp stricmp #define snprintf _snprintf @@ -92,7 +92,7 @@ + diff -Nru libical-0.44.orig/ConfigureChecks.cmake libical-0.44/ConfigureChecks.cmake --- libical-0.44.orig/ConfigureChecks.cmake 2009-09-27 04:38:55.000000000 +0200 -+++ libical-0.44/ConfigureChecks.cmake 2010-11-20 03:28:01.532489600 +0100 ++++ libical-0.44/ConfigureChecks.cmake 2010-11-20 12:20:34.136336800 +0100 @@ -32,6 +32,7 @@ check_type_size(mode_t SIZEOF_MODE_T) check_type_size(size_t SIZEOF_SIZE_T) @@ -103,7 +103,7 @@ check_library_exists(pthread pthread_attr_get_np "" HAVE_PTHREAD_ATTR_GET_NP) diff -Nru libical-0.44.orig/src/ical.def libical-0.44/src/ical.def --- libical-0.44.orig/src/ical.def 2009-09-27 04:38:53.000000000 +0200 -+++ libical-0.44/src/ical.def 2010-11-20 03:28:01.542490100 +0100 ++++ libical-0.44/src/ical.def 2010-11-20 12:20:34.151936900 +0100 @@ -1,4 +1,4 @@ -LIBRARY ical.dll +LIBRARY libical.dll @@ -112,7 +112,7 @@ compare_map DATA diff -Nru libical-0.44.orig/src/ical.h libical-0.44/src/ical.h --- libical-0.44.orig/src/ical.h 2009-09-27 04:38:53.000000000 +0200 -+++ libical-0.44/src/ical.h 2010-11-20 03:28:01.544490300 +0100 ++++ libical-0.44/src/ical.h 2010-11-20 12:20:34.151936900 +0100 @@ -18,6 +18,9 @@ the License at http://www.mozilla.org/MPL/ @@ -126,7 +126,7 @@ #include diff -Nru libical-0.44.orig/src/icalss.def libical-0.44/src/icalss.def --- libical-0.44.orig/src/icalss.def 2009-09-27 04:38:53.000000000 +0200 -+++ libical-0.44/src/icalss.def 2010-11-20 03:28:01.546490400 +0100 ++++ libical-0.44/src/icalss.def 2010-11-20 12:20:34.151936900 +0100 @@ -1,4 +1,4 @@ -LIBRARY icalss.dll +LIBRARY libicalss.dll @@ -171,7 +171,7 @@ ss_scan_string diff -Nru libical-0.44.orig/src/icalvcal.def libical-0.44/src/icalvcal.def --- libical-0.44.orig/src/icalvcal.def 2009-09-27 04:38:53.000000000 +0200 -+++ libical-0.44/src/icalvcal.def 2010-11-20 03:28:01.548490500 +0100 ++++ libical-0.44/src/icalvcal.def 2010-11-20 12:20:34.151936900 +0100 @@ -1,4 +1,4 @@ -LIBRARY icalvcal.dll +LIBRARY libicalvcal.dll @@ -180,7 +180,7 @@ Parse_MIME_FromFile diff -Nru libical-0.44.orig/src/java/CMakeLists.txt libical-0.44/src/java/CMakeLists.txt --- libical-0.44.orig/src/java/CMakeLists.txt 2009-09-27 04:38:49.000000000 +0200 -+++ libical-0.44/src/java/CMakeLists.txt 2010-11-20 03:28:01.550490600 +0100 ++++ libical-0.44/src/java/CMakeLists.txt 2010-11-20 12:20:34.167536900 +0100 @@ -25,7 +25,7 @@ net_cp_jlibical_VComponent_cxx.h ) @@ -192,8 +192,8 @@ diff -Nru libical-0.44.orig/src/libical/CMakeLists.txt libical-0.44/src/libical/CMakeLists.txt --- libical-0.44.orig/src/libical/CMakeLists.txt 2009-09-27 04:38:51.000000000 +0200 -+++ libical-0.44/src/libical/CMakeLists.txt 2010-11-20 03:42:27.548022800 +0100 -@@ -2,12 +2,21 @@ ++++ libical-0.44/src/libical/CMakeLists.txt 2010-11-20 12:29:07.831295800 +0100 +@@ -2,11 +2,20 @@ include_directories( ${CMAKE_BINARY_DIR} @@ -203,7 +203,6 @@ ${CMAKE_BINARY_DIR}/src/libical ) --set(PACKAGE_DATA_DIR "\\\"${CMAKE_INSTALL_PREFIX}/share/libical\\\"") +if(WIN32) + if(MSVC) + add_definitions(-DBUILD_LIBICALDLL) @@ -212,10 +211,9 @@ + +configure_file(icalerror.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/icalerror.h) + -+set(PACKAGE_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/libical) + set(PACKAGE_DATA_DIR "\\\"${CMAKE_INSTALL_PREFIX}/share/libical\\\"") add_definitions(-DPACKAGE_DATA_DIR=${PACKAGE_DATA_DIR}) - @@ -147,6 +156,7 @@ ) @@ -272,7 +270,7 @@ icalmime.h diff -Nru libical-0.44.orig/src/libical/ical_file.cmake libical-0.44/src/libical/ical_file.cmake --- libical-0.44.orig/src/libical/ical_file.cmake 2009-09-27 04:38:51.000000000 +0200 -+++ libical-0.44/src/libical/ical_file.cmake 2010-11-20 03:28:01.553490800 +0100 ++++ libical-0.44/src/libical/ical_file.cmake 2010-11-20 12:20:34.167536900 +0100 @@ -21,7 +21,7 @@ ${TOPS}/src/libical/icaltimezone.h ${TOPS}/src/libical/icalparser.h @@ -451,7 +449,7 @@ - diff -Nru libical-0.44.orig/src/libical/icalerror.h.cmake libical-0.44/src/libical/icalerror.h.cmake --- libical-0.44.orig/src/libical/icalerror.h.cmake 1970-01-01 01:00:00.000000000 +0100 -+++ libical-0.44/src/libical/icalerror.h.cmake 2010-11-20 03:28:01.556490900 +0100 ++++ libical-0.44/src/libical/icalerror.h.cmake 2010-11-20 12:20:34.183136900 +0100 @@ -0,0 +1,177 @@ +/* -*- Mode: C -*- */ +/*====================================================================== @@ -632,7 +630,7 @@ + diff -Nru libical-0.44.orig/src/libical/icalperiod.c libical-0.44/src/libical/icalperiod.c --- libical-0.44.orig/src/libical/icalperiod.c 2009-09-27 04:38:51.000000000 +0200 -+++ libical-0.44/src/libical/icalperiod.c 2010-11-20 03:28:01.558491100 +0100 ++++ libical-0.44/src/libical/icalperiod.c 2010-11-20 12:20:34.183136900 +0100 @@ -117,8 +117,8 @@ char* icalperiodtype_as_ical_string_r(struct icalperiodtype p) { @@ -646,7 +644,7 @@ size_t buf_size = 40; diff -Nru libical-0.44.orig/src/libical/icalrecur.c libical-0.44/src/libical/icalrecur.c --- libical-0.44.orig/src/libical/icalrecur.c 2009-09-27 04:38:51.000000000 +0200 -+++ libical-0.44/src/libical/icalrecur.c 2010-11-20 03:28:01.560491200 +0100 ++++ libical-0.44/src/libical/icalrecur.c 2010-11-20 12:20:34.198736900 +0100 @@ -1593,11 +1593,12 @@ int day; int days_in_month = icaltime_days_in_month(impl->last.month, @@ -683,7 +681,7 @@ diff -Nru libical-0.44.orig/src/libical/icaltimezone.c libical-0.44/src/libical/icaltimezone.c --- libical-0.44.orig/src/libical/icaltimezone.c 2009-09-27 04:38:51.000000000 +0200 -+++ libical-0.44/src/libical/icaltimezone.c 2010-11-20 03:28:01.563491300 +0100 ++++ libical-0.44/src/libical/icaltimezone.c 2010-11-20 12:36:27.652952400 +0100 @@ -45,7 +45,9 @@ #include @@ -694,7 +692,7 @@ #include /* Undef the similar macro from pthread.h, it doesn't check if * gmtime() returns NULL. -@@ -54,6 +56,12 @@ +@@ -54,10 +56,16 @@ /* The gmtime() in Microsoft's C library is MT-safe */ #define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0) @@ -707,6 +705,11 @@ #endif /** This is the toplevel directory where the timezone data is installed in. */ +-#define ZONEINFO_DIRECTORY PACKAGE_DATA_DIR "/zoneinfo" ++#define ZONEINFO_DIRECTORY PACKAGE_DATA_DIR ## "/zoneinfo" + + /** The prefix we use to uniquely identify TZIDs. + It must begin and end with forward slashes. @@ -1947,10 +1955,18 @@ return zone_files_directory == NULL ? ZONEINFO_DIRECTORY : zone_files_directory; #else @@ -792,7 +795,7 @@ } diff -Nru libical-0.44.orig/src/libical/icaltz-util.c libical-0.44/src/libical/icaltz-util.c --- libical-0.44.orig/src/libical/icaltz-util.c 2009-09-27 04:38:51.000000000 +0200 -+++ libical-0.44/src/libical/icaltz-util.c 2010-11-20 03:28:01.564491400 +0100 ++++ libical-0.44/src/libical/icaltz-util.c 2010-11-20 12:20:34.214337000 +0100 @@ -297,12 +297,16 @@ icalproperty *icalprop; icaltimetype dtstart, icaltime; @@ -816,7 +819,7 @@ icalerror_set_errno (ICAL_FILE_ERROR); diff -Nru libical-0.44.orig/src/libical/icalvalue.c libical-0.44/src/libical/icalvalue.c --- libical-0.44.orig/src/libical/icalvalue.c 2009-09-27 04:38:51.000000000 +0200 -+++ libical-0.44/src/libical/icalvalue.c 2010-11-20 03:28:01.566491500 +0100 ++++ libical-0.44/src/libical/icalvalue.c 2010-11-20 12:20:34.214337000 +0100 @@ -307,7 +307,9 @@ #define TMP_NUM_SIZE 100 char *start=NULL, *end=NULL, *cur=(char*)from ; @@ -847,7 +850,7 @@ *result = atof(tmp_buf) ; diff -Nru libical-0.44.orig/src/libicalss/CMakeLists.txt libical-0.44/src/libicalss/CMakeLists.txt --- libical-0.44.orig/src/libicalss/CMakeLists.txt 2009-09-27 04:38:52.000000000 +0200 -+++ libical-0.44/src/libicalss/CMakeLists.txt 2010-11-20 03:40:57.811890200 +0100 ++++ libical-0.44/src/libicalss/CMakeLists.txt 2010-11-20 12:20:34.214337000 +0100 @@ -30,7 +30,9 @@ add_custom_target(icalss-header DEPENDS @@ -885,7 +888,7 @@ install(TARGETS icalss icalss-static ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -Nru libical-0.44.orig/src/libicalss/icalfileset.c libical-0.44/src/libicalss/icalfileset.c --- libical-0.44.orig/src/libicalss/icalfileset.c 2009-09-27 04:38:52.000000000 +0200 -+++ libical-0.44/src/libicalss/icalfileset.c 2010-11-20 03:28:01.569491700 +0100 ++++ libical-0.44/src/libicalss/icalfileset.c 2010-11-20 12:20:34.214337000 +0100 @@ -38,8 +38,10 @@ #include /* for stat, getpid */ #else @@ -970,7 +973,7 @@ return ICAL_NO_ERROR; diff -Nru libical-0.44.orig/src/libicalss/icalsslexer.c libical-0.44/src/libicalss/icalsslexer.c --- libical-0.44.orig/src/libicalss/icalsslexer.c 2009-09-27 04:38:52.000000000 +0200 -+++ libical-0.44/src/libicalss/icalsslexer.c 2010-11-20 03:28:01.571491800 +0100 ++++ libical-0.44/src/libicalss/icalsslexer.c 2010-11-20 12:20:34.229937000 +0100 @@ -39,6 +39,10 @@ #include #include @@ -984,7 +987,7 @@ /* flex integer type definitions */ diff -Nru libical-0.44.orig/src/libicalvcal/CMakeLists.txt libical-0.44/src/libicalvcal/CMakeLists.txt --- libical-0.44.orig/src/libicalvcal/CMakeLists.txt 2009-09-27 04:38:52.000000000 +0200 -+++ libical-0.44/src/libicalvcal/CMakeLists.txt 2010-11-20 03:40:05.123876600 +0100 ++++ libical-0.44/src/libicalvcal/CMakeLists.txt 2010-11-20 12:20:34.229937000 +0100 @@ -27,14 +27,22 @@ list(APPEND icalvcal_LIB_SRCS ../icalvcal.def) endif(MSVC) @@ -1012,7 +1015,7 @@ install(TARGETS icalvcal icalvcal-static ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -Nru libical-0.44.orig/src/libicalvcal/icalvcal.c libical-0.44/src/libicalvcal/icalvcal.c --- libical-0.44.orig/src/libicalvcal/icalvcal.c 2009-09-27 04:38:52.000000000 +0200 -+++ libical-0.44/src/libicalvcal/icalvcal.c 2010-11-20 03:28:01.575492000 +0100 ++++ libical-0.44/src/libicalvcal/icalvcal.c 2010-11-20 12:20:34.245537000 +0100 @@ -51,6 +51,10 @@ #define strcasecmp stricmp #endif @@ -1026,7 +1029,7 @@ PROPERTY, diff -Nru libical-0.44.orig/src/python/CMakeLists.txt libical-0.44/src/python/CMakeLists.txt --- libical-0.44.orig/src/python/CMakeLists.txt 2009-09-27 04:38:49.000000000 +0200 -+++ libical-0.44/src/python/CMakeLists.txt 2010-11-20 03:28:01.576492100 +0100 ++++ libical-0.44/src/python/CMakeLists.txt 2010-11-20 12:20:34.245537000 +0100 @@ -7,7 +7,7 @@ LibicalWrap.c ) @@ -1036,21 +1039,9 @@ target_link_libraries(LibicalWrap) -diff -Nru libical-0.44.orig/src/test/CMakeLists.txt libical-0.44/src/test/CMakeLists.txt ---- libical-0.44.orig/src/test/CMakeLists.txt 2009-09-27 04:38:49.000000000 +0200 -+++ libical-0.44/src/test/CMakeLists.txt 2010-11-20 03:29:31.987663300 +0100 -@@ -5,7 +5,7 @@ - ${CMAKE_SOURCE_DIR}/src/libicalss ${CMAKE_BINARY_DIR}/src/libicalss - ) - --set(TEST_DATADIR "\\\"${CMAKE_SOURCE_DIR}/test-data\\\"") -+set(TEST_DATADIR ${CMAKE_SOURCE_DIR}/test-data) - add_definitions(-DTEST_DATADIR=${TEST_DATADIR}) - - ########### next target ############### diff -Nru libical-0.44.orig/src/test/regression.c libical-0.44/src/test/regression.c --- libical-0.44.orig/src/test/regression.c 2009-09-27 04:38:49.000000000 +0200 -+++ libical-0.44/src/test/regression.c 2010-11-20 03:28:01.579492300 +0100 ++++ libical-0.44/src/test/regression.c 2010-11-20 12:20:34.261137100 +0100 @@ -54,10 +54,6 @@ #endif #include /* For wait pid */