Skip to content
This repository was archived by the owner on Mar 20, 2025. It is now read-only.

Commit b6b095e

Browse files
lnjXlnjX
committed
Merge branch '1.5'
2 parents 9455f8c + d62fec5 commit b6b095e

File tree

9 files changed

+97
-109
lines changed

9 files changed

+97
-109
lines changed

‎.github/workflows/push-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Install Qt
2626
uses: jurplel/install-qt-action@v3
2727
- name: Install extra packages
28-
run: tests/travis/install-build-depends
28+
run: tests/travis/install-build-depends-debian
2929
- name: Update XEP metadata
3030
run: doc/doap-rendering/update-xeplist.sh
3131
- name: Build documentation

‎.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
version: ${{ matrix.qt_version }}
3535
setup-python: true
3636
- name: Install extra packages
37-
run: tests/travis/install-build-depends
37+
run: tests/travis/install-build-depends-debian
3838
- name: Run tests
3939
run: tests/travis/build-and-test
4040
- uses: codecov/codecov-action@v1
@@ -62,7 +62,7 @@ jobs:
6262
version: ${{ matrix.qt_version }}
6363
setup-python: false
6464
- name: Install extra packages
65-
run: tests/travis/install-build-depends
65+
run: tests/travis/install-build-depends-macos
6666
- name: Disable OS X firewall
6767
run: |
6868
sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off

‎CMakeLists.txt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -113,25 +113,6 @@ install(
113113
COMPONENT Devel
114114
)
115115

116-
# QXmpp package with Qt version autodetect
117-
configure_package_config_file(
118-
cmake/QXmppQtAutoConfig.cmake.in
119-
${CMAKE_CURRENT_BINARY_DIR}/QXmppConfig.cmake
120-
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/QXmpp"
121-
)
122-
123-
install(
124-
FILES ${CMAKE_CURRENT_BINARY_DIR}/QXmppConfig.cmake
125-
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/QXmpp"
126-
COMPONENT Devel
127-
)
128-
install(
129-
FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/QXmppQtAutoConfigVersion.cmake
130-
RENAME QXmppConfigVersion.cmake
131-
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/QXmpp"
132-
COMPONENT Devel
133-
)
134-
135116
# Generate QXmppQt5/6.pc
136117
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qxmpp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${QXMPP_TARGET}.pc @ONLY)
137118
install(
@@ -140,8 +121,27 @@ install(
140121
COMPONENT Devel
141122
)
142123

143-
# "qxmpp.pc" for backwards-compatibility
144124
if(QT_VERSION_MAJOR EQUAL 5)
125+
# "QXmpp" cmake package for backwards-compatibility
126+
configure_package_config_file(
127+
cmake/QXmppLegacyConfig.cmake.in
128+
${CMAKE_CURRENT_BINARY_DIR}/QXmppConfig.cmake
129+
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/QXmpp"
130+
)
131+
132+
install(
133+
FILES ${CMAKE_CURRENT_BINARY_DIR}/QXmppConfig.cmake
134+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/QXmpp"
135+
COMPONENT Devel
136+
)
137+
install(
138+
FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/QXmppLegacyConfigVersion.cmake
139+
RENAME QXmppConfigVersion.cmake
140+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/QXmpp"
141+
COMPONENT Devel
142+
)
143+
144+
# "qxmpp.pc" for backwards-compatibility
145145
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qxmpp_legacy.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qxmpp.pc @ONLY)
146146
install(
147147
FILES ${CMAKE_CURRENT_BINARY_DIR}/qxmpp.pc

‎cmake/QXmppQtAutoConfig.cmake.in renamed to ‎cmake/QXmppLegacyConfig.cmake.in

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,6 @@
44

55
@PACKAGE_INIT@
66

7-
# Detect Qt version
8-
if(NOT DEFINED QT_VERSION_MAJOR)
9-
if(TARGET Qt6::Core)
10-
set(QT_VERSION_MAJOR 6)
11-
elseif(TARGET Qt5::Core)
12-
set(QT_VERSION_MAJOR 5)
13-
else()
14-
# default to Qt 6
15-
set(QT_VERSION_MAJOR 6)
16-
endif()
17-
endif()
18-
197
set(_QXmpp_FIND_PARTS_REQUIRED)
208
if(QXmpp_FIND_REQUIRED)
219
set(_QXmpp_FIND_PARTS_REQUIRED REQUIRED)
@@ -25,13 +13,13 @@ if(QXmpp_FIND_QUIETLY)
2513
set(_QXmpp_FIND_PARTS_QUIET QUIET)
2614
endif()
2715

28-
# Pass through arguments to QXmppQt5/6
16+
# Pass through arguments to QXmppQt5
2917
include(CMakeFindDependencyMacro)
30-
find_package(QXmppQt${QT_VERSION_MAJOR}
18+
find_package(QXmppQt5
3119
${QXmpp_FIND_VERSION}
3220
${_QXmpp_FIND_PARTS_REQUIRED}
3321
${_QXmpp_FIND_PARTS_QUIET}
3422
COMPONENTS ${QXmpp_FIND_COMPONENTS}
3523
)
3624

37-
set(QXmpp_FOUND ${QXmppQt${QT_VERSION_MAJOR}_FOUND})
25+
set(QXmpp_FOUND ${QXmppQt5_FOUND})

‎cmake/QXmppQtAutoConfigVersion.cmake renamed to ‎cmake/QXmppLegacyConfigVersion.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
# SPDX-License-Identifier: CC0-1.0
44

55
set(PACKAGE_VERSION "")
6-
# Allow all requested versions here, the actual check is going to be done in QXmppQt5/6.
6+
# Allow all requested versions here, the actual check is going to be done in QXmppQt5.
77
set(PACKAGE_VERSION_COMPATIBLE TRUE)
88

‎tests/travis/build-and-test

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ full*)
1515
CMAKE_ARGS="-DBUILD_DOCUMENTATION:BOOL=True -DBUILD_EXAMPLES:BOOL=True -DWITH_GSTREAMER:BOOL=True"
1616
case "$QT_VERSION" in
1717
5.15* | 6*)
18-
# Enable OMEMO
19-
CMAKE_ARGS="$CMAKE_ARGS -DBUILD_OMEMO=ON"
18+
if [ $HOST_SYSTEM = "Linux" ]; then
19+
# Enable OMEMO
20+
CMAKE_ARGS="$CMAKE_ARGS -DBUILD_OMEMO=ON"
21+
fi
2022
;;
2123
esac
2224
;;

‎tests/travis/install-build-depends

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎tests/travis/install-build-depends-debian

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#!/bin/sh
2+
3+
# SPDX-FileCopyrightText: 2014 Boris Pek <[email protected]>
4+
# SPDX-FileCopyrightText: 2018 Jeremy Lainé <[email protected]>
5+
#
6+
# SPDX-License-Identifier: CC0-1.0
7+
8+
set -e
9+
10+
install_cmake() {
11+
NAME=$1
12+
URL=$2
13+
OPTS=$3
14+
CURRENT_DIR=$(pwd)
15+
16+
cd
17+
git clone $URL $NAME
18+
mkdir -p $NAME-build
19+
cmake $NAME -B./$NAME-build/ -DCMAKE_BUILD_TYPE=Release $OPTS
20+
cmake --build $NAME-build --parallel
21+
sudo cmake --build $NAME-build --target install
22+
23+
cd $CURRENT_DIR
24+
}
25+
26+
sudo apt-get update -qq
27+
sudo apt-get install -qq clang cmake git
28+
29+
case "$CONFIG" in
30+
full*)
31+
sudo apt-get install -qq \
32+
doxygen graphviz \
33+
libgstreamer1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly \
34+
libprotobuf-c-dev \
35+
libssl-dev
36+
37+
# Enable OMEMO for Qt > 5.15 (including Qt 6)
38+
# Build and install qca and libomemo-c
39+
case "$QT_VERSION" in
40+
5.15* | 6)
41+
install_cmake libomemo-c https://github.com/dino/libomemo-c "-DBUILD_SHARED_LIBS=ON"
42+
install_cmake qca https://invent.kde.org/libraries/qca "-DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DBUILD_WITH_QT6=OFF"
43+
;;
44+
esac
45+
;;
46+
esac

‎tests/travis/install-build-depends-macos

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/bin/sh
2+
3+
# SPDX-FileCopyrightText: 2014 Boris Pek <[email protected]>
4+
# SPDX-FileCopyrightText: 2018 Jeremy Lainé <[email protected]>
5+
#
6+
# SPDX-License-Identifier: CC0-1.0
7+
8+
set -e
9+
10+
brew update
11+
brew unlink python@3
12+
brew install python@3 || true
13+
brew link --overwrite python@3
14+
15+
case "$CONFIG" in
16+
full*)
17+
brew install doxygen \
18+
gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly
19+
;;
20+
esac

0 commit comments

Comments
 (0)