Merge branch '1.5'

qxmpp-project · Apr 30, 2023 · 19a3052 · 19a3052
2 parents ab4bdf2 + 5a5bebe
commit 19a3052
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,13 @@ QXmpp 1.6.0 (UNRELEASED)
 
 *under development*
 
+QXmpp 1.5.5 (Apr 30, 2023)
+--------------------------
+
+Fixes:
+ - Fix dependencies in generated pkg-config files (@krop)
+ - Fix compilation with android/clang (@lnjX)
+
 QXmpp 1.5.4 (Apr 07, 2023)
 --------------------------
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -126,16 +126,16 @@ install(
 )
 
 # Generate QXmppQt5/6.pc
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qxmpp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qxmpp.pc @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qxmpp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${QXMPP_TARGET}.pc @ONLY)
 install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/qxmpp.pc
-    RENAME QXmppQt${QT_VERSION_MAJOR}.pc
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/${QXMPP_TARGET}.pc
     DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
     COMPONENT Devel
 )
 
 # "qxmpp.pc" for backwards-compatibility
 if(QT_VERSION_MAJOR EQUAL 5)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qxmpp_legacy.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qxmpp.pc @ONLY)
     install(
         FILES ${CMAKE_CURRENT_BINARY_DIR}/qxmpp.pc
         DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"

diff --git a/qxmpp.pc.in b/qxmpp.pc.in
@@ -5,13 +5,13 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
 libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/qxmpp
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/@QXMPP_TARGET@
 
 
-Name: Qxmpp
+Name: @QXMPP_TARGET@
 Description: QXmpp Library
 Version: @PROJECT_VERSION@
-Libs: -lqxmpp
-Libs.private: -lQt5Network -lQt5Xml -lQt5Core
+Libs: -l@QXMPP_TARGET@
+Libs.private: -lQt@QT_VERSION_MAJOR@Network -lQt@QT_VERSION_MAJOR@Xml -lQt@QT_VERSION_MAJOR@Core
 Cflags: -I${includedir}
 
diff --git a/qxmpp_legacy.pc.in b/qxmpp_legacy.pc.in
@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: 2017 Niels Ole Salscheider <[email protected]>
+#
+# SPDX-License-Identifier: CC0-1.0
+
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/QXmppQt5
+
+
+Name: Qxmpp
+Description: QXmpp Library
+Version: @PROJECT_VERSION@
+Requires: QXmppQt5
+Libs: -lQXmppQt5
+Cflags: -I${includedir}
+
diff --git a/src/client/QXmppHttpFileSharingProvider.cpp b/src/client/QXmppHttpFileSharingProvider.cpp
@@ -151,7 +151,7 @@ auto QXmppHttpFileSharingProvider::uploadFile(std::unique_ptr<QIODevice> data,
         // reduce ref count, so the signal connection doesn't keep the state alive forever
         state.reset();
     });
-    QObject::connect(state->upload.get(), &QXmppHttpUpload::progressChanged, [stateRef = std::weak_ptr(state), reportProgress = std::move(reportProgress)]() {
+    QObject::connect(state->upload.get(), &QXmppHttpUpload::progressChanged, [stateRef = std::weak_ptr<State>(state), reportProgress = std::move(reportProgress)]() {
         if (auto state = stateRef.lock()) {
             reportProgress(state->upload->bytesSent(), state->upload->bytesTotal());
         }