packages: libical/libical-as_needed.patch, libical/libical.spec, libical/li...
qboosh
qboosh at pld-linux.org
Sun Sep 5 10:50:00 CEST 2010
Author: qboosh Date: Sun Sep 5 08:50:00 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 0.46
- updated as-needed patch
- added cxx patch (extern "C", fixes C++ linking with libicalss)
---- Files affected:
packages/libical:
libical-as_needed.patch (1.3 -> 1.4) , libical.spec (1.25 -> 1.26) , libical-cxx.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/libical/libical-as_needed.patch
diff -u packages/libical/libical-as_needed.patch:1.3 packages/libical/libical-as_needed.patch:1.4
--- packages/libical/libical-as_needed.patch:1.3 Sat Mar 7 15:16:07 2009
+++ packages/libical/libical-as_needed.patch Sun Sep 5 10:49:55 2010
@@ -13,15 +13,6 @@
diff -urN libical-0.43/src/libicalss/Makefile.am libical-0.43.new/src/libicalss/Makefile.am
--- libical-0.43/src/libicalss/Makefile.am 2009-01-08 17:50:22.000000000 +0100
+++ libical-0.43.new/src/libicalss/Makefile.am 2009-03-07 14:55:23.000000000 +0100
-@@ -64,7 +64,7 @@
- $(BDB_INCLUDE)
-
- libicalss_la_LDFLAGS = -version-info 43:0:43
--libicalss_la_LIBADD = $(BDB_LIBFILES)
-+libicalss_la_LIBADD = $(BDB_LIBFILES) $(top_builddir)/src/libical/libical.la
-
- if DEV
- libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y
@@ -115,10 +115,11 @@
if WITH_CXX_BINDINGS
================================================================
Index: packages/libical/libical.spec
diff -u packages/libical/libical.spec:1.25 packages/libical/libical.spec:1.26
--- packages/libical/libical.spec:1.25 Sat Mar 7 15:15:47 2009
+++ packages/libical/libical.spec Sun Sep 5 10:49:55 2010
@@ -3,13 +3,14 @@
Summary: libical library
Summary(pl.UTF-8): Biblioteka libical
Name: libical
-Version: 0.43
+Version: 0.46
Release: 1
License: MPL 1.1 or LGPL v2.1
Group: Libraries
-Source0: http://dl.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz
-# Source0-md5: 5f0a1feb60894d0be537aefea5647474
+Source0: http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz
+# Source0-md5: 9c08f88945bfd5d0791d102e4aa4125c
Patch0: %{name}-as_needed.patch
+Patch1: %{name}-cxx.patch
URL: http://freeassociation.sourceforge.net/
BuildRequires: autoconf >= 2.52
BuildRequires: automake
@@ -95,13 +96,14 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
%{__aclocal}
-%{__automake}
-%{__autoheader}
%{__autoconf}
+%{__autoheader}
+%{__automake}
%configure \
--enable-cxx
%{__make}
@@ -228,6 +230,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.26 2010/09/05 08:49:55 qboosh
+- updated to 0.46
+- updated as-needed patch
+- added cxx patch (extern "C", fixes C++ linking with libicalss)
+
Revision 1.25 2009/03/07 14:15:47 megabajt
- updated to 0.43
================================================================
Index: packages/libical/libical-cxx.patch
diff -u /dev/null packages/libical/libical-cxx.patch:1.1
--- /dev/null Sun Sep 5 10:50:00 2010
+++ packages/libical/libical-cxx.patch Sun Sep 5 10:49:55 2010
@@ -0,0 +1,23 @@
+--- libical-0.46/src/libicalss/icalspanlist.h.orig 2010-08-30 22:05:08.000000000 +0200
++++ libical-0.46/src/libicalss/icalspanlist.h 2010-09-05 09:42:08.695135135 +0200
+@@ -26,6 +26,9 @@
+ #define ICALSPANLIST_H
+
+ #include <libical/ical.h>
++#ifdef __cplusplus
++extern "C" {
++#endif
+ #include "icalset.h"
+
+ /** @file icalspanlist.h
+@@ -71,6 +74,10 @@
+ /** @brief Construct an icalspanlist from a VFREEBUSY component */
+ icalspanlist *icalspanlist_from_vfreebusy(icalcomponent* c);
+
++#ifdef __cplusplus
++}
++#endif
++
+ #endif
+
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libical/libical-as_needed.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libical/libical.spec?r1=1.25&r2=1.26&f=u
More information about the pld-cvs-commit
mailing list