From 778a81bc27398d2570deb56c6b29db669276f5c2ca400d9232f55f581c0dcb02 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 13 Mar 2023 13:54:01 +0000 Subject: [PATCH] Accepting request 1070852 from home:krop:branches:network Update to 1.5.3 OBS-URL: https://build.opensuse.org/request/show/1070852 OBS-URL: https://build.opensuse.org/package/show/network/libqxmpp?expand=0&rev=33 --- libqxmpp-1.4.0.tar.gz | 3 --- libqxmpp-1.5.3.tar.gz | 3 +++ libqxmpp.changes | 53 ++++++++++++++++++++++++++++++++++++++ libqxmpp.spec | 60 ++++++++++++++++++++++++++----------------- 4 files changed, 93 insertions(+), 26 deletions(-) delete mode 100644 libqxmpp-1.4.0.tar.gz create mode 100644 libqxmpp-1.5.3.tar.gz diff --git a/libqxmpp-1.4.0.tar.gz b/libqxmpp-1.4.0.tar.gz deleted file mode 100644 index 672e70d..0000000 --- a/libqxmpp-1.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2148162138eaf4b431a6ee94104f87877b85a589da803dff9433c698b4cf4f19 -size 313356 diff --git a/libqxmpp-1.5.3.tar.gz b/libqxmpp-1.5.3.tar.gz new file mode 100644 index 0000000..e1357a5 --- /dev/null +++ b/libqxmpp-1.5.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43ef503adcea8ef1a7eb0ce3af408eb693f66875550aaca9fd8309119e1afec8 +size 603009 diff --git a/libqxmpp.changes b/libqxmpp.changes index 6cd2d09..60c641e 100644 --- a/libqxmpp.changes +++ b/libqxmpp.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Sat Mar 11 09:18:31 UTC 2023 - Christophe Marin + +- Update to 1.5.3 + + * MAM: Fix task is never finished when none of the messages is + encrypted but e2ee is enabled + * SaslDigestMd5: Fix undefined behaviour with Qt 6 when parsing + empty property at the end of the input + * CarbonManagerV2: Fix enable IQ sending + * Fix various OMEMO issues and update to libomemo-c 0.5 + * Add CMake option to manually specify Qt major version + * Readd old PubSubIq and PubSubItem after justified complaints + +------------------------------------------------------------------- +Fri Feb 24 21:15:55 UTC 2023 - Christophe Marin + +- Update to 1.5.2 + * Fix undefined behaviour in OmemoManager and FileSharingManager + * STUN: Fix nonce attribute is not padded + Changes in 1.5.1: + * Fix build with clang (usage of auto in template argument) + Changes in 1.5.0: + * New QXmppTask/Promise for asynchronous APIs + * Packet sending result reporting (sent, stream management acks) + * IQ response recognition and mapping to requests via QXmppTask + * Add QXmppTask-based APIs to most of the managers + * Implement XEP-0060: Publish-Subscribe (nearly complete) + * Implement XEP-0118: User Tune + * Implement XEP-0080: User Location + * Rewrite MIX items with new PubSubItem + * Add specified data forms parsing utilities + * Implement XEP-0384: OMEMO Encryption + * Implement XEP-0434: Trust Messages (TM) + * Implement XEP-0450: Automatic Trust Management (ATM) + * Implement XEP-0420: Stanza Content Encryption + * Add new Message Carbons manager capable of end-to-end + encryption + * Adapt QXmppClient to support end-to-end-encryptions + * Implement XEP-0446: File metadata element + * Implement XEP-0300: Use of Cryptographic Hash Functions + in XMPP + * Implement XEP-0264: Jingle Content Thumbnails + * Implement XEP-0447: Stateless file sharing + * Implement XEP-0448: Encryption for stateless file sharing + * Add new HTTP File Upload Manager for slot requesting + and uploading + * Implement stanza parsing for modern audio-video calls + * Implement XEP-0444: Message Reactions + * Add QXmppNonza as base for stanzas and nonzas + * RosterManager: Add subscription request signal with + full presence + ------------------------------------------------------------------- Mon Aug 2 05:49:29 UTC 2021 - Dmitriy Perlow diff --git a/libqxmpp.spec b/libqxmpp.spec index e7947f4..4740819 100644 --- a/libqxmpp.spec +++ b/libqxmpp.spec @@ -16,9 +16,13 @@ # -%define sover 3 +# Currently not available on 15.4 / 15.5 +%if 0%{?suse_version} > 1500 +%bcond_without omemo +%endif +%define sover 4 Name: libqxmpp -Version: 1.4.0 +Version: 1.5.3 Release: 0 Summary: Qt XMPP Library License: LGPL-2.1-or-later @@ -26,20 +30,24 @@ Group: Development/Libraries/C and C++ URL: https://github.com/qxmpp-project/qxmpp/ Source0: https://github.com/qxmpp-project/qxmpp/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: baselibs.conf -BuildRequires: cmake >= 3.3 +BuildRequires: cmake >= 3.7 BuildRequires: doxygen BuildRequires: fdupes +# c++-17 is required +%if 0%{?suse_version} == 1500 +BuildRequires: gcc10-c++ +%endif BuildRequires: pkgconfig -BuildRequires: cmake(Qt5Core) >= 5.7.0 +BuildRequires: cmake(Qca-qt5) +BuildRequires: cmake(Qt5Core) >= 5.15.0 BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Xml) BuildRequires: pkgconfig(gstreamer-1.0) -BuildRequires: pkgconfig(opus) -BuildRequires: pkgconfig(speex) -BuildRequires: pkgconfig(theora) -BuildRequires: pkgconfig(vpx) +%if %{with omemo} +BuildRequires: pkgconfig(libomemo-c) +%endif %description QXmpp is a cross-platform C++ XMPP client library based on Qt and C++. @@ -74,47 +82,53 @@ This packages provides documentation of Qxmpp library API. %prep %setup -q -n qxmpp-%{version} -# Disable tests needing a network connection -sed -i 's,add_simple_test(qxmppserver),#add_simple_test(qxmppserver),' tests/CMakeLists.txt -sed -i 's,add_simple_test(qxmppcallmanager),#add_simple_test(qxmppcallmanager),' tests/CMakeLists.txt -sed -i 's,add_simple_test(qxmppiceconnection),#add_simple_test(qxmppiceconnection),' tests/CMakeLists.txt -sed -i 's,add_subdirectory(qxmpptransfermanager),#add_subdirectory(qxmpptransfermanager),' tests/CMakeLists.txt -sed -i 's,add_subdirectory(qxmppuploadrequestmanager),#add_subdirectory(qxmppuploadrequestmanager),' tests/CMakeLists.txt %build +%if 0%{?suse_version} <= 1500 + export CXX=g++-10 +%endif + %cmake \ - -DWITH_SPEEX=ON \ - -DWITH_OPUS=ON \ - -DWITH_THEORA=ON \ - -DWITH_VPX=ON \ -DWITH_GSTREAMER=ON \ -DBUILD_DOCUMENTATION=ON \ -DBUILD_EXAMPLES=ON \ - -DBUILD_TESTS=ON + -DBUILD_TESTS=ON \ +%if %{with omemo} + -DBUILD_OMEMO=ON \ +%endif %cmake_build %install %cmake_install + %fdupes %{buildroot}%{_datadir}/doc/qxmpp/ %check export LD_LIBRARY_PATH=%{buildroot}%{_libdir} -%ctest -%post -n %{name}%{sover} -p /sbin/ldconfig -%postun -n %{name}%{sover} -p /sbin/ldconfig +# Exclude tests needing a network connection +%{ctest --exclude-regex "tst_(qxmppcallmanager|qxmppiceconnection|qxmppserver|qxmpptransfermanager|qxmppuploadrequestmanager)"} + +%ldconfig_scriptlets -n %{name}%{sover} %files -n %{name}%{sover} -%license LICENSE.LGPL +%license LICENSES/* %doc AUTHORS CHANGELOG.md README.md %{_libdir}/%{name}.so.* +%if %{with omemo} +%{_libdir}/libQXmppOmemo.so.* +%endif %files -n %{name}-devel %{_includedir}/qxmpp/ %{_libdir}/%{name}.so %{_libdir}/cmake/qxmpp/ %{_libdir}/pkgconfig/qxmpp.pc +%if %{with omemo} +%{_libdir}/libQXmppOmemo.so +%{_libdir}/cmake/QXmppOmemo/ +%endif %files doc %{_datadir}/doc/qxmpp/