Hello community,

here is the log from the commit of package libkolabxml for openSUSE:Factory 
checked in at 2014-08-11 10:06:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
 and      /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libkolabxml"

Changes:
--------
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes  2014-02-01 
08:43:47.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes     
2014-08-11 10:07:00.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Aug  4 13:31:17 UTC 2014 - [email protected]
+
+- Added patch libkolabxml-1.0.1_xsd_type.patch
+  - Fix compatibility with xsd 4.0.0
+
+-------------------------------------------------------------------

New:
----
  libkolabxml-1.0.1_xsd_type.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libkolabxml.spec ++++++
--- /var/tmp/diff_new_pack.mVi9EV/_old  2014-08-11 10:07:01.000000000 +0200
+++ /var/tmp/diff_new_pack.mVi9EV/_new  2014-08-11 10:07:01.000000000 +0200
@@ -37,6 +37,8 @@
 Patch1:         libkolabxml-1.0.1_csharp_bindings.patch
 # PATCH-FIX-SLE libkolabxml-1.0.1_no-maybe-uninitialized.patch -- Fix php and 
python bindings on SLE 11
 Patch2:         libkolabxml-1.0.1_no-maybe-uninitialized.patch
+# PATCH-FIX-UPSTREAM -- Fix compatibility with xsd 4.0.0
+Patch3:         libkolabxml-1.0.1_xsd_type.patch
 BuildRequires:  boost-devel
 BuildRequires:  cmake >= 2.6
 BuildRequires:  gcc-c++
@@ -191,6 +193,7 @@
 %patch2 -p1
 %endif
 %patch1 -p1
+%patch3 -p1
 
 %build
   export CXXFLAGS="%{optflags}"

++++++ libkolabxml-1.0.1_xsd_type.patch ++++++
diff -Ppru libkolabxml-1.0.1.orig/src/shared_conversions.h 
libkolabxml-1.0.1.xsd_4.0/src/shared_conversions.h
--- libkolabxml-1.0.1.orig/src/shared_conversions.h     2013-10-30 
17:48:07.000000000 +0100
+++ libkolabxml-1.0.1.xsd_4.0/src/shared_conversions.h  2014-08-04 
17:05:42.107654516 +0200
@@ -29,7 +29,11 @@ namespace Kolab {
 typedef boost::shared_ptr<cDateTime> cDateTimePtr;
 
 typedef ::xsd::cxx::tree::type type;
+#if (XSD_INT_VERSION >= 4000000L)
+typedef ::xsd::cxx::tree::simple_type< char, type > simple_type;
+#else
 typedef ::xsd::cxx::tree::simple_type< type > simple_type;
+#endif
 typedef ::xsd::cxx::tree::date< char, simple_type > date;
 typedef ::xsd::cxx::tree::date_time< char, simple_type > date_time;
 
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to