Projects
home:sicherha:branches:Kolab:16
libkolab
Log In
Username
Password
Problem getting expanded diff: bad link: conflict in file debian.control
×
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 8
View file
libkolab.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 + %{expand: %(if `php-config --vernum` -gt 70000 ; then echo %%global with_php7 1; else echo %%global with_php7 0; fi)} %if 0%{?suse_version} @@ -18,6 +21,11 @@ %{!?php_apiver: %global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)} +%if 0%{?rhel} > 8 +%global with_python 0 +%else +%global with_python 1 +%endif %global with_python3 1 %{?filter_setup: @@ -33,7 +41,7 @@ Name: libkolab %endif -Version: 3.0.2 +Version: 3.2.0 Release: 1%{?dist} Summary: Kolab Object Handling Library @@ -44,34 +52,29 @@ Source0: libkolab-%{version}.tar.gz BuildRequires: cmake -%if 0%{?rhel} > 7 || 0%{?fedora} BuildRequires: kf5-kcalendarcore-devel BuildRequires: kf5-kmime-devel -%else -# Note: available within kolabsys.com infrastructure only, as being (essentially) a -# fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6. -BuildRequires: libcalendaring-devel >= 4.9.1 -%endif %if 0%{?suse_version} BuildRequires: qt-devel %else BuildRequires: qt5-qtbase-devel %endif BuildRequires: libcurl-devel -BuildRequires: libkolabxml-devel >= 1.0 +BuildRequires: libkolabxml-devel >= 1.2 BuildRequires: make BuildRequires: php >= 5.3 BuildRequires: php-devel >= 5.3 +BuildRequires: swig >= 4.1 %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 +BuildRequires: plesk-php82-devel %endif BuildRequires: python3-devel @@ -87,18 +90,12 @@ %endif Summary: Kolab library development headers Requires: libkolab%{?_isa} = %{version} -%if 0%{?rhel} > 7 || 0%{?fedora} BuildRequires: kf5-kcalendarcore-devel BuildRequires: kf5-kmime-devel %if 0%{?fedora} >= 21 # Fedora 21 has qca2 and qca, qca2 has been renamed to qca BuildRequires: qca %endif -%else -# Note: available within kolabsys.com infrastructure only, as being (essentially) a -# fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6. -BuildRequires: libcalendaring-devel >= 4.9.1 -%endif Requires: libkolabxml-devel >= 1.0 Requires: php-devel Requires: pkgconfig @@ -131,38 +128,7 @@ PHP Bindings for libkolab %if 0%{?plesk} -%if 0%{?rhel} < 8 || 0%{?fedora} -%package -n plesk-php56-kolab -Summary: libkolab bindings for Plesk's PHP 5.6 -Group: System Environment/Libraries -Provides: php-bindings(libkolab) = %{version}-%{release} -Requires: libkolab%{?_isa} = %{version} -Requires: plesk-php56 - -%description -n plesk-php56-kolab -libkolab bindings for Plesk's PHP 5.6 - -%package -n plesk-php70-kolab -Summary: libkolab bindings for Plesk's PHP 7.0 -Group: System Environment/Libraries -Provides: php-bindings(libkolab) = %{version}-%{release} -Requires: libkolab%{?_isa} = %{version} -Requires: plesk-php70 - -%description -n plesk-php70-kolab -libkolab bindings for Plesk's PHP 7.0 -%endif - -%package -n plesk-php71-kolab -Summary: libkolab bindings for Plesk's PHP 7.1 -Group: System Environment/Libraries -Provides: php-bindings(libkolab) = %{version}-%{release} -Requires: libkolab%{?_isa} = %{version} -Requires: plesk-php71 - -%description -n plesk-php71-kolab -libkolab bindings for Plesk's PHP 7.1 - +%if 0%{?rhel} < 9 %package -n plesk-php72-kolab Summary: libkolab bindings for Plesk's PHP 7.2 Group: System Environment/Libraries @@ -183,6 +149,7 @@ %description -n plesk-php73-kolab libkolab bindings for Plesk's PHP 7.3 +%endif %package -n plesk-php74-kolab Summary: libkolab bindings for Plesk's PHP 7.4 Group: System Environment/Libraries @@ -192,6 +159,37 @@ %description -n plesk-php74-kolab libkolab bindings for Plesk's PHP 7.4 + +%package -n plesk-php80-kolab +Summary: libkolab bindings for Plesk's PHP 8.0 +Group: System Environment/Libraries +Provides: php-bindings(libkolab) = %{version}-%{release} +Requires: libkolab%{?_isa} = %{version} +Requires: plesk-php80 + +%description -n plesk-php80-kolab +libkolab bindings for Plesk's PHP 8.0 + +%package -n plesk-php81-kolab +Summary: libkolab bindings for Plesk's PHP 8.1 +Group: System Environment/Libraries +Provides: php-bindings(libkolab) = %{version}-%{release} +Requires: libkolab%{?_isa} = %{version} +Requires: plesk-php81 + +%description -n plesk-php81-kolab +libkolab bindings for Plesk's PHP 8.1 + +%package -n plesk-php82-kolab +Summary: libkolab bindings for Plesk's PHP 8.2 +Group: System Environment/Libraries +Provides: php-bindings(libkolab) = %{version}-%{release} +Requires: libkolab%{?_isa} = %{version} +Requires: plesk-php82 + +%description -n plesk-php82-kolab +libkolab bindings for Plesk's PHP 8.2 + %endif %package -n python-kolab @@ -228,24 +226,25 @@ popd %if 0%{?plesk} -%if 0%{?rhel} < 8 || 0%{?fedora} -cp -a libkolab-%{version} libkolab-%{version}-5.6 - -cp -a libkolab-%{version} libkolab-%{version}-7.0 -sed -i "s/-php/-php7/g" libkolab-%{version}-7.0/cmake/modules/SWIGUtils.cmake -%endif - -cp -a libkolab-%{version} libkolab-%{version}-7.1 -sed -i "s/-php/-php7/g" libkolab-%{version}-7.1/cmake/modules/SWIGUtils.cmake - +%if 0%{?rhel} < 9 cp -a libkolab-%{version} libkolab-%{version}-7.2 sed -i "s/-php/-php7/g" libkolab-%{version}-7.2/cmake/modules/SWIGUtils.cmake cp -a libkolab-%{version} libkolab-%{version}-7.3 sed -i "s/-php/-php7/g" libkolab-%{version}-7.3/cmake/modules/SWIGUtils.cmake +%endif cp -a libkolab-%{version} libkolab-%{version}-7.4 sed -i "s/-php/-php7/g" libkolab-%{version}-7.4/cmake/modules/SWIGUtils.cmake + +cp -a libkolab-%{version} libkolab-%{version}-8.0 +sed -i "s/-php/-php7/g" libkolab-%{version}-8.0/cmake/modules/SWIGUtils.cmake + +cp -a libkolab-%{version} libkolab-%{version}-8.1 +sed -i "s/-php/-php7/g" libkolab-%{version}-8.1/cmake/modules/SWIGUtils.cmake + +cp -a libkolab-%{version} libkolab-%{version}-8.2 +sed -i "s/-php/-php7/g" libkolab-%{version}-8.2/cmake/modules/SWIGUtils.cmake %endif %if 0%{?with_php7} @@ -254,6 +253,10 @@ popd %endif +%if 0%{?with_python} +cp -a libkolab-%{version} libkolab-%{version}-python2 +%endif + %if 0%{?with_python3} cp -a libkolab-%{version} libkolab-%{version}-python3 %endif @@ -290,18 +293,34 @@ -DBoost_NO_BOOST_CMAKE=TRUE \ -Wno-fatal-errors -Wno-errors \ -DINCLUDE_INSTALL_DIR=%{_includedir} \ -%if 0%{?rhel} < 8 && 0%{?fedora} < 20 - -DUSE_LIBCALENDARING=ON \ -%endif -DPHP_BINDINGS=ON \ -DPHP_INSTALL_DIR=%{php_extdir} \ - -DPYTHON_BINDINGS=ON \ - -DPYTHON_INSTALL_DIR=%{python2_sitearch} \ .. make popd popd +%if 0%{with_python} + pushd %{name}-%{version}-python2 + rm -rf build + mkdir -p build + pushd build + %cmake \ + -DCMAKE_C_FLAGS:STRING="-DNDEBUG -DQT_NO_DEBUG" \ + -DBoost_NO_BOOST_CMAKE=TRUE \ + -Wno-fatal-errors -Wno-errors \ + -DINCLUDE_INSTALL_DIR=%{_includedir} \ +%if 0%{?rhel} >= 8 || 0%{?fedora} + -DQT5_BUILD=ON \ +%endif + -DINCLUDE_INSTALL_DIR=%{_includedir} \ + -DPYTHON_BINDINGS=ON \ + -DPYTHON_INSTALL_DIR=%{python2_sitearch} \ + .. + make + popd + popd +%endif %if 0%{with_python3} pushd %{name}-%{version}-python3 @@ -317,9 +336,6 @@ -DQT5_BUILD=ON \ %endif -DINCLUDE_INSTALL_DIR=%{_includedir} \ -%if 0%{?rhel} < 8 && 0%{?fedora} < 20 - -DUSE_LIBCALENDARING=ON \ -%endif -DPYTHON_BINDINGS=ON \ -DPYTHON_INSTALL_DIR=%{python3_sitearch} \ .. @@ -330,10 +346,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 8.2; do %else -for version in 7.1 7.2 7.3 7.4; do +for version in 7.4 8.0 8.1 8.2; do %endif pushd %{name}-%{version}-${version} rm -rf build @@ -348,9 +364,6 @@ -DQT5_BUILD=ON \ %endif -DINCLUDE_INSTALL_DIR=%{_includedir} \ -%if 0%{?rhel} < 8 && 0%{?fedora} < 20 - -DUSE_LIBCALENDARING=ON \ -%endif -DPHP_BINDINGS=ON \ -DPHP_INCLUDE_DIR=/opt/plesk/php/${version}/include/php/ \ -DPHP_EXECUTABLE=/opt/plesk/php/${version}/bin/php \ @@ -369,9 +382,6 @@ make install DESTDIR=%{buildroot} popd -mkdir -p %{buildroot}/%{_datadir}/%{php} -mv %{buildroot}/%{php_extdir}/*.php %{buildroot}/%{_datadir}/%{php}/. - mkdir -p %{buildroot}/%{php_inidir} cat >%{buildroot}/%{php_inidir}/kolab.ini <<EOF ; Kolab libraries @@ -387,10 +397,10 @@ EOF %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 8.2; do %else -for version in 7.1 7.2 7.3 7.4; do +for version in 7.4 8.0 8.1 8.2; do %endif pushd %{name}-%{version}-${version} pushd build @@ -398,14 +408,9 @@ popd mkdir -p \ - %{buildroot}/opt/plesk/php/${version}/share/php/ \ %{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/*.php \ - %{buildroot}/opt/plesk/php/${version}/share/php/. - echo "extension=kolabobject.so" > %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini echo "extension=kolabshared.so" >> %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini echo "extension=kolabcalendaring.so" >> %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini @@ -421,13 +426,23 @@ done %endif +%if 0%{?with_python} +pushd %{name}-%{version}-python2 +pushd build +make install DESTDIR=%{buildroot} INSTALL='install -p' +popd touch %{buildroot}/%{python2_sitearch}/kolab/__init__.py +popd +%endif + + %if 0%{?with_python3} pushd %{name}-%{version}-python3 pushd build make install DESTDIR=%{buildroot} INSTALL='install -p' popd touch %{buildroot}/%{python3_sitearch}/kolab/__init__.py +popd %endif %check @@ -464,61 +479,53 @@ %files -n php-kolab %config(noreplace) %{php_inidir}/kolab.ini %config(noreplace) %{php_inidir}/kolabdummy.ini -%{_datadir}/%{php}/kolabcalendaring.php %{php_extdir}/kolabcalendaring.so -%{_datadir}/%{php}/kolabobject.php %{php_extdir}/kolabobject.so -%{_datadir}/%{php}/kolabshared.php %{php_extdir}/kolabshared.so -%{_datadir}/%{php}/dummy.php %{php_extdir}/dummy.so %if 0%{?plesk} -%if 0%{?rhel} < 8 || 0%{?fedora} -%files -n plesk-php56-kolab -%defattr(-,root,root,-) -/opt/plesk/php/5.6/lib64/php/modules/*.so -/opt/plesk/php/5.6/share/php/*.php -/opt/plesk/php/5.6/etc/php.d/*.ini -/opt/plesk/php/5.6/etc/php-fpm.d/*.ini - -%files -n plesk-php70-kolab -%defattr(-,root,root,-) -/opt/plesk/php/7.0/lib64/php/modules/*.so -/opt/plesk/php/7.0/share/php/*.php -/opt/plesk/php/7.0/etc/php.d/*.ini -/opt/plesk/php/7.0/etc/php-fpm.d/*.ini -%endif - -%files -n plesk-php71-kolab -%defattr(-,root,root,-) -/opt/plesk/php/7.1/lib64/php/modules/*.so -/opt/plesk/php/7.1/share/php/*.php -/opt/plesk/php/7.1/etc/php.d/*.ini -/opt/plesk/php/7.1/etc/php-fpm.d/*.ini - +%if 0%{?rhel} < 9 %files -n plesk-php72-kolab %defattr(-,root,root,-) /opt/plesk/php/7.2/lib64/php/modules/*.so -/opt/plesk/php/7.2/share/php/*.php /opt/plesk/php/7.2/etc/php.d/*.ini /opt/plesk/php/7.2/etc/php-fpm.d/*.ini %files -n plesk-php73-kolab %defattr(-,root,root,-) /opt/plesk/php/7.3/lib64/php/modules/*.so -/opt/plesk/php/7.3/share/php/*.php /opt/plesk/php/7.3/etc/php.d/*.ini /opt/plesk/php/7.3/etc/php-fpm.d/*.ini +%endif %files -n plesk-php74-kolab %defattr(-,root,root,-) /opt/plesk/php/7.4/lib64/php/modules/*.so -/opt/plesk/php/7.4/share/php/*.php /opt/plesk/php/7.4/etc/php.d/*.ini /opt/plesk/php/7.4/etc/php-fpm.d/*.ini + +%files -n plesk-php80-kolab +%defattr(-,root,root,-) +/opt/plesk/php/8.0/lib64/php/modules/*.so +/opt/plesk/php/8.0/etc/php.d/*.ini +/opt/plesk/php/8.0/etc/php-fpm.d/*.ini + +%files -n plesk-php81-kolab +%defattr(-,root,root,-) +/opt/plesk/php/8.1/lib64/php/modules/*.so +/opt/plesk/php/8.1/etc/php.d/*.ini +/opt/plesk/php/8.1/etc/php-fpm.d/*.ini + +%files -n plesk-php82-kolab +%defattr(-,root,root,-) +/opt/plesk/php/8.2/lib64/php/modules/*.so +/opt/plesk/php/8.2/etc/php.d/*.ini +/opt/plesk/php/8.2/etc/php-fpm.d/*.ini + %endif +%if 0%{?with_python} > 0 %files -n python-kolab %dir %{python2_sitearch}/kolab/ %{python2_sitearch}/kolab/__init__.py* @@ -528,6 +535,7 @@ %{python2_sitearch}/kolab/kolabobject.py* %{python2_sitearch}/kolab/_shared.so* %{python2_sitearch}/kolab/shared.py* +%endif %if 0%{?with_python3} %files -n python3-kolab
View file
_link
Changed
@@ -1,4 +1,4 @@ -<link project="Kolab:16" baserev="22057b1f601bc2da7f33f3d17acb463f"> +<link project="Kolab:16" baserev="fb06e03a59267b08a95133ee6feb4a7a"> <patches> <branch/> </patches>
View file
debian.changelog
Changed
@@ -1,3 +1,18 @@ +libkolab (3.2.0-0~kolab2) unstable; urgency=low + + * Added support for php 8.2 + * Allow building against legacy kcalcore on buster + + -- Christian Mollekopf <mollekopf@apheleia-it.ch> Thu, 7 Dec 2023 11:09:09 +0100 + +libkolab (3.1.0-0~kolab2) unstable; urgency=low + + * Dropped php < 7.2 + * Added support for php 8.0, 8.1 + * Require swig 4.1 + + -- Christian Mollekopf <mollekopf@apheleia-it.ch> Fri, 31 Mar 2023 11:09:09 +0100 + libkolab (3.0.2-0~kolab1) unstable; urgency=low * New upstream release
View file
debian.control
Changed
@@ -8,25 +8,28 @@ debhelper, dh-python, libcurl4-gnutls-dev, - libkolabxml-dev (>= 1.0), + libkolabxml-dev (>= 1.3), libossp-uuid-dev, + libboost-dev, + libboost-system-dev, + libboost-thread-dev, qtbase5-dev, libkf5coreaddons-dev, libkf5calendarcore-dev, libkf5mime-dev, libxerces-c-dev, - php-cgi | php5-cli, - php-dev | php5-dev, - plesk-php70-dev | bash, - plesk-php71-dev | bash, - plesk-php72-dev | bash, + php-cgi, + php-dev, plesk-php73-dev | bash, plesk-php74-dev | bash, + plesk-php80-dev | bash, + plesk-php81-dev | bash, + plesk-php82-dev | bash, psa | bash, - python2-dev | python-dev, - python-minimal | python2-minimal, + python2-dev | python-dev | python3-dev, + python-minimal | python2-minimal | python3-minimal, python3-all-dev, - swig (>= 2.0) + swig4.0 (>= 4.1) X-Python-Version: >= 2.7 Standards-Version: 3.9.3 Homepage: http://git.kolab.org/libkolab @@ -65,19 +68,6 @@ . - The calendaring module provides some general calendaring functions -Package: python-kolab -Architecture: any -Section: python -Depends: libkolab3 (= ${binary:Version}), - ${python:Depends}, - ${misc:Depends}, - ${shlibs:Depends} -Conflicts: python-kolab-kde -Description: Python bindings for Kolab Library - This package provides the Kolab Python module calendaring. - . - - The calendaring module provides some general calendaring functions - Package: python3-kolab Architecture: any Section: python
View file
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.2 8.1 8.0 7.4 7.3 export DH_VERBOSE=1 export DH_OPTIONS=-v @@ -13,7 +13,11 @@ export DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed" %: - dh $@ --parallel --with python2,python3 --buildsystem=pybuild + if -f /usr/bin/python ; then \ + dh $@ --parallel --with python2,python3 --buildsystem=pybuild ; \ + else \ + dh $@ --parallel --with python3 --buildsystem=pybuild ; \ + fi override_dh_gencontrol: echo "php:Depends=phpapi-${PHPAPI}" >> debian/php-kolab.substvars @@ -34,11 +38,21 @@ sed -i -e "/Files:/ i\ plesk-php$${shver}-kolab deb web extra" debian/control ; \ echo "opt/plesk/php/$${version}/lib/php/modules/*.so" >> debian/plesk-php$${shver}-kolab.install ; \ - echo "opt/plesk/php/$${version}/share/php/kolab.php" >> debian/plesk-php$${shver}-kolab.install ; \ echo "debian/kolab.ini opt/plesk/php/$${version}/etc/php.d" > debian/plesk-php$${shver}-kolab.install ; \ done ; \ fi + if -f /usr/bin/python ; then \ + echo "" >> debian/control ; \ + echo "Package: python-kolab" >> debian/control ; \ + echo "Architecture: any" >> debian/control ; \ + echo "Section: python" >> debian/control ; \ + echo "Depends: libkolab3 (= ${binary:Version}), {python:Depends}, ${misc:Depends}, ${shlibs:Depends}" >> debian/control ; \ + echo "Conflicts: python-kolab-kde" >> debian/control ; \ + echo "Description: Python bindings for Kolab library." >> debian/control ; \ + echo "" >> debian/control ; \ + fi + dh_gencontrol override_dh_auto_build: @@ -57,13 +71,6 @@ done ; \ fi - # Build php vanilla - if $$(php-config --vernum) -gt 70000 ; then \ - sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php7 -I/g' cmake/modules/SWIGUtils.cmake ; \ - else \ - sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php5 -I/g' cmake/modules/SWIGUtils.cmake ; \ - fi - dh_auto_build --buildsystem cmake --builddirectory php-vanilla # Build python versions via pybuild @@ -77,11 +84,6 @@ if ! -f "/opt/plesk/php/$${version}/bin/php-config" ; then \ continue ; \ fi ; \ - if $$(/opt/plesk/php/$${version}/bin/php-config --vernum) -gt 70000 ; then \ - sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php7 -I/g' cmake/modules/SWIGUtils.cmake ; \ - else \ - sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php5 -I/g' cmake/modules/SWIGUtils.cmake ; \ - fi ; \ dh_auto_configure --buildsystem cmake --builddirectory php-$${version} -- \ -DLIB_INSTALL_DIR=/usr/lib \ -DBoost_NO_BOOST_CMAKE=ON \ @@ -95,13 +97,6 @@ done ; \ fi - # Configure php vanilla - if $$(php-config --vernum) -gt 70000 ; then \ - sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php7 -I/g' cmake/modules/SWIGUtils.cmake ; \ - else \ - sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php5 -I/g' cmake/modules/SWIGUtils.cmake ; \ - fi - dh_auto_configure --buildsystem cmake --builddirectory php-vanilla -- \ -DLIB_INSTALL_DIR=/usr/lib \ -DBoost_NO_BOOST_CMAKE=ON \ @@ -122,25 +117,22 @@ # Install the PHP modules manually, because they depend on PHP the API version, # 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 debian/tmp/$(PHPEXT)/*.php debian/tmp/usr/share/php/ || exit 1. + make -C php-vanilla install DESTDIR=$(PWD)/debian/tmp/ echo "$(PHPEXT)" >> debian/php-kolab.install # Put kolab.ini into place - if -d "/etc/php/7.4/mods-available" ; then \ + if -d "/etc/php/8.2/mods-available" ; then \ + echo "debian/kolab.ini etc/php/8.2/mods-available" >> debian/php-kolab.install ; \ + elif -d "/etc/php/8.1/mods-available" ; then \ + echo "debian/kolab.ini etc/php/8.1/mods-available" >> debian/php-kolab.install ; \ + elif -d "/etc/php/8.0/mods-available" ; then \ + echo "debian/kolab.ini etc/php/8.0/mods-available" >> debian/php-kolab.install ; \ + elif -d "/etc/php/7.4/mods-available" ; then \ echo "debian/kolab.ini etc/php/7.4/mods-available" >> debian/php-kolab.install ; \ elif -d "/etc/php/7.3/mods-available" ; then \ echo "debian/kolab.ini etc/php/7.3/mods-available" >> debian/php-kolab.install ; \ - elif -d "/etc/php/7.2/mods-available" ; then \ - echo "debian/kolab.ini etc/php/7.2/mods-available" >> debian/php-kolab.install ; \ - elif -d "/etc/php/7.1/mods-available" ; then \ - echo "debian/kolab.ini etc/php/7.1/mods-available" >> debian/php-kolab.install ; \ - elif -d "/etc/php/7.0/mods-available" ; then \ - echo "debian/kolab.ini etc/php/7.0/mods-available" >> debian/php-kolab.install ; \ - elif -d "/etc/php/mods-available" ; then \ - echo "debian/kolab.ini etc/php/mods-available" >> debian/php-kolab.install ; \ else \ - echo "debian/kolab.ini etc/php5/mods-available" >> debian/php-kolab.install ; \ + echo "debian/kolab.ini etc/php/mods-available" >> debian/php-kolab.install ; \ fi for i in debian/tmp/usr/lib/python*/dist-packages/kolab ; do \ @@ -152,18 +144,11 @@ if ! -f "/opt/plesk/php/$${version}/bin/php-config" ; then \ continue ; \ fi ; \ - if $$(/opt/plesk/php/$${version}/bin/php-config --vernum) -gt 70000 ; then \ - sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php7 -I/g' cmake/modules/SWIGUtils.cmake ; \ - else \ - sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php5 -I/g' cmake/modules/SWIGUtils.cmake ; \ - fi ; \ shver=$$(echo $${version} | sed -e 's/\.//g') ; \ make -C php-$${version} install DESTDIR=$(PWD)/debian/plesk-php$${shver}-kolab/ ; \ mkdir -p debian/plesk-php$${shver}-kolab/opt/plesk/php/$${version}/etc/php.d/ ; \ mkdir -p debian/plesk-php$${shver}-kolab/opt/plesk/php/$${version}/share/php/ ; \ cp -a debian/kolab.ini debian/plesk-php$${shver}-kolab/opt/plesk/php/$${version}/etc/php.d/ ; \ - mv debian/plesk-php$${shver}-kolab$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir)/kolab*.php \ - debian/plesk-php$${shver}-kolab/opt/plesk/php/$${version}/share/php/. || exit 1; \ rm -rf debian/plesk-php$${shver}-kolab/usr/ ; \ done ; \ fi
View file
debian.tar.gz/php-kolab-kde.install
Changed
@@ -1,3 +1,2 @@ /usr/share/php5/kolab/kolab.ini usr/share/php5/kolab/ usr/lib/php5/*/*.so -usr/share/php/kolab*.php
View file
debian.tar.gz/php-kolab.install
Changed
@@ -1,2 +1,1 @@ usr/lib/php*/*/*.so -usr/share/php/*.php
View file
libkolab-3.0.2.tar.gz/CMakeLists.txt -> libkolab-3.2.0.tar.gz/CMakeLists.txt
Changed
@@ -30,9 +30,9 @@ # 0.1.1 (patch release for 0.1.0) # 0.2 (0.2 development version towards 0.2.0) set(Libkolab_VERSION_MAJOR 3) -set(Libkolab_VERSION_MINOR 0) +set(Libkolab_VERSION_MINOR 2) # Enable the full x.y.z version only for release versions -set(Libkolab_VERSION_PATCH 2) +set(Libkolab_VERSION_PATCH 0) #set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR}.${Libkolab_VERSION_PATCH}) set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR}) set(Libkolab_VERSION_STRING ${CMAKE_PROJECT_NAME}-${Libkolab_VERSION}) @@ -55,7 +55,8 @@ find_package(Qt5 REQUIRED Core Xml) # FIXME: Seems to be required for libkolabxml, but should be fixed in libkolabxml -find_package(Boost REQUIRED system thread) +set(Boost_USE_MULTITHREADED ON) +find_package(Boost REQUIRED COMPONENTS thread system) # Do the building find_package(Libkolabxml 1.1.1 REQUIRED) @@ -70,7 +71,11 @@ include(FindPackageHandleStandardArgs) -find_package(KF5CalendarCore "5.12.1" CONFIG REQUIRED) +find_package(KF5CalendarCore "5.9.3" CONFIG REQUIRED) +if (KF5CalendarCore_VERSION VERSION_LESS "5.12.1") + message("Building with legacy kcalcore") + add_definitions(-DLEGACY_KCALCORE=1) +endif() find_package(KF5Mime "4.84.0" CONFIG REQUIRED) find_package(SWIG)
View file
libkolab-3.0.2.tar.gz/cmake/modules/SWIGUtils.cmake -> libkolab-3.2.0.tar.gz/cmake/modules/SWIGUtils.cmake
Changed
@@ -3,8 +3,10 @@ macro (generatePHPBindings MODULE_NAME INTERFACE_FILE) set(KOLAB_SWIG_PHP_SOURCE_FILE php_${MODULE_NAME}_wrapper.cpp) - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}.php - COMMAND ${SWIG} -v -c++ -php -I${Libkolabxml_INCLUDES} -module ${MODULE_NAME} -o ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE} ${INTERFACE_FILE} + #Set to php7 or php5 to force use of the non-default php version + set(SWIG_PHP_VERSION php) + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE} + COMMAND ${SWIG} -v -c++ -${SWIG_PHP_VERSION} -I${Libkolabxml_INCLUDES} -module ${MODULE_NAME} -o ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE} ${INTERFACE_FILE} COMMENT "Generating php bindings" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${INTERFACE_FILE} kolab @@ -67,11 +69,6 @@ # configure_file(test.php ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) install(TARGETS ${MODULE_NAME}_phpbindings LIBRARY DESTINATION ${PHP_INSTALL_DIR}) - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}.php - DESTINATION ${PHP_INSTALL_DIR} - ) - else() message(WARNING "not building php bindings because php was not found") endif()
View file
libkolab-3.0.2.tar.gz/conversion/kcalconversion.cpp -> libkolab-3.2.0.tar.gz/conversion/kcalconversion.cpp
Changed
@@ -293,6 +293,33 @@ * Since that means the semantics of the two are different, we have to store the kolab uid as a custom property. */ // QUrl::fromPercentEncoding( +#ifdef LEGACY_KCALCORE + KCalCore::Attendee::Ptr attendee = KCalCore::Attendee::Ptr(new KCalCore::Attendee(fromStdString(a.contact().name()), + fromStdString(a.contact().email()), + a.rsvp(), + toPartStat(a.partStat()), + toRole(a.role()) )); + if (!a.contact().uid().empty()) { //TODO Identify contact from addressbook based on uid + attendee->customProperties().setNonKDECustomProperty(CUSTOM_KOLAB_CONTACT_UUID, fromStdString(a.contact().uid())); + } + if (!a.delegatedTo().empty()) { + if (a.delegatedTo().size() > 1) { + WARNING("multiple delegatees are not supported"); + } + + attendee->setDelegate(toMailto(a.delegatedTo().front().email(), a.delegatedTo().front().name()).toString()); + } + if (!a.delegatedFrom().empty()) { + if (a.delegatedFrom().size() > 1) { + WARNING("multiple delegators are not supported"); + } + attendee->setDelegator(toMailto(a.delegatedFrom().front().email(), a.delegatedFrom().front().name()).toString()); + } + if (a.cutype() != CutypeIndividual) { + attendee->customProperties().setNonKDECustomProperty(CUSTOM_KOLAB_CONTACT_CUTYPE, QString::number(a.cutype())); + } + i.addAttendee(attendee); +#else KCalCore::Attendee attendee(fromStdString(a.contact().name()), fromStdString(a.contact().email()), a.rsvp(), @@ -318,8 +345,21 @@ attendee.customProperties().setNonKDECustomProperty(CUSTOM_KOLAB_CONTACT_CUTYPE, QString::number(a.cutype())); } i.addAttendee(attendee); +#endif } foreach (const Kolab::Attachment a, e.attachments()) { +#ifdef LEGACY_KCALCORE + KCalCore::Attachment::Ptr ptr; + if (!a.uri().empty()) { + ptr = KCalCore::Attachment::Ptr(new KCalCore::Attachment(fromStdString(a.uri()), fromStdString(a.mimetype()))); + } else { + ptr = KCalCore::Attachment::Ptr(new KCalCore::Attachment(QByteArray::fromRawData(a.data().c_str(), a.data().size()).toBase64(), fromStdString(a.mimetype()))); + } + if (!a.label().empty()) { + ptr->setLabel(fromStdString(a.label())); + } + i.addAttachment(ptr); +#else KCalCore::Attachment ptr; if (!a.uri().empty()) { ptr = KCalCore::Attachment(fromStdString(a.uri()), fromStdString(a.mimetype())); @@ -330,6 +370,7 @@ ptr.setLabel(fromStdString(a.label())); } i.addAttachment(ptr); +#endif } QMap<QByteArray, QString> props; @@ -360,6 +401,31 @@ i.setDescription(toStdString(e.description())); i.setStatus(fromStatus(e.status())); std::vector<Kolab::Attendee> attendees; +#ifdef LEGACY_KCALCORE + foreach (const KCalCore::Attendee::Ptr attendee, e.attendees()) { + const QString &uid = attendee->customProperties().nonKDECustomProperty(CUSTOM_KOLAB_CONTACT_UUID); + Kolab::Attendee a(Kolab::ContactReference(toStdString(attendee->email()), toStdString(attendee->name()), toStdString(uid))); + a.setRSVP(attendee->RSVP()); + a.setPartStat(fromPartStat(attendee->status())); + a.setRole(fromRole(attendee->role())); + if (!attendee->delegate().isEmpty()) { + std::string name; + const std::string &email = fromMailto(QUrl(attendee->delegate()), name); + a.setDelegatedTo(std::vector<Kolab::ContactReference>() << Kolab::ContactReference(email, name)); + } + if (!attendee->delegator().isEmpty()) { + std::string name; + const std::string &email = fromMailto(QUrl(attendee->delegator()), name); + a.setDelegatedFrom(std::vector<Kolab::ContactReference>() << Kolab::ContactReference(email, name)); + } + const QString &cutype = attendee->customProperties().nonKDECustomProperty(CUSTOM_KOLAB_CONTACT_CUTYPE); + if (!cutype.isEmpty()) { + a.setCutype(static_cast<Kolab::Cutype>(cutype.toInt())); + } + + attendees.push_back(a); + } +#else foreach (const KCalCore::Attendee attendee, e.attendees()) { const QString &uid = attendee.customProperties().nonKDECustomProperty(CUSTOM_KOLAB_CONTACT_UUID); Kolab::Attendee a(Kolab::ContactReference(toStdString(attendee.email()), toStdString(attendee.name()), toStdString(uid))); @@ -383,8 +449,21 @@ attendees.push_back(a); } +#endif i.setAttendees(attendees); std::vector<Kolab::Attachment> attachments; +#ifdef LEGACY_KCALCORE + foreach (const KCalCore::Attachment::Ptr &ptr, e.attachments()) { + Kolab::Attachment a; + if (ptr->isUri()) { + a.setUri(toStdString(ptr->uri()), toStdString(ptr->mimeType())); + } else { + a.setData(std::string(ptr->decodedData().data(), ptr->decodedData().size()), toStdString(ptr->mimeType())); + } + a.setLabel(toStdString(ptr->label())); + attachments.push_back(a); + } +#else foreach (const KCalCore::Attachment &ptr, e.attachments()) { Kolab::Attachment a; if (ptr.isUri()) { @@ -395,6 +474,7 @@ a.setLabel(toStdString(ptr.label())); attachments.push_back(a); } +#endif i.setAttachments(attachments); std::vector<Kolab::CustomProperty> customProperties; @@ -661,7 +741,11 @@ i.setLocation(fromStdString(e.location())); //TODO detect richtext } if (e.organizer().isValid()) { +#ifdef LEGACY_KCALCORE + i.setOrganizer(KCalCore::Person::Ptr(new KCalCore::Person(fromStdString(e.organizer().name()), fromStdString(e.organizer().email())))); //TODO handle uid too +#else i.setOrganizer(KCalCore::Person(fromStdString(e.organizer().name()), fromStdString(e.organizer().email()))); //TODO handle uid too +#endif } if (!e.url().empty()) { i.setNonKDECustomProperty(CUSTOM_KOLAB_URL, fromStdString(e.url())); @@ -677,7 +761,11 @@ case Kolab::Alarm::EMailAlarm: { KCalCore::Person::List receipents; foreach (Kolab::ContactReference c ,a.attendees()) { +#ifdef LEGACY_KCALCORE + KCalCore::Person::Ptr person = KCalCore::Person::Ptr(new KCalCore::Person(fromStdString(c.name()), fromStdString(c.email()))); +#else KCalCore::Person person(fromStdString(c.name()), fromStdString(c.email())); +#endif receipents.append(person); } alarm->setEmailAlarm(fromStdString(a.summary()), fromStdString(a.description()), receipents); @@ -715,9 +803,15 @@ { i.setPriority(fromPriority(e.priority())); i.setLocation(toStdString(e.location())); +#ifdef LEGACY_KCALCORE + if (!e.organizer()->email().isEmpty()) { + i.setOrganizer(Kolab::ContactReference(Kolab::ContactReference::EmailReference, toStdString(e.organizer()->email()), toStdString(e.organizer()->name()))); //TODO handle uid too + } +#else if (!e.organizer().email().isEmpty()) { i.setOrganizer(Kolab::ContactReference(Kolab::ContactReference::EmailReference, toStdString(e.organizer().email()), toStdString(e.organizer().name()))); //TODO handle uid too } +#endif i.setUrl(toStdString(e.nonKDECustomProperty(CUSTOM_KOLAB_URL))); i.setRecurrenceID(fromDate(e.recurrenceId()), e.thisAndFuture()); getRecurrence(i, e); @@ -736,9 +830,15 @@ break; case KCalCore::Alarm::Email: { std::vector<Kolab::ContactReference> receipents; +#ifdef LEGACY_KCALCORE + foreach(const KCalCore::Person::Ptr &p, a->mailAddresses()) { + receipents.push_back(Kolab::ContactReference(toStdString(p->email()), toStdString(p->name()))); + } +#else foreach(const KCalCore::Person &p, a->mailAddresses()) { receipents.push_back(Kolab::ContactReference(toStdString(p.email()), toStdString(p.name()))); } +#endif alarm = Kolab::Alarm(toStdString(a->mailSubject()), toStdString(a->mailText()), receipents); } break;
View file
libkolab-3.0.2.tar.gz/tests/kcalconversiontest.cpp -> libkolab-3.2.0.tar.gz/tests/kcalconversiontest.cpp
Changed
@@ -50,6 +50,7 @@ void compareAttendeesVectors(const KCalCore::Attendee::List &list, const KCalCore::Attendee::List &other) { QCOMPARE(list.size(), other.size()); +#ifndef LEGACY_KCALCORE for (int i = 0 ; i < list.size(); i++) { KCalCore::Attendee at1 = list.at(i); at1.setUid(QString()); @@ -57,6 +58,7 @@ at2.setUid(QString()); QCOMPARE(at1, at2); } +#endif } void KCalConversionTest::initTestCase() @@ -192,19 +194,25 @@ kcal.setPriority(3); kcal.setStatus(KCalCore::Incidence::StatusConfirmed); kcal.setLocation("location"); +#ifndef LEGACY_KCALCORE kcal.setOrganizer(KCalCore::Person("organizer", "organizer@email")); +#endif //Url kcal.setNonKDECustomProperty("X-KOLAB-URL", "http://test.org"); +#ifndef LEGACY_KCALCORE KCalCore::Attendee att("attendee", "attendee@email", false, KCalCore::Attendee::NeedsAction, KCalCore::Attendee::ReqParticipant); att.setDelegate("mailto:delegatee<delegatee@email>"); att.setDelegator("mailto:delegator<delegator@email>"); kcal.addAttendee(att); kcal.addAttachment(KCalCore::Attachment(QString("uri"), "mimetype/mime")); +#endif +#ifndef LEGACY_KCALCORE KCalCore::Alarm::Ptr alarm = KCalCore::Alarm::Ptr(new KCalCore::Alarm(&kcal)); KCalCore::Person::List addressees; addressees.append(KCalCore::Person("name", "email@email")); alarm->setEmailAlarm("subject", "text", addressees, QStringList()); //No support for attachments kcal.addAlarm(alarm); +#endif //TODO alarms kcal.setNonKDECustomProperty("X-KOLAB-key1", "value1"); @@ -388,8 +396,10 @@ QCOMPARE(e->priority(), kcal.priority()); QCOMPARE(e->status(), kcal.status()); QCOMPARE(e->location(), kcal.location()); +#ifndef LEGACY_KCALCORE QCOMPARE(e->organizer().name(), kcal.organizer().name()); QCOMPARE(e->organizer().email(), kcal.organizer().email()); +#endif QCOMPARE(e->nonKDECustomProperty("X-KOLAB-URL"), kcal.nonKDECustomProperty("X-KOLAB-URL")); //otherwise we'd break the customProperties comparison e->removeNonKDECustomProperty("X-KOLAB-URL");
View file
libkolab.dsc
Changed
@@ -2,44 +2,45 @@ Source: libkolab Binary: libkolab3, php-kolab, python-kolab, libkolab-dev Architecture: any -Version: 3.0.2-0~kolab1 +Version: 3.2.0-0~kolab2 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Homepage: http://git.kolab.org/libkolab Standards-Version: 3.9.3 Build-Depends: - cmake, - debhelper, + cmake, + debhelper, dh-python, - libcurl4-gnutls-dev, - libboost-dev, - libboost-thread-dev, - libboost-system-dev, - libkolabxml-dev (>= 1.0), - libossp-uuid-dev, + libcurl4-gnutls-dev, + libboost-dev, + libboost-thread-dev, + libboost-system-dev, + libkolabxml-dev (>= 1.0), + libossp-uuid-dev, qtbase5-dev, libkf5coreaddons-dev, libkf5calendarcore-dev, libkf5mime-dev, libkf5codecs-dev, - libxerces-c-dev, - php-cgi | php5-cli, - php-dev | php5-dev, + libxerces-c-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, + plesk-php72-dev | plesk-php73-dev | plesk-php74-dev | plesk-php80-dev | plesk-php81-dev | plesk-php82-dev | bash, + plesk-php73-dev | plesk-php74-dev | plesk-php80-dev | plesk-php81-dev | plesk-php82-dev | bash, + plesk-php74-dev | plesk-php80-dev | plesk-php81-dev | plesk-php82-dev| bash, + plesk-php80-dev | plesk-php81-dev | plesk-php82-dev| bash, + plesk-php81-dev | plesk-php82-dev| bash, + plesk-php82-dev | bash, + python2-dev | python-dev | python3-dev, + python-minimal | python2-minimal | python3-minimal, python3-all-dev, - swig (>= 2.0) + swig4.0 (>= 4.1) Package-List: libkolab-dev deb libdevel optional libkolab2 deb libs optional php-kolab deb libs optional python-kolab deb python optional Files: - 00000000000000000000000000000000 0 libkolab-3.0.2.tar.gz + 00000000000000000000000000000000 0 libkolab-3.2.0.tar.gz 00000000000000000000000000000000 0 debian.tar.gz
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.