Projects
Kontact:4.13:Git
libkolab
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 12
View file
_service:set_version:libkolab.spec
Changed
@@ -30,7 +30,7 @@ Name: libkolab %endif -Version: 0.7.git.1432664058 +Version: 0.7.git.1461335670 Release: 0%{?dist} Summary: Kolab Object Handling Library @@ -45,8 +45,8 @@ BuildRequires: libcurl-devel BuildRequires: libkolabxml-devel >= 1.0 BuildRequires: make -BuildRequires: php >= 5.3 -BuildRequires: php-devel >= 5.3 +#BuildRequires: php >= 5.3 +#BuildRequires: php-devel >= 5.3 BuildRequires: python-devel %if 0%{?suse_version} BuildRequires: qt-devel @@ -70,7 +70,7 @@ BuildRequires: qca %endif Requires: libkolabxml-devel >= 1.0 -Requires: php-devel +#Requires: php-devel Requires: pkgconfig Requires: python-devel @@ -81,23 +81,23 @@ %endif Development headers for the Kolab object libraries. -%package -n php-kolab -Summary: PHP Bindings for libkolab -Group: System Environment/Libraries -Requires: libkolab%{?_isa} = %{version} -%if 0%{?rhel} > 5 || 0%{?fedora} > 15 -Requires: php(zend-abi) = %{php_zend_api} -Requires: php(api) = %{php_core_api} -%else -Requires: php-api = %{php_apiver} -%endif -%if 0%{?suse_version} -Obsoletes: php-%{name} < %{version} -Provides: php-%{name} = %{version} -%endif - -%description -n php-kolab -PHP Bindings for libkolab +#%package -n php-kolab +#Summary: PHP Bindings for libkolab +#Group: System Environment/Libraries +#Requires: libkolab%{?_isa} = %{version} +#%if 0%{?rhel} > 5 || 0%{?fedora} > 15 +#Requires: php(zend-abi) = %{php_zend_api} +#Requires: php(api) = %{php_core_api} +#%else +#Requires: php-api = %{php_apiver} +#%endif +#%if 0%{?suse_version} +#Obsoletes: php-%{name} < %{version} +#Provides: php-%{name} = %{version} +#%endif + +#%description -n php-kolab +#PHP Bindings for libkolab %package -n python-kolab Summary: Python bindings for libkolab @@ -148,7 +148,7 @@ %if 0%{?rhel} < 7 && 0%{?fedora} < 20 -DUSE_LIBCALENDARING=ON \ %endif - -DPHP_BINDINGS=ON \ + -DPHP_BINDINGS=OFF \ -DPHP_INSTALL_DIR=%{php_extdir} \ -DPYTHON_BINDINGS=ON \ -DPYTHON_INSTALL_DIR=%{python_sitearch} \ @@ -162,24 +162,24 @@ 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 -extension=kolabobject.so -extension=kolabshared.so -extension=kolabcalendaring.so -extension=kolabicalendar.so -EOF - -# Workaround for #2050 -cat >%{buildroot}/%{php_inidir}/kolabdummy.ini <<EOF -; Kolab libraries -extension=dummy.so -EOF - +#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 +#extension=kolabobject.so +#extension=kolabshared.so +#extension=kolabcalendaring.so +#extension=kolabicalendar.so +#EOF +# +## Workaround for #2050 +#cat >%{buildroot}/%{php_inidir}/kolabdummy.ini <<EOF +#; Kolab libraries +#extension=dummy.so +#EOF +# touch %{buildroot}/%{python_sitearch}/kolab/__init__.py @@ -214,19 +214,19 @@ %{_libdir}/cmake/Libkolab %{_includedir}/kolab -%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}/kolabicalendar.php -%{php_extdir}/kolabicalendar.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 +#%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}/kolabicalendar.php +#%{php_extdir}/kolabicalendar.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 %files -n python-kolab %dir %{python_sitearch}/kolab/
View file
libkolab.spec
Changed
@@ -45,8 +45,8 @@ BuildRequires: libcurl-devel BuildRequires: libkolabxml-devel >= 1.0 BuildRequires: make -BuildRequires: php >= 5.3 -BuildRequires: php-devel >= 5.3 +#BuildRequires: php >= 5.3 +#BuildRequires: php-devel >= 5.3 BuildRequires: python-devel %if 0%{?suse_version} BuildRequires: qt-devel @@ -70,7 +70,7 @@ BuildRequires: qca %endif Requires: libkolabxml-devel >= 1.0 -Requires: php-devel +#Requires: php-devel Requires: pkgconfig Requires: python-devel @@ -81,23 +81,23 @@ %endif Development headers for the Kolab object libraries. -%package -n php-kolab -Summary: PHP Bindings for libkolab -Group: System Environment/Libraries -Requires: libkolab%{?_isa} = %{version} -%if 0%{?rhel} > 5 || 0%{?fedora} > 15 -Requires: php(zend-abi) = %{php_zend_api} -Requires: php(api) = %{php_core_api} -%else -Requires: php-api = %{php_apiver} -%endif -%if 0%{?suse_version} -Obsoletes: php-%{name} < %{version} -Provides: php-%{name} = %{version} -%endif - -%description -n php-kolab -PHP Bindings for libkolab +#%package -n php-kolab +#Summary: PHP Bindings for libkolab +#Group: System Environment/Libraries +#Requires: libkolab%{?_isa} = %{version} +#%if 0%{?rhel} > 5 || 0%{?fedora} > 15 +#Requires: php(zend-abi) = %{php_zend_api} +#Requires: php(api) = %{php_core_api} +#%else +#Requires: php-api = %{php_apiver} +#%endif +#%if 0%{?suse_version} +#Obsoletes: php-%{name} < %{version} +#Provides: php-%{name} = %{version} +#%endif + +#%description -n php-kolab +#PHP Bindings for libkolab %package -n python-kolab Summary: Python bindings for libkolab @@ -148,7 +148,7 @@ %if 0%{?rhel} < 7 && 0%{?fedora} < 20 -DUSE_LIBCALENDARING=ON \ %endif - -DPHP_BINDINGS=ON \ + -DPHP_BINDINGS=OFF \ -DPHP_INSTALL_DIR=%{php_extdir} \ -DPYTHON_BINDINGS=ON \ -DPYTHON_INSTALL_DIR=%{python_sitearch} \ @@ -162,24 +162,24 @@ 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 -extension=kolabobject.so -extension=kolabshared.so -extension=kolabcalendaring.so -extension=kolabicalendar.so -EOF - -# Workaround for #2050 -cat >%{buildroot}/%{php_inidir}/kolabdummy.ini <<EOF -; Kolab libraries -extension=dummy.so -EOF - +#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 +#extension=kolabobject.so +#extension=kolabshared.so +#extension=kolabcalendaring.so +#extension=kolabicalendar.so +#EOF +# +## Workaround for #2050 +#cat >%{buildroot}/%{php_inidir}/kolabdummy.ini <<EOF +#; Kolab libraries +#extension=dummy.so +#EOF +# touch %{buildroot}/%{python_sitearch}/kolab/__init__.py @@ -214,19 +214,19 @@ %{_libdir}/cmake/Libkolab %{_includedir}/kolab -%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}/kolabicalendar.php -%{php_extdir}/kolabicalendar.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 +#%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}/kolabicalendar.php +#%{php_extdir}/kolabicalendar.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 %files -n python-kolab %dir %{python_sitearch}/kolab/
View file
_service:recompress:tar_scm:libkolab-0.7.git.1432664058.tar.gz/CMakeLists.txt -> _service:recompress:tar_scm:libkolab-0.7.git.1461335670.tar.gz/CMakeLists.txt
Changed
@@ -7,6 +7,7 @@ option( PYTHON_BINDINGS "Build bindings for python" FALSE ) option( PHP_BINDINGS "Build bindings for php" FALSE ) option( USE_LIBCALENDARING "Use libcalendaring" FALSE ) +option( INTERCEPT_DEBUGMESSAGES "Intercept Debugmessages" ${USE_LIBCALENDARING} ) set(Libkolab_MODULE_DIR ${Libkolab_SOURCE_DIR}/cmake/modules) set(CMAKE_MODULE_PATH ${Libkolab_MODULE_DIR}) @@ -175,6 +176,10 @@ ${FREEBUSY_SRCS} ) +if (INTERCEPT_DEBUGMESSAGES) + add_definitions( -DINTERCEPT_DEBUGMESSAGES ) +endif() + set(KOLAB_LINK_LIBRARIES ${Libkolabxml_LIBRARIES} ${QT_QTCORE_LIBRARY}
View file
_service:recompress:tar_scm:libkolab-0.7.git.1432664058.tar.gz/kolabformat/errorhandler.cpp -> _service:recompress:tar_scm:libkolab-0.7.git.1461335670.tar.gz/kolabformat/errorhandler.cpp
Changed
@@ -26,6 +26,29 @@ #include <kolabformat.h> +#ifdef INTERCEPT_DEBUGMESSAGES + +void interceptDebugMsgs(QtMsgType type, const char *msg) +{ + switch (type) { + case QtFatalMsg: + abort(); + default: + break; + } +} + +struct Initializer { + Initializer() + { + qInstallMsgHandler(interceptDebugMsgs); + } +}; + +static Initializer initializer; + +#endif + QDebug operator<<(QDebug dbg, const std::string &s) { dbg.nospace() << QString::fromStdString(s);
View file
_service:recompress:tar_scm:libkolab-0.7.git.1432664058.tar.gz/kolabformat/kolabobject.cpp -> _service:recompress:tar_scm:libkolab-0.7.git.1461335670.tar.gz/kolabformat/kolabobject.cpp
Changed
@@ -328,7 +328,11 @@ return InvalidObject; } const QByteArray &xmlData = xmlContent->decodedContent(); - Q_ASSERT(!xmlData.isEmpty()); + if (xmlData.isEmpty()) { + Critical() << "no xml content in part with type" << getTypeString(objectType); + printMessageDebugInfo(msg); + return InvalidObject; + } QStringList attachments; switch (objectType) {
View file
_service:set_version:libkolab.dsc
Changed
@@ -2,7 +2,7 @@ Source: libkolab Binary: libkolab0, php-kolab, python-kolab, libkolab-dev Architecture: any -Version: 0.7.git.1432664058 +Version: 0.7.git.1461335670 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel@lists.alioth.debian.org> Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Christoph Wickert <wickert@kolabsys.com>, Paul Klos <kolab@klos2day.nl> Homepage: http://git.kolab.org/libkolab
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
.