Request 3098 (accepted)

libkolabxml.spec Changed

@@ -4,6 +4,9 @@
 #!BuildIgnore:	httpd
 %endif
 
+# The cmake macro changed to build out of source by default, which breaks our own out of source build, so disable that.
+%define __cmake_in_source_build 1
+
 %{?!mono_arches: %global mono_arches %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64}
 
 %ifarch %{mono_arches}
@@ -65,7 +68,7 @@
 %else
 Name: libkolabxml
 %endif
-Version: 1.2.1
+Version: 1.3.0
 Release: 1%{?dist}
 Summary: Kolab XML format collection parser library
 
@@ -98,7 +101,7 @@
 BuildRequires: qt4-devel
 %endif
 %endif
-BuildRequires: swig
+BuildRequires: swig >= 4.1
 BuildRequires: uuid-devel
 BuildRequires: xsd
 
@@ -166,14 +169,13 @@
 %if 0%{?with_php} > 0
 Requires: php-devel >= 5.3
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-Requires: plesk-php56-devel
-Requires: plesk-php70-devel
-%endif
-Requires: plesk-php71-devel
+%if 0%{?rhel} < 9
 Requires: plesk-php72-devel
 Requires: plesk-php73-devel
+%endif
 Requires: plesk-php74-devel
+Requires: plesk-php80-devel
+Requires: plesk-php81-devel
 %endif
 %endif
 %if 0%{?with_python} > 0
@@ -195,7 +197,6 @@
 Requires: qt4-devel
 %endif
 %endif
-Requires: swig
 Requires: uuid-devel
 %if 0%{?suse_version}
 Requires: libxerces-c-devel
@@ -261,14 +262,13 @@
 BuildRequires: php >= 5.3
 BuildRequires: php-devel >= 5.3
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-BuildRequires: plesk-php56-devel
-BuildRequires: plesk-php70-devel
-%endif
-BuildRequires: plesk-php71-devel
+%if 0%{?rhel} < 9
 BuildRequires: plesk-php72-devel
 BuildRequires: plesk-php73-devel
+%endif
 BuildRequires: plesk-php74-devel
+BuildRequires: plesk-php80-devel
+BuildRequires: plesk-php81-devel
 %endif
 
 %description -n php-kolabformat
@@ -277,38 +277,7 @@
 %endif
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-%package -n plesk-php56-kolabformat
-Summary: libkolabxml bindings for Plesk's PHP 5.6
-Group: System Environment/Libraries
-Provides: php-bindings(libkolabxml) = %{version}-%{release}
-Requires: libkolabxml%{?_isa} = %{version}
-Requires: plesk-php56
-
-%description -n plesk-php56-kolabformat
-libkolabxml bindings for Plesk's PHP 5.6
-
-%package -n plesk-php70-kolabformat
-Summary: libkolabxml bindings for Plesk's PHP 7.0
-Group: System Environment/Libraries
-Provides: php-bindings(libkolabxml) = %{version}-%{release}
-Requires: libkolabxml%{?_isa} = %{version}
-Requires: plesk-php70
-
-%description -n plesk-php70-kolabformat
-libkolabxml bindings for Plesk's PHP 7.0
-%endif
-
-%package -n plesk-php71-kolabformat
-Summary: libkolabxml bindings for Plesk's PHP 7.1
-Group: System Environment/Libraries
-Provides: php-bindings(libkolabxml) = %{version}-%{release}
-Requires: libkolabxml%{?_isa} = %{version}
-Requires: plesk-php71
-
-%description -n plesk-php71-kolabformat
-libkolabxml bindings for Plesk's PHP 7.1
-
+%if 0%{?rhel} < 9
 %package -n plesk-php72-kolabformat
 Summary: libkolabxml bindings for Plesk's PHP 7.2
 Group: System Environment/Libraries
@@ -329,6 +298,7 @@
 %description -n plesk-php73-kolabformat
 libkolabxml bindings for Plesk's PHP 7.3
 
+%endif
 %package -n plesk-php74-kolabformat
 Summary: libkolabxml bindings for Plesk's PHP 7.4
 Group: System Environment/Libraries
@@ -338,6 +308,27 @@
 
 %description -n plesk-php74-kolabformat
 libkolabxml bindings for Plesk's PHP 7.4
+
+%package -n plesk-php80-kolabformat
+Summary: libkolabxml bindings for Plesk's PHP 8.0
+Group: System Environment/Libraries
+Provides: php-bindings(libkolabxml) = %{version}-%{release}
+Requires: libkolabxml%{?_isa} = %{version}
+Requires: plesk-php80
+
+%description -n plesk-php80-kolabformat
+libkolabxml bindings for Plesk's PHP 8.0
+
+%package -n plesk-php81-kolabformat
+Summary: libkolabxml bindings for Plesk's PHP 8.1
+Group: System Environment/Libraries
+Provides: php-bindings(libkolabxml) = %{version}-%{release}
+Requires: libkolabxml%{?_isa} = %{version}
+Requires: plesk-php81
+
+%description -n plesk-php81-kolabformat
+libkolabxml bindings for Plesk's PHP 8.1
+
 %endif # if 0%{?plesk}
 
 %if 0%{?with_python} > 0
@@ -386,24 +377,22 @@
 %endif
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-cp -a libkolabxml-%{version} libkolabxml-%{version}-5.6
-
-cp -a libkolabxml-%{version} libkolabxml-%{version}-7.0
-sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.0/src/php/CMakeLists.txt
-%endif
-
-cp -a libkolabxml-%{version} libkolabxml-%{version}-7.1
-sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.1/src/php/CMakeLists.txt
-
+%if 0%{?rhel} < 9
 cp -a libkolabxml-%{version} libkolabxml-%{version}-7.2
 sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.2/src/php/CMakeLists.txt
 
 cp -a libkolabxml-%{version} libkolabxml-%{version}-7.3
 sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.3/src/php/CMakeLists.txt
 
+%endif
 cp -a libkolabxml-%{version} libkolabxml-%{version}-7.4
 sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.4/src/php/CMakeLists.txt
+
+cp -a libkolabxml-%{version} libkolabxml-%{version}-8.0
+sed -i "s/-php/-php7/g" libkolabxml-%{version}-8.0/src/php/CMakeLists.txt
+
+cp -a libkolabxml-%{version} libkolabxml-%{version}-8.1
+sed -i "s/-php/-php7/g" libkolabxml-%{version}-8.1/src/php/CMakeLists.txt
 %endif
 
 %if 0%{?with_php7}
@@ -426,14 +415,13 @@
 popd
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-cp %{name}-%{version}/tztable.h %{name}-%{version}-5.6/.
-cp %{name}-%{version}/tztable.h %{name}-%{version}-7.0/.
-%endif
-cp %{name}-%{version}/tztable.h %{name}-%{version}-7.1/.
+%if 0%{?rhel} < 9
 cp %{name}-%{version}/tztable.h %{name}-%{version}-7.2/.
 cp %{name}-%{version}/tztable.h %{name}-%{version}-7.3/.
+%endif
 cp %{name}-%{version}/tztable.h %{name}-%{version}-7.4/.
+cp %{name}-%{version}/tztable.h %{name}-%{version}-8.0/.
+cp %{name}-%{version}/tztable.h %{name}-%{version}-8.1/.
 %endif
 %if 0%{?with_python3} > 0
 cp %{name}-%{version}/tztable.h %{name}-%{version}-python3/.
@@ -464,8 +452,6 @@
 %endif
 -DBUILD_SHARED_LIBS:BOOL=ON \
 %else # if 0${?suse_version}
-# The cmake macro changed to build out of source by default, which breaks our own out of source build, so disable that.
-%define __cmake_in_source_build 1
 %cmake \
 %endif
 -DBoost_NO_BOOST_CMAKE=TRUE \
@@ -523,10 +509,10 @@
 
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-for version in 5.6 7.0 7.1 7.2 7.3 7.4; do
+%if 0%{?rhel} < 9
+for version in 7.2 7.3 7.4 8.0 8.1; do
 %else
-for version in 7.1 7.2 7.3 7.4; do
+for version in 7.4 8.0 8.1; do
 %endif
 pushd %{name}-%{version}-${version}
 rm -rf build
@@ -565,7 +551,6 @@
 mkdir -p \
 %{buildroot}/%{_datadir}/%{php} \
 %{buildroot}/%{php_inidir}/
-mv %{buildroot}/%{php_extdir}/kolabformat.php %{buildroot}/%{_datadir}/%{php}/kolabformat.php
 cat > %{buildroot}/%{php_inidir}/kolabformat.ini << EOF
 extension=kolabformat.so
 EOF
@@ -581,10 +566,10 @@
 %endif
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-for version in 5.6 7.0 7.1 7.2 7.3 7.4; do
+%if 0%{?rhel} < 9
+for version in 7.2 7.3 7.4 8.0 8.1; do
 %else
-for version in 7.1 7.2 7.3 7.4; do
+for version in 7.4 8.0 8.1; do
 %endif
 pushd %{name}-%{version}-${version}
 pushd build
@@ -596,10 +581,6 @@
 %{buildroot}/opt/plesk/php/${version}/etc/php.d/ \
 %{buildroot}/opt/plesk/php/${version}/etc/php-fpm.d/
 
- mv \
- %{buildroot}/opt/plesk/php/${version}/lib64/php/modules/kolabformat.php \
- %{buildroot}/opt/plesk/php/${version}/share/php/kolabformat.php
-
 echo "extension=kolabformat.so" > %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolabformat.ini
 cp %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolabformat.ini \
 %{buildroot}/opt/plesk/php/${version}/etc/php-fpm.d/
@@ -632,11 +613,12 @@
 %endif
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-for version in 5.6 7.0 7.1 7.2 7.3 7.4; do
+%if 0%{?rhel} < 9
+for version in 7.2 7.3 7.4 8.0 8.1; do
 %else
-for version in 7.1 7.2 7.3 7.4; do
+for version in 7.4 8.0 8.1; do
 %endif
+
 pushd %{name}-%{version}-${version}/build/
 export LD_LIBRARY_PATH=$( pwd )/src/
 /opt/plesk/php/${version}/bin/php -d enable_dl=On -dextension=src/php/kolabformat.so src/php/test.php ||:
@@ -683,55 +665,42 @@
 %if 0%{?with_php} > 0
 %files -n php-kolabformat
 %defattr(-,root,root,-)
-%{_datadir}/%{php}/kolabformat.php
 %{php_extdir}/kolabformat.so
 %config(noreplace) %{php_inidir}/kolabformat.ini
 
 %if 0%{?plesk}
-%if 0%{?rhel} < 8 || 0%{?fedora}
-%files -n plesk-php56-kolabformat
-%defattr(-,root,root,-)
-/opt/plesk/php/5.6/lib64/php/modules/kolabformat.so
-/opt/plesk/php/5.6/share/php/kolabformat.php
-/opt/plesk/php/5.6/etc/php.d/kolabformat.ini
-/opt/plesk/php/5.6/etc/php-fpm.d/kolabformat.ini
-
-%files -n plesk-php70-kolabformat
-%defattr(-,root,root,-)
-/opt/plesk/php/7.0/lib64/php/modules/kolabformat.so
-/opt/plesk/php/7.0/share/php/kolabformat.php
-/opt/plesk/php/7.0/etc/php.d/kolabformat.ini
-/opt/plesk/php/7.0/etc/php-fpm.d/kolabformat.ini
-%endif
-
-%files -n plesk-php71-kolabformat
-%defattr(-,root,root,-)
-/opt/plesk/php/7.1/lib64/php/modules/kolabformat.so
-/opt/plesk/php/7.1/share/php/kolabformat.php
-/opt/plesk/php/7.1/etc/php.d/kolabformat.ini
-/opt/plesk/php/7.1/etc/php-fpm.d/kolabformat.ini
-
+%if 0%{?rhel} < 9
 %files -n plesk-php72-kolabformat
 %defattr(-,root,root,-)
 /opt/plesk/php/7.2/lib64/php/modules/kolabformat.so
-/opt/plesk/php/7.2/share/php/kolabformat.php
 /opt/plesk/php/7.2/etc/php.d/kolabformat.ini
 /opt/plesk/php/7.2/etc/php-fpm.d/kolabformat.ini
 
 %files -n plesk-php73-kolabformat
 %defattr(-,root,root,-)
 /opt/plesk/php/7.3/lib64/php/modules/kolabformat.so
-/opt/plesk/php/7.3/share/php/kolabformat.php
 /opt/plesk/php/7.3/etc/php.d/kolabformat.ini
 /opt/plesk/php/7.3/etc/php-fpm.d/kolabformat.ini
 
+%endif
 %files -n plesk-php74-kolabformat
 %defattr(-,root,root,-)
 /opt/plesk/php/7.4/lib64/php/modules/kolabformat.so
-/opt/plesk/php/7.4/share/php/kolabformat.php
 /opt/plesk/php/7.4/etc/php.d/kolabformat.ini
 /opt/plesk/php/7.4/etc/php-fpm.d/kolabformat.ini
 
+%files -n plesk-php80-kolabformat
+%defattr(-,root,root,-)
+/opt/plesk/php/8.0/lib64/php/modules/kolabformat.so
+/opt/plesk/php/8.0/etc/php.d/kolabformat.ini
+/opt/plesk/php/8.0/etc/php-fpm.d/kolabformat.ini
+
+%files -n plesk-php81-kolabformat
+%defattr(-,root,root,-)
+/opt/plesk/php/8.1/lib64/php/modules/kolabformat.so
+/opt/plesk/php/8.1/etc/php.d/kolabformat.ini
+/opt/plesk/php/8.1/etc/php-fpm.d/kolabformat.ini
+
 %endif # if 0%{?plesk}
 
 %endif # if 0%{?with_php}

debian.changelog Changed

debian.control Changed

debian.rules Changed

@@ -5,7 +5,7 @@
 PHPEXT := $(shell php-config --extension-dir)
 PHPINC := $(shell php-config --include-dir)
 
-PHP_VERSIONS=7.4 7.3 7.2 7.1 7.0 5.6
+PHP_VERSIONS=8.1 8.0 7.4 7.3 7.2
 
 export DH_VERBOSE=1
 export DH_OPTIONS=-v
@@ -35,7 +35,6 @@
 			sed -i -e "/Files:/ i\
  plesk-php$${shver}-kolabformat deb web extra" debian/control ; \
 			echo "opt/plesk/php/$${version}/lib/php/modules/*.so" >> debian/plesk-php$${shver}-kolabformat.install ; \
-			echo "opt/plesk/php/$${version}/share/php/kolabformat.php" >> debian/plesk-php$${shver}-kolabformat.install ; \
 			echo "debian/kolabformat.ini opt/plesk/php/$${version}/etc/php.d" >> debian/plesk-php$${shver}-kolabformat.install ; \
 		done ; \
 	fi
@@ -126,22 +125,19 @@
 	# which has to be determined dynamically, so we can't put it into an .install file.
 	mkdir -p debian/tmp/usr/share/php
 	make -C php-vanilla install DESTDIR=$(PWD)/debian/tmp/ ; \
-	mv -v debian/tmp/usr/lib/php*/$(PHPAPI)/kolabformat.php debian/tmp/usr/share/php/kolabformat.php
 
-	if  -d "/etc/php/7.4/mods-available/" ; then \
+	if  -d "/etc/php/8.1/mods-available/" ; then \
+		echo "debian/kolabformat.ini etc/php/8.1/mods-available" >> debian/php-kolabformat.install ; \
+	elif  -d "/etc/php/8.0/mods-available/" ; then \
+		echo "debian/kolabformat.ini etc/php/8.0/mods-available" >> debian/php-kolabformat.install ; \
+	elif  -d "/etc/php/7.4/mods-available/" ; then \
 		echo "debian/kolabformat.ini etc/php/7.4/mods-available" >> debian/php-kolabformat.install ; \
 	elif  -d "/etc/php/7.3/mods-available/" ; then \
 		echo "debian/kolabformat.ini etc/php/7.3/mods-available" >> debian/php-kolabformat.install ; \
 	elif  -d "/etc/php/7.2/mods-available/" ; then \
 		echo "debian/kolabformat.ini etc/php/7.2/mods-available" >> debian/php-kolabformat.install ; \
-	elif  -d "/etc/php/7.1/mods-available/" ; then \
-		echo "debian/kolabformat.ini etc/php/7.1/mods-available" >> debian/php-kolabformat.install ; \
-	elif  -d "/etc/php/7.0/mods-available/" ; then \
-		echo "debian/kolabformat.ini etc/php/7.0/mods-available" >> debian/php-kolabformat.install ; \
-	elif  -d "/etc/php/mods-available/" ; then \
-		echo "debian/kolabformat.ini etc/php/mods-available" >> debian/php-kolabformat.install ; \
 	else \
-		echo "debian/kolabformat.ini etc/php5/mods-available" >> debian/php-kolabformat.install ; \
+		echo "debian/kolabformat.ini etc/php/mods-available" >> debian/php-kolabformat.install ; \
 	fi
 
 	if  -f /etc/plesk-release ; then \
@@ -159,8 +155,6 @@
 			mkdir -p debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/etc/php.d/ ; \
 			mkdir -p debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/share/php/ ; \
 			cp -a debian/kolabformat.ini debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/etc/php.d/ ; \
-			mv -v debian/plesk-php$${shver}-kolabformat$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir)/kolabformat.php \
-				debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/share/php/kolabformat.php || exit 1; \
 			rm -rvf debian/plesk-php$${shver}-kolabformat/usr/ ; \
 			find debian/plesk-php$${shver}-kolabformat/ | sort ; \
 		done ; \

debian.tar.gz/php-kolabformat.install Changed

libkolabxml-1.2.1.tar.gz/CMakeLists.txt -> libkolabxml-1.3.0.tar.gz/CMakeLists.txt Changed

@@ -38,9 +38,9 @@
 # 0.2 (0.2 development version)
 
 set (Libkolabxml_VERSION_MAJOR 1)
-set (Libkolabxml_VERSION_MINOR 2)
+set (Libkolabxml_VERSION_MINOR 3)
 # Enable the full x.y.z version only for release versions
-set (Libkolabxml_VERSION_PATCH 1)
+set (Libkolabxml_VERSION_PATCH 0)
 set (Libkolabxml_VERSION "${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}.${Libkolabxml_VERSION_PATCH}" )
 #set (Libkolabxml_VERSION "${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}" )
 
@@ -145,7 +145,7 @@
 # --generate-inline --extern-xml-schema xml-schema.xsd
 # --cxx-suffix .cpp --hxx-suffix .h   
 add_custom_command(OUTPUT ${SCHEMA_SOURCEFILES}
-    COMMAND ${XSDCXX} cxx-tree --generate-polymorphic --generate-serialization  --namespace-map http://kolab.org=KolabXSD --root-element icalendar --root-element vcards --root-element note --root-element configuration --root-element file --output-dir ${CMAKE_BINARY_DIR}/bindings ${SCHEMAS}
+    COMMAND ${XSDCXX} cxx-tree --std c++11 --generate-polymorphic --generate-serialization  --namespace-map http://kolab.org=KolabXSD --root-element icalendar --root-element vcards --root-element note --root-element configuration --root-element file --output-dir ${CMAKE_BINARY_DIR}/bindings ${SCHEMAS}
     COMMENT "Generating XSD bindings"
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     DEPENDS ${SCHEMAS}

libkolabxml-1.2.1.tar.gz/compiled/XMLParserWrapper.cpp -> libkolabxml-1.3.0.tar.gz/compiled/XMLParserWrapper.cpp Changed

@@ -17,7 +17,7 @@
 
 #include "XMLParserWrapper.h"
 
-#include <memory> // std::auto_ptr
+#include <memory> // std::unique_ptr
 #include <fstream>
 #include <iostream>
 
@@ -226,7 +226,7 @@
 
 }
 
-xsd::cxx::xml::dom::auto_ptr< xercesc::DOMDocument > XMLParserWrapper::parseFile(const std::string& url)
+std::unique_ptr< xercesc::DOMDocument > XMLParserWrapper::parseFile(const std::string& url)
 {
 try {
 std::ifstream ifs;
@@ -237,17 +237,17 @@
 {
 std::cerr << ": unable to open or read failure" << std::endl;
 }
- return xsd::cxx::xml::dom::auto_ptr< xercesc::DOMDocument >();
+ return std::unique_ptr< xercesc::DOMDocument >();
 }
 
-xsd::cxx::xml::dom::auto_ptr< xercesc::DOMDocument > XMLParserWrapper::parseString(const std::string& s)
+std::unique_ptr< xercesc::DOMDocument > XMLParserWrapper::parseString(const std::string& s)
 {
 std::istringstream is(s);
 return parse(is, ""); //TODO set identifier?
 }
 
 
-xml_schema::dom::auto_ptr<xercesc::DOMDocument> XMLParserWrapper::parse(std::istream &ifs, const std::string &name)
+std::unique_ptr<xercesc::DOMDocument> XMLParserWrapper::parse(std::istream &ifs, const std::string &name)
 {
 using namespace std;
 
@@ -268,9 +268,9 @@
 // Parse XML to DOM.
 //
 #if _XERCES_VERSION >= 30000
- xml_schema::dom::auto_ptr<DOMDocument> doc (parser->parse (&wrap));
+ std::unique_ptr<DOMDocument> doc (parser->parse (&wrap));
 #else
- xml_schema::dom::auto_ptr<DOMDocument> doc (parser->parse (wrap));
+ std::unique_ptr<DOMDocument> doc (parser->parse (wrap));
 #endif
 
 eh.throw_if_failed<xml_schema::parsing> ();
@@ -291,5 +291,5 @@
 cerr << ": unknown exception thrown" << endl;
 }
 eh.reset();
- return xml_schema::dom::auto_ptr<xercesc::DOMDocument>();
+ return std::unique_ptr<xercesc::DOMDocument>();
 }

libkolabxml-1.2.1.tar.gz/compiled/XMLParserWrapper.h -> libkolabxml-1.3.0.tar.gz/compiled/XMLParserWrapper.h Changed

libkolabxml-1.2.1.tar.gz/compiled/xsdbin.cxx -> libkolabxml-1.3.0.tar.gz/compiled/xsdbin.cxx Changed

libkolabxml-1.2.1.tar.gz/src/CMakeLists.txt -> libkolabxml-1.3.0.tar.gz/src/CMakeLists.txt Changed

libkolabxml-1.2.1.tar.gz/src/containers/kolabcontainers.cpp -> libkolabxml-1.3.0.tar.gz/src/containers/kolabcontainers.cpp Changed

libkolabxml-1.2.1.tar.gz/src/kolabconversions.h -> libkolabxml-1.3.0.tar.gz/src/kolabconversions.h Changed

@@ -409,16 +409,16 @@
 boost::shared_ptr<Kolab::Note> deserializeObject <Kolab::Note> (const std::string& s, bool isUrl)
 {
 try {
- std::auto_ptr<KolabXSD::Note> note;
+ std::unique_ptr<KolabXSD::Note> note;
 if (isUrl) {
- xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
+ std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
 if (doc.get()) {
- note = KolabXSD::note(doc);
+ note = KolabXSD::note(*doc);
 }
 } else {
- xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
+ std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
 if (doc.get()) {
- note = KolabXSD::note(doc);
+ note = KolabXSD::note(*doc);
 }
 }
 
@@ -499,16 +499,16 @@
 boost::shared_ptr<Kolab::Configuration> deserializeObject <Kolab::Configuration> (const std::string& s, bool isUrl)
 {
 try {
- std::auto_ptr<KolabXSD::Configuration> configuration;
+ std::unique_ptr<KolabXSD::Configuration> configuration;
 if (isUrl) {
- xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
+ std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
 if (doc.get()) {
- configuration = KolabXSD::configuration(doc);
+ configuration = KolabXSD::configuration(*doc);
 }
 } else {
- xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
+ std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
 if (doc.get()) {
- configuration = KolabXSD::configuration(doc);
+ configuration = KolabXSD::configuration(*doc);
 }
 }
 
@@ -629,16 +629,16 @@
 boost::shared_ptr<Kolab::File> deserializeObject <Kolab::File> (const std::string& s, bool isUrl)
 {
 try {
- std::auto_ptr<KolabXSD::File> file;
+ std::unique_ptr<KolabXSD::File> file;
 if (isUrl) {
- xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
+ std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
 if (doc.get()) {
- file = KolabXSD::file(doc);
+ file = KolabXSD::file(*doc);
 }
 } else {
- xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
+ std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
 if (doc.get()) {
- file = KolabXSD::file(doc);
+ file = KolabXSD::file(*doc);
 }
 }

libkolabxml-1.2.1.tar.gz/src/php/CMakeLists.txt -> libkolabxml-1.3.0.tar.gz/src/php/CMakeLists.txt Changed

libkolabxml-1.2.1.tar.gz/src/xcalconversions.h -> libkolabxml-1.3.0.tar.gz/src/xcalconversions.h Changed

@@ -132,9 +132,9 @@
 }
 
 template <typename T>
-std::auto_ptr<T> fromStringList(const std::vector<std::string> &list)
+std::unique_ptr<T> fromStringList(const std::vector<std::string> &list)
 {
- std::auto_ptr<T> ptr(new T());
+ std::unique_ptr<T> ptr(new T());
 std::copy(list.begin(), list.end(), std::back_inserter(ptr->text()));
 return ptr;
 }
@@ -509,9 +509,9 @@
 }
 
 template <typename I>
-std::auto_ptr fromDate(const cDateTime &dt)
+std::unique_ptr fromDate(const cDateTime &dt)
 {
- std::auto_ptr ptr(new I);
+ std::unique_ptr ptr(new I);
 if (dt.isDateOnly()) {
 ptr->date(Shared::fromDate(dt));
 } else {
@@ -557,10 +557,10 @@
 }
 
 template <typename I>
-std::auto_ptr fromDateTimeList(const std::vector<cDateTime> &dtlist)
+std::unique_ptr fromDateTimeList(const std::vector<cDateTime> &dtlist)
 {
 
- std::auto_ptr ptr(new I);
+ std::unique_ptr ptr(new I);
 BOOST_FOREACH(const cDateTime &dt, dtlist) {
 if (dt.isDateOnly()) {
 ptr->date().push_back(Shared::fromDate(dt));
@@ -678,7 +678,7 @@
 
 //=== Recurrence Rule ===
 
- typedef std::auto_ptr<RecurrenceRule> RecurrencePtr;
+ typedef std::unique_ptr<RecurrenceRule> RecurrencePtr;
 
 
 RecurrenceRule::Frequency mapRecurrenceFrequency(const icalendar_2_0::RecurType::freq_type &freq)
@@ -1031,11 +1031,11 @@
 return list;
 }
 
-std::auto_ptr< icalendar_2_0::RrulePropType > recurrenceProperty(const RecurrenceRule &r)
+std::unique_ptr< icalendar_2_0::RrulePropType > recurrenceProperty(const RecurrenceRule &r)
 {
 using namespace icalendar_2_0;
 
- std::auto_ptr< RrulePropType > rruleProp(new RrulePropType(mapRecurrenceFrequency(r.frequency())));
+ std::unique_ptr< RrulePropType > rruleProp(new RrulePropType(mapRecurrenceFrequency(r.frequency())));
 
 RecurPropertyType::recur_type &recur = rruleProp->recur();
 const cDateTime &endDate = r.end();
@@ -1271,7 +1271,7 @@
 }
 
 if (inc.recurrenceID().isValid()) {
- std::auto_ptr<typename properties::recurrence_id_type> recurrenceId = fromDate<typename properties::recurrence_id_type>(inc.recurrenceID());
+ std::unique_ptr<typename properties::recurrence_id_type> recurrenceId = fromDate<typename properties::recurrence_id_type>(inc.recurrenceID());
 if (inc.thisAndFuture()) {
 if (!recurrenceId->parameters()) {
 recurrenceId->parameters(typename properties::recurrence_id_type::parameters_type());
@@ -1281,7 +1281,7 @@
 parameters.baseParameter().push_back(range);
 }
 
- prop.recurrence_id(recurrenceId);
+ prop.recurrence_id(std::move(recurrenceId));
 }
 
 if (inc.priority() != 0) {
@@ -1332,14 +1332,14 @@
 trigger.parameters(parameters);
 }
 
- std::auto_ptr<PropType> p;
+ std::unique_ptr<PropType> p;
 switch(alarm.type()) {
 case Kolab::Alarm::DisplayAlarm:
- p = std::auto_ptr<PropType>(new PropType(PropType::action_type(DISPLAYALARM), trigger));
+ p = std::unique_ptr<PropType>(new PropType(PropType::action_type(DISPLAYALARM), trigger));
 p->description(PropType::description_type(alarm.description()));
 break;
 case Kolab::Alarm::EMailAlarm: {
- p = std::auto_ptr<PropType>(new PropType(PropType::action_type(EMAILALARM), trigger));
+ p = std::unique_ptr<PropType>(new PropType(PropType::action_type(EMAILALARM), trigger));
 p->summary(PropType::summary_type(alarm.summary()));
 p->description(PropType::description_type(alarm.description()));
 const std::vector<Kolab::ContactReference> &l = alarm.attendees();
@@ -1349,7 +1349,7 @@
 break;
 }
 case Kolab::Alarm::AudioAlarm:
- p = std::auto_ptr<PropType>(new PropType(PropType::action_type(AUDIOALARM), trigger));
+ p = std::unique_ptr<PropType>(new PropType(PropType::action_type(AUDIOALARM), trigger));
 p->description(PropType::description_type(alarm.description()));
 if (alarm.audioFile().isValid()) {
 p->attach(fromAttachment(alarm.audioFile()));
@@ -1363,7 +1363,7 @@
 p->repeat(PropType::repeat_type(fromInt<PropType::repeat_type::integer_type>(alarm.numrepeat())));
 }
 
- components.valarm().push_back(icalendar_2_0::ValarmType(p));
+ components.valarm().push_back(icalendar_2_0::ValarmType(std::move(p)));
 }
 }
 
@@ -1926,19 +1926,19 @@
 typedef typename T::KolabType KolabType;
 
 try {
- std::auto_ptr<icalendar_2_0::IcalendarType> icalendar;
+ std::unique_ptr<icalendar_2_0::IcalendarType> icalendar;
 if (isUrl) {
- xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
+ std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
 if (doc.get()) {
- icalendar = icalendar_2_0::icalendar(doc);
+ icalendar = icalendar_2_0::icalendar(*doc);
 }
 } else {
- xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
+ std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
 if (doc.get()) {
- icalendar = icalendar_2_0::icalendar(doc);
+ icalendar = icalendar_2_0::icalendar(*doc);
 }
 }
- 
+
 if (!icalendar.get()) {
 CRITICAL("Failed to parse calendar!");
 return IncidencePtr();

libkolabxml-1.2.1.tar.gz/src/xcardconversions.h -> libkolabxml-1.3.0.tar.gz/src/xcardconversions.h Changed

libkolabxml-1.2.1.tar.gz/tests/CMakeLists.txt -> libkolabxml-1.3.0.tar.gz/tests/CMakeLists.txt Changed

libkolabxml.dsc Changed

@@ -2,7 +2,7 @@
 Source: libkolabxml
 Binary: libkolabxml1v5, php-kolabformat, python-kolabformat, libkolabxml-dev
 Architecture: any
-Version: 1.2.1-0~kolab3
+Version: 1.3.0-0~kolab1
 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
 Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
 Homepage: http://git.kolab.org/libkolabxml
@@ -18,18 +18,16 @@
 libossp-uuid-dev,
 qtbase5-dev,
 libxerces-c-dev,
- php-cgi | php5-cli,
- php-dev | php5-dev,
+ php-cgi,
+ php-dev,
 psa | bash,
- plesk-php70-dev | plesk-php71-dev | plesk-php72-dev | plesk-php73-dev | plesk-php74-dev | bash,
- plesk-php71-dev | plesk-php72-dev | plesk-php73-dev | plesk-php74-dev | bash,
 plesk-php72-dev | plesk-php73-dev | plesk-php74-dev | bash,
 plesk-php73-dev | plesk-php74-dev | bash,
 plesk-php74-dev | bash,
 python2-dev | python-dev,
 python-minimal | python2-minimal,
 python3-all-dev,
- swig (>= 2.0),
+ swig4.0 (>= 4.1),
 xsdcxx
 Package-List:
 libkolabxml-dev deb libdevel optional
@@ -37,5 +35,5 @@
 php-kolabformat deb libs optional
 python-kolabformat deb python optional
 Files:
- 00000000000000000000000000000000 0 libkolabxml-1.2.1.tar.gz
+ 00000000000000000000000000000000 0 libkolabxml-1.3.0.tar.gz
 00000000000000000000000000000000 0 debian.tar.gz

Overview

Request 3098 (accepted)

Request History