Hello community,
here is the log from the commit of package libical for openSUSE:Factory
checked in at Fri Jan 16 12:12:58 CET 2009.
--------
--- libical/libical.changes 2008-12-21 05:42:03.000000000 +0100
+++ /mounts/work_src_done/STABLE/libical/libical.changes 2009-01-12 19:00:13.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Jan 12 23:26:35 IST 2009 - msuman@suse.de
+
+- Update to version 0.43:
+ + Incorporates bugfixes submitted by the GNOME Evolution team.
+ + New API call icaltimezone_set_tzid_prefix() to allow downstream
+ applications to generate tzid's with custom namespaces.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libical-0.42.tar.bz2
New:
----
libical-0.43.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libical.spec ++++++
--- /var/tmp/diff_new_pack.mwx941/_old 2009-01-16 12:12:31.000000000 +0100
+++ /var/tmp/diff_new_pack.mwx941/_new 2009-01-16 12:12:31.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libical (Version 0.42)
+# spec file for package libical (Version 0.43)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,8 +24,8 @@
License: LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
Group: Development/Libraries/C and C++
AutoReqProv: on
-Version: 0.42
-Release: 2
+Version: 0.43
+Release: 1
Summary: An Implementation of Basic iCAL Protocols
Source: libical-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -146,6 +146,11 @@
%doc doc examples scripts
%changelog
+* Sun Jan 11 2009 msuman@suse.de
+- Update to version 0.43:
+ + Incorporates bugfixes submitted by the GNOME Evolution team.
+ + New API call icaltimezone_set_tzid_prefix() to allow downstream
+ applications to generate tzid's with custom namespaces.
* Fri Dec 19 2008 msuman@suse.de
- Use proper RPM macros in the spec file, remove unnecessary options
passed to the configure script.
++++++ libical-0.42.tar.bz2 -> libical-0.43.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/CMakeLists.txt new/libical-0.43/CMakeLists.txt
--- old/libical-0.42/CMakeLists.txt 2008-11-25 17:27:00.000000000 +0100
+++ new/libical-0.43/CMakeLists.txt 2009-01-08 17:50:28.000000000 +0100
@@ -28,7 +28,7 @@
#cmake_policy(VERSION 2.6)
set(LIBICAL_LIB_MAJOR_VERSION "0")
-set(LIBICAL_LIB_MINOR_VERSION "42")
+set(LIBICAL_LIB_MINOR_VERSION "43")
set(LIBICAL_LIB_PATCH_VERSION "0")
set(LIBICAL_LIB_VERSION_STRING "${LIBICAL_LIB_MAJOR_VERSION}.${LIBICAL_LIB_MINOR_VERSION}.${LIBICAL_LIB_PATCH_VERSION}")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/configure new/libical-0.43/configure
--- old/libical-0.42/configure 2008-11-25 17:28:34.000000000 +0100
+++ new/libical-0.43/configure 2009-01-08 17:52:03.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libical 0.42.
+# Generated by GNU Autoconf 2.59 for libical 0.43.
#
# Report bugs to http://freeassociation.sf.net/.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='libical'
PACKAGE_TARNAME='libical'
-PACKAGE_VERSION='0.42'
-PACKAGE_STRING='libical 0.42'
+PACKAGE_VERSION='0.43'
+PACKAGE_STRING='libical 0.43'
PACKAGE_BUGREPORT='http://freeassociation.sf.net/'
# Factoring default headers for most tests.
@@ -953,7 +953,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libical 0.42 to adapt to many kinds of systems.
+\`configure' configures libical 0.43 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libical 0.42:";;
+ short | recursive ) echo "Configuration of libical 0.43:";;
esac
cat <<\_ACEOF
@@ -1039,6 +1039,7 @@
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-reentrant define _REENTRANT to enable reentrant system calls
+ --enable-icalerrors-are-fatal define ICAL_ERRORS_ARE_FATAL to make icalerror_* calls fatal
--enable-cxx Enable C++ bindings
--enable-java Enable Java bindings
--enable-python Enable python bindings
@@ -1170,7 +1171,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-libical configure 0.42
+libical configure 0.43
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1184,7 +1185,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libical $as_me 0.42, which was
+It was created by libical $as_me 0.43, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1909,7 +1910,7 @@
# Define the identity of the package.
PACKAGE='libical'
- VERSION='0.42'
+ VERSION='0.43'
cat >>confdefs.h <<_ACEOF
@@ -4586,7 +4587,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4589 "configure"' > conftest.$ac_ext
+ echo '#line 4590 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5701,7 +5702,7 @@
# Provide some information about the compiler.
-echo "$as_me:5704:" \
+echo "$as_me:5705:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
@@ -6799,11 +6800,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6802: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6803: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6806: \$? = $ac_status" >&5
+ echo "$as_me:6807: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7061,11 +7062,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7064: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7065: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7068: \$? = $ac_status" >&5
+ echo "$as_me:7069: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7123,11 +7124,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7126: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7127: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7130: \$? = $ac_status" >&5
+ echo "$as_me:7131: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8508,7 +8509,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8511 "configure"' > conftest.$ac_ext
+ echo '#line 8512 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9379,7 +9380,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:11729: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11732: \$? = $ac_status" >&5
+ echo "$as_me:11733: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11787,11 +11788,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11790: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11791: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11794: \$? = $ac_status" >&5
+ echo "$as_me:11795: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12302,7 +12303,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12305 "configure"' > conftest.$ac_ext
+ echo '#line 12306 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -13173,7 +13174,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:14160: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14163: \$? = $ac_status" >&5
+ echo "$as_me:14164: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14218,11 +14219,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14221: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14222: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14225: \$? = $ac_status" >&5
+ echo "$as_me:14226: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15583,7 +15584,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 15586 "configure"' > conftest.$ac_ext
+ echo '#line 15587 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -16356,11 +16357,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16359: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16360: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16363: \$? = $ac_status" >&5
+ echo "$as_me:16364: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16618,11 +16619,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16621: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16622: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16625: \$? = $ac_status" >&5
+ echo "$as_me:16626: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16680,11 +16681,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16683: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16684: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16687: \$? = $ac_status" >&5
+ echo "$as_me:16688: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18065,7 +18066,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 18068 "configure"' > conftest.$ac_ext
+ echo '#line 18069 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -18936,7 +18937,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5
+echo $ECHO_N "checking if icalerrors_* calls should abort instead of internally signalling an error... $ECHO_C" >&6
+# Check whether --enable-icalerrors-are-fatal or --disable-icalerrors-are-fatal was given.
+if test "${enable_icalerrors_are_fatal+set}" = set; then
+ enableval="$enable_icalerrors_are_fatal"
+ case "${enableval}" in
+ yes)
+ ac_cv_ical_errors_are_fatal=yes
+ ;;
+ *)
+ ac_cv_ical_errors_are_fatal=no
+ ;;
+ esac
+else
+ ac_cv_ical_errors_are_fatal=no
+
+fi;
+echo "$as_me:$LINENO: result: $ac_cv_ical_errors_are_fatal" >&5
+echo "${ECHO_T}$ac_cv_ical_errors_are_fatal" >&6
+
+if test "x$ac_cv_ical_errors_are_fatal" != "xyes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ICAL_ERRORS_ARE_FATAL 0
+_ACEOF
+
+else
cat >>confdefs.h <<\_ACEOF
#define ICAL_ERRORS_ARE_FATAL 1
_ACEOF
+fi
+
cat >>confdefs.h <<\_ACEOF
#define NO_WARN_DEPRECATED 1
@@ -22381,7 +22411,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by libical $as_me 0.42, which was
+This file was extended by libical $as_me 0.43, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22444,7 +22474,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libical config.status 0.42
+libical config.status 0.43
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/configure.in new/libical-0.43/configure.in
--- old/libical-0.42/configure.in 2008-11-25 17:27:00.000000000 +0100
+++ new/libical-0.43/configure.in 2009-01-08 17:50:28.000000000 +0100
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
-AC_INIT([libical], [0.42], [http://freeassociation.sf.net/])
+AC_INIT([libical], [0.43], [http://freeassociation.sf.net/])
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE
@@ -189,9 +189,32 @@
dnl **************************************************
+dnl ICAL_ERRORS_ARE_FATAL
+dnl **************************************************
+AC_MSG_CHECKING(if icalerrors_* calls should abort instead of internally signalling an error)
+AC_ARG_ENABLE(icalerrors-are-fatal,
+ [ --enable-icalerrors-are-fatal define ICAL_ERRORS_ARE_FATAL to make icalerror_* calls fatal],
+ [ case "${enableval}" in
+ yes)
+ ac_cv_ical_errors_are_fatal=yes
+ ;;
+ *)
+ ac_cv_ical_errors_are_fatal=no
+ ;;
+ esac ],
+ ac_cv_ical_errors_are_fatal=no
+)
+AC_MSG_RESULT($ac_cv_ical_errors_are_fatal)
+
+if test "x$ac_cv_ical_errors_are_fatal" != "xyes"; then
+ AC_DEFINE(ICAL_ERRORS_ARE_FATAL, 0, [Define to make icalerror_* calls abort instead of internally signalling an error])
+else
+ AC_DEFINE(ICAL_ERRORS_ARE_FATAL, 1, [Define to make icalerror_* calls abort instead of internally signalling an error])
+fi
+
+dnl **************************************************
dnl test/regression.c (and maybe others) needs this defined
dnl **************************************************
-AC_DEFINE(ICAL_ERRORS_ARE_FATAL,1,[Define to make icalerror_* calls abort instead of internally signalling an error])
AC_DEFINE(NO_WARN_DEPRECATED,1,[Define to 1 if you DO NOT WANT to see deprecated messages])
AC_DEFINE(NO_WARN_ICAL_MALFORMEDDATA_ERROR_HACK,1,[Define to 1 if you DO NO WANT to see the warning messages related to ICAL_MALFORMEDDATA_ERROR and parsing .ics zoneinfo files])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/src/java/CMakeLists.txt new/libical-0.43/src/java/CMakeLists.txt
--- old/libical-0.42/src/java/CMakeLists.txt 2008-11-25 17:26:49.000000000 +0100
+++ new/libical-0.43/src/java/CMakeLists.txt 2009-01-08 17:50:20.000000000 +0100
@@ -46,7 +46,7 @@
#
#INCLUDES = -I../libical -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(JAVA_PLATFORM)
#
-#libical_jni_la_LDFLAGS = -no-defined -version-info 42:0:42
+#libical_jni_la_LDFLAGS = -no-defined -version-info 43:0:43
#
#libical_jni_la_LIBADD = \
# ../libical/libical_cxx.la
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/src/java/Makefile.am new/libical-0.43/src/java/Makefile.am
--- old/libical-0.42/src/java/Makefile.am 2008-11-25 17:26:49.000000000 +0100
+++ new/libical-0.43/src/java/Makefile.am 2009-01-08 17:50:20.000000000 +0100
@@ -2,7 +2,7 @@
INCLUDES = -I../libical -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(JAVA_PLATFORM)
-libical_jni_la_LDFLAGS = -no-defined -version-info 42:0:42
+libical_jni_la_LDFLAGS = -no-defined -version-info 43:0:43
libical_jni_la_LIBADD = \
../libical/libical_cxx.la
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/src/libical/icalrecur.c new/libical-0.43/src/libical/icalrecur.c
--- old/libical-0.42/src/libical/icalrecur.c 2008-11-25 17:26:51.000000000 +0100
+++ new/libical-0.43/src/libical/icalrecur.c 2009-01-08 17:50:21.000000000 +0100
@@ -1691,13 +1691,16 @@
that to get the next day */
/* ignore position of dow ("4FR"), only use dow ("FR")*/
dow = icalrecurrencetype_day_day_of_week(BYDAYPTR[BYDAYIDX]);
+ dow -= impl->rule.week_start; /* Set Sunday to be 0 */
+ if (dow < 0) {
+ dow += 7;
+ }
+
tt.year = impl->last.year;
tt.day = impl->last.day;
tt.month = impl->last.month;
- start_of_week = icaltime_start_doy_of_week(tt);
-
- dow--; /* Set Sunday to be 0 */
+ start_of_week = icaltime_start_doy_week(tt, impl->rule.week_start);
if(dow+start_of_week <1){
/* The selected date is in the previous year. */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/src/libical/icaltimezone.c new/libical-0.43/src/libical/icaltimezone.c
--- old/libical-0.42/src/libical/icaltimezone.c 2008-11-25 17:26:51.000000000 +0100
+++ new/libical-0.43/src/libical/icaltimezone.c 2009-01-08 17:50:21.000000000 +0100
@@ -59,9 +59,10 @@
/** This is the toplevel directory where the timezone data is installed in. */
#define ZONEINFO_DIRECTORY PACKAGE_DATA_DIR "/zoneinfo"
-/** The prefix we use to uniquely identify TZIDs. */
-#define TZID_PREFIX "/citadel.org/"
-#define TZID_PREFIX_LEN 13
+/** The prefix we use to uniquely identify TZIDs.
+ It must begin and end with forward slashes.
+ */
+const char *ical_tzid_prefix = "/freeassociation.sourceforge.net/";
/** This is the filename of the file containing the city names and
coordinates of all the builtin timezones. */
@@ -1276,7 +1277,7 @@
this is one of our TZIDs and if so we jump to the city name
at the end of it. */
if (display_name
- && !strncmp (display_name, TZID_PREFIX, TZID_PREFIX_LEN)) {
+ && !strncmp (display_name, ical_tzid_prefix, strlen(ical_tzid_prefix))) {
/* Get the location, which is after the 3rd '/' char. */
const char *p;
int num_slashes = 0;
@@ -1293,7 +1294,6 @@
return display_name;
}
-
icalarray*
icaltimezone_array_new (void)
{
@@ -1486,7 +1486,7 @@
return NULL;
/* Check that the TZID starts with our unique prefix. */
- if (strncmp (tzid, TZID_PREFIX, TZID_PREFIX_LEN))
+ if (strncmp (tzid, ical_tzid_prefix, strlen(ical_tzid_prefix)))
return NULL;
/* Get the location, which is after the 3rd '/' character. */
@@ -2033,3 +2033,10 @@
free(zone_files_directory);
}
}
+
+void icaltimezone_set_tzid_prefix(const char *new_prefix)
+{
+ if (new_prefix) {
+ ical_tzid_prefix = new_prefix;
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/src/libical/icaltimezone.h new/libical-0.43/src/libical/icaltimezone.h
--- old/libical-0.42/src/libical/icaltimezone.h 2008-11-25 17:26:51.000000000 +0100
+++ new/libical-0.43/src/libical/icaltimezone.h 2009-01-08 17:50:22.000000000 +0100
@@ -57,6 +57,12 @@
void icaltimezone_free (icaltimezone *zone,
int free_struct);
+/** Sets the prefix to be used for tzid's generated from system tzdata.
+ Must be globally unique (such as a domain name owned by the developer
+ of the calling application), and begin and end with forward slashes.
+ Do not change or de-allocate the string buffer after calling this.
+ */
+void icaltimezone_set_tzid_prefix(const char *new_prefix);
/**
* @par Accessing timezones.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/src/libical/icaltz-util.c new/libical-0.43/src/libical/icaltz-util.c
--- old/libical-0.42/src/libical/icaltz-util.c 2008-11-25 17:26:51.000000000 +0100
+++ new/libical-0.43/src/libical/icaltz-util.c 2009-01-08 17:50:21.000000000 +0100
@@ -99,8 +99,6 @@
static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"};
static char *zdir = NULL;
-#define TZID_PREFIX "/softwarestudio.org/"
-
#define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0]))
#define EFREAD(buf,size,num,fs) \
if (fread (buf, size, num, fs) == 0 && ferror (fs)) {\
@@ -125,6 +123,8 @@
long int change;
} leap;
+extern const char *ical_tzid_prefix;
+
static int
decode (const void *ptr)
{
@@ -369,8 +369,8 @@
tz_comp = icalcomponent_new (ICAL_VTIMEZONE_COMPONENT);
/* Add tzid property */
- tzid = (char *) malloc (strlen (TZID_PREFIX) + strlen (location) + 8);
- sprintf (tzid, "%sTzfile/%s", TZID_PREFIX, location);
+ tzid = (char *) malloc (strlen (ical_tzid_prefix) + strlen (location) + 8);
+ sprintf (tzid, "%sTzfile/%s", ical_tzid_prefix, location);
icalprop = icalproperty_new_tzid (tzid);
icalcomponent_add_property (tz_comp, icalprop);
free (tzid);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/src/libical/Makefile.am new/libical-0.43/src/libical/Makefile.am
--- old/libical-0.42/src/libical/Makefile.am 2008-11-25 17:26:52.000000000 +0100
+++ new/libical-0.43/src/libical/Makefile.am 2009-01-08 17:50:22.000000000 +0100
@@ -51,7 +51,7 @@
-I$(top_builddir)/src/libical \
-I$(srcdir)
-libical_la_LDFLAGS = -version-info 42:0:42
+libical_la_LDFLAGS = -version-info 43:0:43
libical_la_LIBADD = $(PTHREAD_LIBS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/src/libical/Makefile.in new/libical-0.43/src/libical/Makefile.in
--- old/libical-0.42/src/libical/Makefile.in 2008-11-25 17:28:14.000000000 +0100
+++ new/libical-0.43/src/libical/Makefile.in 2009-01-08 17:51:42.000000000 +0100
@@ -326,7 +326,7 @@
-I$(top_builddir)/src/libical \
-I$(srcdir)
-libical_la_LDFLAGS = -version-info 42:0:42
+libical_la_LDFLAGS = -version-info 43:0:43
libical_la_LIBADD = $(PTHREAD_LIBS)
libical_la_SOURCES = \
$(BUILT_SOURCES) \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/src/libicalcap/CMakeLists.txt new/libical-0.43/src/libicalcap/CMakeLists.txt
--- old/libical-0.42/src/libicalcap/CMakeLists.txt 2008-11-25 17:26:50.000000000 +0100
+++ new/libical-0.43/src/libicalcap/CMakeLists.txt 2009-01-08 17:50:20.000000000 +0100
@@ -62,7 +62,7 @@
# -I$(srcdir) \
# -DWITH_RR $(RRCAP_CFLAGS)
#
-#libicalcap_evolution_la_LDFLAGS = $(RRCAP_LIBS) -version-info 42:0:42
+#libicalcap_evolution_la_LDFLAGS = $(RRCAP_LIBS) -version-info 43:0:43
#
#
#libicalcap_evolution_la_SOURCES = \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/src/libicalcap/Makefile.am new/libical-0.43/src/libicalcap/Makefile.am
--- old/libical-0.42/src/libicalcap/Makefile.am 2008-11-25 17:26:50.000000000 +0100
+++ new/libical-0.43/src/libicalcap/Makefile.am 2009-01-08 17:50:20.000000000 +0100
@@ -34,7 +34,7 @@
-I$(srcdir) \
-DWITH_RR $(RRCAP_CFLAGS)
-libicalcap_evolution_la_LDFLAGS = $(RRCAP_LIBS) -version-info 42:0:42
+libicalcap_evolution_la_LDFLAGS = $(RRCAP_LIBS) -version-info 43:0:43
libicalcap_evolution_la_SOURCES = \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/src/libicalss/CMakeLists.txt new/libical-0.43/src/libicalss/CMakeLists.txt
--- old/libical-0.42/src/libicalss/CMakeLists.txt 2008-11-25 17:26:52.000000000 +0100
+++ new/libical-0.43/src/libicalss/CMakeLists.txt 2009-01-08 17:50:22.000000000 +0100
@@ -166,7 +166,7 @@
# -I$(top_builddir)/src/libical \
# $(BDB_INCLUDE)
#
-#libicalss_la_LDFLAGS = -version-info 42:0:42
+#libicalss_la_LDFLAGS = -version-info 43:0:43
#libicalss_la_LIBADD = $(BDB_LIBFILES)
#
#if DEV
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/src/libicalss/Makefile.am new/libical-0.43/src/libicalss/Makefile.am
--- old/libical-0.42/src/libicalss/Makefile.am 2008-11-25 17:26:52.000000000 +0100
+++ new/libical-0.43/src/libicalss/Makefile.am 2009-01-08 17:50:22.000000000 +0100
@@ -63,7 +63,7 @@
-I$(top_builddir)/src/libical \
$(BDB_INCLUDE)
-libicalss_la_LDFLAGS = -version-info 42:0:42
+libicalss_la_LDFLAGS = -version-info 43:0:43
libicalss_la_LIBADD = $(BDB_LIBFILES)
if DEV
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/src/libicalss/Makefile.in new/libical-0.43/src/libicalss/Makefile.in
--- old/libical-0.42/src/libicalss/Makefile.in 2008-11-25 17:28:16.000000000 +0100
+++ new/libical-0.43/src/libicalss/Makefile.in 2009-01-08 17:51:44.000000000 +0100
@@ -307,7 +307,7 @@
-I$(top_builddir)/src/libical \
$(BDB_INCLUDE)
-libicalss_la_LDFLAGS = -version-info 42:0:42
+libicalss_la_LDFLAGS = -version-info 43:0:43
libicalss_la_LIBADD = $(BDB_LIBFILES)
@DEV_FALSE@libicalss_la_DEVSOURCES = icalsslexer.c icalssyacc.c
@DEV_TRUE@libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/src/libicalvcal/CMakeLists.txt new/libical-0.43/src/libicalvcal/CMakeLists.txt
--- old/libical-0.42/src/libicalvcal/CMakeLists.txt 2008-11-25 17:26:53.000000000 +0100
+++ new/libical-0.43/src/libicalvcal/CMakeLists.txt 2009-01-08 17:50:23.000000000 +0100
@@ -55,7 +55,7 @@
# -I$(top_builddir)/src/libical \
# -I$(top_srcdir)/src/libicalss
#
-#libicalvcal_la_LDFLAGS = -version-info 42:0:42
+#libicalvcal_la_LDFLAGS = -version-info 43:0:43
#libicalvcal_la_LIBADD = ../libical/.libs/libical.la
#
#if DEV
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/src/libicalvcal/Makefile.am new/libical-0.43/src/libicalvcal/Makefile.am
--- old/libical-0.42/src/libicalvcal/Makefile.am 2008-11-25 17:26:53.000000000 +0100
+++ new/libical-0.43/src/libicalvcal/Makefile.am 2009-01-08 17:50:23.000000000 +0100
@@ -8,7 +8,7 @@
-I$(top_builddir)/src/libical \
-I$(top_srcdir)/src/libicalss
-libicalvcal_la_LDFLAGS = -version-info 42:0:42
+libicalvcal_la_LDFLAGS = -version-info 43:0:43
libicalvcal_la_LIBADD = ../libical/.libs/libical.la
if DEV
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libical-0.42/src/libicalvcal/Makefile.in new/libical-0.43/src/libicalvcal/Makefile.in
--- old/libical-0.42/src/libicalvcal/Makefile.in 2008-11-25 17:28:18.000000000 +0100
+++ new/libical-0.43/src/libicalvcal/Makefile.in 2009-01-08 17:51:46.000000000 +0100
@@ -237,7 +237,7 @@
-I$(top_builddir)/src/libical \
-I$(top_srcdir)/src/libicalss
-libicalvcal_la_LDFLAGS = -version-info 42:0:42
+libicalvcal_la_LDFLAGS = -version-info 43:0:43
libicalvcal_la_LIBADD = ../libical/.libs/libical.la
@DEV_FALSE@libicalvcal_la_DEVSOURCES = vcc.c
@DEV_TRUE@libicalvcal_la_DEVSOURCES = vcc.y
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org