pool/libqxmpp
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 700435 from home:cgiboudeaux:noqt4

Browse Source 
- Update to 1.0.0. Changes since 0.8.3:
  * Drop Qt4 support
  * Fix phone numbers incorrectly read from / written to vCard
  * Make QXmppStream handle end of incoming stream
  * Allow QXmppJingleIq to have multiple contents.
  * Fix QXmppTransferManagerFix convering filename to a QUrl.
  * Do not ignore SSL errors by default
  * CMake based build system
  * Use C++11 compiler standard
  Check the CHANGELOG.md file for the complete list of changes
- Drop libqxmpp-qt5
- Run spec-cleaner
- Drop obsolete patch: libqxmpp-qt5.patch
- Trim marketing filler wording from description.
- Update the license tag to LGPL-2.1-or-later

OBS-URL: https://build.opensuse.org/request/show/700435
OBS-URL: https://build.opensuse.org/package/show/network/libqxmpp?expand=0&rev=19
This commit is contained in:
Tomáš Chvátal 2019-05-04 06:57:08 +00:00 committed by Git OBS Bridge
parent 6214ad49a7
commit d746ccdac6
7 changed files with 72 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libqxmpp-1.0.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bf62ac8d0b5741b3cb07ea92780b279d5c34d000dc7401d6c20a9b77865a5c1e
size 259635

17
libqxmpp-qt5.changes
View File

@ -1,17 +0,0 @@
-------------------------------------------------------------------
Sat Mar 14 12:40:23 UTC 2015 - dap.darkness@gmail.com
- update to 0.8.3
* Add a QXmppClient::sslErrors signal to report SSL errors.
* Handle broken servers which send "bad-auth"
instead of "not-authorized".
* Fix a compilation issue with Qt 5.5 due to a missing include.
* Do not install test cases.
* Remove trailing comma after last item in enums.
-------------------------------------------------------------------
Fri Jan 9 21:07:02 UTC 2015 - dap.darkness@gmail.com
- Initial build.
- Added libqxmpp-qt5.patch to implement Qt5 alternative.

38
libqxmpp-qt5.patch
View File

@ -1,38 +0,0 @@
diff --git a/qxmpp.pri b/qxmpp.pri
index e5dbb9c..8c8561d 100644
--- a/qxmpp.pri
+++ b/qxmpp.pri
@@ -8,7 +8,7 @@ QXMPP_INCLUDEPATH = $$PWD/src/base $$PWD/src/client $$PWD/src/server
CONFIG(debug, debug|release) {
QXMPP_LIBRARY_NAME = qxmpp_d
} else {
- QXMPP_LIBRARY_NAME = qxmpp
+ QXMPP_LIBRARY_NAME = qxmpp-qt5
}
# Determine library type (shared or staticlib)
diff --git a/src/src.pro b/src/src.pro
index 954738c..32204cd 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -40,7 +40,7 @@ HEADERS += $$INSTALL_HEADERS
# Installation
headers.files = $$INSTALL_HEADERS
-headers.path = $$PREFIX/include/qxmpp
+headers.path = $$PREFIX/include/qxmpp-qt5
target.path = $$PREFIX/$$LIBDIR
INSTALLS += headers target
diff --git a/qxmpp.pro b/qxmpp.pro
index a309a48..ad5cbad 100644
--- a/qxmpp.pro
+++ b/qxmpp.pro
@@ -6,7 +6,6 @@ TEMPLATE = subdirs
SUBDIRS = src
android | ios {
} else {
- SUBDIRS += tests examples
}
!isEmpty(QXMPP_USE_DOXYGEN) {

153
libqxmpp-qt5.spec
View File

@ -1,153 +0,0 @@
#
# spec file for package libqxmpp-qt5
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define build_qt4 0
%define build_qt5 1
Name: libqxmpp-qt5
Version: 0.8.3
Release: 0
Summary: Qt XMPP Library
License: LGPL-2.0+
Group: System/Libraries
Url: http://qxmpp.org
Source0: https://github.com/qxmpp-project/qxmpp/archive/v%{version}.tar.gz
Source1: baselibs.conf
Patch0: libqxmpp-qt5.patch
BuildRequires: fdupes
%if %build_qt4
BuildRequires: pkgconfig(QtCore)
%endif
%if %build_qt5
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Xml)
%endif
BuildRequires: pkgconfig(opus)
BuildRequires: pkgconfig(speex)
BuildRequires: pkgconfig(theora)
BuildRequires: pkgconfig(vpx)
%description
QXmpp is a cross-platform C++ XMPP client library. It is based on Qt and C++.
QXmpp is pretty intuitive and easy to use. It uses Qt extensively. Qt is the only
third party library it is dependent on. Users need to a have working knowledge of
C++ and Qt basics (Signals and Slots and Qt data types). The underlying TCP socket
and the XMPP RFCs (RFC3920 and RFC3921) have been encapsulated into classes and
functions. Therefore the user would not be bothered with these details. But it is
always recommended to the advanced users to read and enjoy the low level details.
%package -n %{name}-0
Summary: Qt XMPP Library
Group: System/Libraries
%description -n %{name}-0
QXmpp is a cross-platform C++ XMPP client library. It is based on Qt and C++.
QXmpp is pretty intuitive and easy to use. It uses Qt extensively. Qt is the only
third party library it is dependent on. Users need to a have working knowledge of
C++ and Qt basics (Signals and Slots and Qt data types). The underlying TCP socket
and the XMPP RFCs (RFC3920 and RFC3921) have been encapsulated into classes and
functions. Therefore the user would not be bothered with these details. But it is
always recommended to the advanced users to read and enjoy the low level details.
%package -n %{name}-devel
Summary: Qxmpp Development Files
Group: Development/Libraries/C and C++
%if %build_qt4
Requires: %{name}0 = %{version}
%endif
%if %build_qt5
Requires: %{name}-0 = %{version}
%endif
%description -n %{name}-devel
It's a development package for qxmpp.
QXmpp is a cross-platform C++ XMPP client library. It is based on Qt and C++.
%package doc
Summary: Qxmpp library documentation
Group: Documentation/HTML
BuildArch: noarch
%description doc
This packages provides documentation of Qxmpp library API.
%prep
%setup -q -n qxmpp-%{version}
%if %build_qt5
%patch0 -p1
%endif
# A hack vs. "E: arch-independent-package-contains-binary-or-object"
# after %%check.
cp -r examples doc/
%build
%if %build_qt4
qmake \
%endif
%if %build_qt5
qmake-qt5 \
%endif
PREFIX=%{_prefix} \
LIBDIR=%{_lib} \
QMAKE_STRIP="" \
QMAKE_CXXFLAGS+="%{optflags}" \
QXMPP_USE_OPUS=1 \
QXMPP_USE_SPEEX=1 \
QXMPP_USE_THEORA=1 \
QXMPP_USE_VPX=1
make V=1 %{?_smp_mflags}
%install
%makeinstall INSTALL_ROOT=%{buildroot}
%fdupes %{buildroot}%{_datadir}/doc/qxmpp/
%check
make V=1 %{?_smp_mflags} check
%post -n %{name}-0 -p /sbin/ldconfig
%postun -n %{name}-0 -p /sbin/ldconfig
%files -n %{name}-0
%defattr(-,root,root)
%doc AUTHORS CHANGELOG LICENSE.LGPL README*
%{_libdir}/%{name}.so.*
%files -n %{name}-devel
%defattr(-,root,root)
%{_libdir}/%{name}.so
%if %build_qt4
%{_includedir}/qxmpp
%{_libdir}/pkgconfig/qxmpp.pc
%endif
%if %build_qt5
%{_includedir}/qxmpp-qt5
%{_libdir}/pkgconfig/qxmpp-qt5.pc
%endif
%files doc
%defattr(-,root,root)
%doc doc/examples
%changelog

19
libqxmpp.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri May 3 13:21:42 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 1.0.0. Changes since 0.8.3:
* Drop Qt4 support
* Fix phone numbers incorrectly read from / written to vCard
* Make QXmppStream handle end of incoming stream
* Allow QXmppJingleIq to have multiple contents.
* Fix QXmppTransferManagerFix convering filename to a QUrl.
* Do not ignore SSL errors by default
* CMake based build system
* Use C++11 compiler standard
Check the CHANGELOG.md file for the complete list of changes
- Drop libqxmpp-qt5
- Run spec-cleaner
- Drop obsolete patch: libqxmpp-qt5.patch
- Trim marketing filler wording from description.
- Update the license tag to LGPL-2.1-or-later
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Mar 14 12:40:23 UTC 2015 - dap.darkness@gmail.com Sat Mar 14 12:40:23 UTC 2015 - dap.darkness@gmail.com

136
libqxmpp.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libqxmpp # spec file for package libqxmpp
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,77 +12,55 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
%define build_qt4 1 %define sover 0
%define build_qt5 0
Name: libqxmpp Name: libqxmpp
Version: 0.8.3 Version: 1.0.0
Release: 0 Release: 0
Summary: Qt XMPP Library Summary: Qt XMPP Library
License: LGPL-2.0+ License: LGPL-2.1-or-later
Group: System/Libraries Group: System/Libraries
Url: http://qxmpp.org URL: https://github.com/qxmpp-project/qxmpp/
Source0: https://github.com/qxmpp-project/qxmpp/archive/v%{version}.tar.gz Source0: https://github.com/qxmpp-project/qxmpp/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: baselibs.conf Source1: baselibs.conf
# PATCH-FEATURE-OPENSUSE to make Qt5 build. BuildRequires: cmake
Patch0: libqxmpp-qt5.patch BuildRequires: doxygen
BuildRequires: fdupes BuildRequires: fdupes
%if %build_qt4 BuildRequires: pkgconfig
BuildRequires: pkgconfig(QtCore) BuildRequires: cmake(Qt5Core)
%endif BuildRequires: cmake(Qt5Gui)
%if %build_qt5 BuildRequires: cmake(Qt5Network)
BuildRequires: pkgconfig(Qt5Network) BuildRequires: cmake(Qt5Test)
BuildRequires: pkgconfig(Qt5Xml) BuildRequires: cmake(Qt5Xml)
%endif
BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(opus)
BuildRequires: pkgconfig(speex) BuildRequires: pkgconfig(speex)
BuildRequires: pkgconfig(theora) BuildRequires: pkgconfig(theora)
BuildRequires: pkgconfig(vpx) BuildRequires: pkgconfig(vpx)
%description %description
QXmpp is a cross-platform C++ XMPP client library. It is based on Qt and C++. QXmpp is a cross-platform C++ XMPP client library based on Qt and C++.
QXmpp is pretty intuitive and easy to use. It uses Qt extensively. Qt is the only %package -n %{name}%{sover}
third party library it is dependent on. Users need to a have working knowledge of
C++ and Qt basics (Signals and Slots and Qt data types). The underlying TCP socket
and the XMPP RFCs (RFC3920 and RFC3921) have been encapsulated into classes and
functions. Therefore the user would not be bothered with these details. But it is
always recommended to the advanced users to read and enjoy the low level details.
%package -n %{name}0
Summary: Qt XMPP Library Summary: Qt XMPP Library
Group: System/Libraries Group: System/Libraries
Provides: libqxmpp-qt5-0 = %{version}
Obsoletes: libqxmpp-qt5-0 < %{version}
%description -n %{name}0 %description -n %{name}%{sover}
QXmpp is a cross-platform C++ XMPP client library. It is based on Qt and C++. QXmpp is a cross-platform C++ XMPP client library based on Qt and C++.
QXmpp is pretty intuitive and easy to use. It uses Qt extensively. Qt is the only
third party library it is dependent on. Users need to a have working knowledge of
C++ and Qt basics (Signals and Slots and Qt data types). The underlying TCP socket
and the XMPP RFCs (RFC3920 and RFC3921) have been encapsulated into classes and
functions. Therefore the user would not be bothered with these details. But it is
always recommended to the advanced users to read and enjoy the low level details.
%package -n %{name}-devel %package -n %{name}-devel
Summary: Qxmpp Development Files Summary: Qxmpp Development Files
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
%if %build_qt4 Requires: %{name}%{sover} = %{version}
Requires: %{name}0 = %{version} Provides: libqxmpp-qt5-devel = %{version}
%endif Obsoletes: libqxmpp-qt5-devel < %{version}
%if %build_qt5
Requires: %{name}-0 = %{version}
%endif
%description -n %{name}-devel %description -n %{name}-devel
It's a development package for qxmpp. Development package for qxmpp.
QXmpp is a cross-platform C++ XMPP client library. It is based on Qt and C++.
%package doc %package doc
Summary: Qxmpp library documentation Summary: Qxmpp library documentation
@ -94,61 +72,47 @@ This packages provides documentation of Qxmpp library API.
%prep %prep
%setup -q -n qxmpp-%{version} %setup -q -n qxmpp-%{version}
%if %build_qt5 # Disable tests needing a network connection
%patch0 -p1 sed -i 's,add_simple_test(qxmppserver),#add_simple_test(qxmppserver),' tests/CMakeLists.txt
%endif sed -i 's,add_simple_test(qxmppcallmanager),#add_simple_test(qxmppcallmanager),' tests/CMakeLists.txt
# A hack vs. "E: arch-independent-package-contains-binary-or-object" sed -i 's,add_simple_test(qxmppiceconnection),#add_simple_test(qxmppiceconnection),' tests/CMakeLists.txt
# after %%check. sed -i 's,add_subdirectory(qxmpptransfermanager),#add_subdirectory(qxmpptransfermanager),' tests/CMakeLists.txt
cp -r examples doc/
%build %build
%if %build_qt4 %cmake \
qmake \ -DWITH_SPEEX=ON \
%endif -DWITH_OPUS=ON \
%if %build_qt5 -DWITH_THEORA=ON \
qmake-qt5 \ -DWITH_VPX=ON \
%endif -DBUILD_DOCUMENTATION=ON \
PREFIX=%{_prefix} \ -DBUILD_EXAMPLES=ON \
LIBDIR=%{_lib} \ -DBUILD_TESTS=ON
QMAKE_STRIP="" \
QMAKE_CXXFLAGS+="%{optflags}" \
QXMPP_USE_OPUS=1 \
QXMPP_USE_SPEEX=1 \
QXMPP_USE_THEORA=1 \
QXMPP_USE_VPX=1
make V=1 %{?_smp_mflags} %cmake_build
%install %install
%makeinstall INSTALL_ROOT=%{buildroot} %cmake_install
%fdupes %{buildroot}%{_datadir}/doc/qxmpp/ %fdupes %{buildroot}%{_datadir}/doc/qxmpp/
%check %check
make V=1 %{?_smp_mflags} check export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
%ctest
%post -n %{name}0 -p /sbin/ldconfig %post -n %{name}%{sover} -p /sbin/ldconfig
%postun -n %{name}%{sover} -p /sbin/ldconfig
%postun -n %{name}0 -p /sbin/ldconfig %files -n %{name}%{sover}
%license LICENSE.LGPL
%files -n %{name}0 %doc AUTHORS CHANGELOG.md README.md
%defattr(-,root,root)
%doc AUTHORS CHANGELOG LICENSE.LGPL README*
%{_libdir}/%{name}.so.* %{_libdir}/%{name}.so.*
%files -n %{name}-devel %files -n %{name}-devel
%defattr(-,root,root) %{_includedir}/qxmpp/
%{_libdir}/%{name}.so %{_libdir}/%{name}.so
%if %build_qt4 %{_libdir}/cmake/qxmpp/
%{_includedir}/qxmpp
%{_libdir}/pkgconfig/qxmpp.pc %{_libdir}/pkgconfig/qxmpp.pc
%endif
%if %build_qt5
%{_includedir}/qxmpp-qt5
%{_libdir}/pkgconfig/qxmpp-qt5.pc
%endif
%files doc %files doc
%defattr(-,root,root) %{_datadir}/doc/qxmpp/
%doc doc/examples
%changelog %changelog

3
v0.8.3.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f4c34e126fb3d0a4e2fc3d505aea5f75e662e3a477955c98cc103deaf83e8a9d
size 282998