build: remove obsolete references to qrencode

Follow-up to commit 6094968.

Change-Id: I0140a2e2833677b30caebca47110a0ded0b47fae
This commit is contained in:
François-Simon Fauteux-Chapleau
2025-11-04 16:06:37 -05:00
parent 0a34c274cb
commit d9f2dbde83
15 changed files with 8 additions and 128 deletions

View File

@@ -56,7 +56,7 @@ It should be (For now qt5 only is packaged by distributions, so names can change
#### Dependencies, Debian based #### Dependencies, Debian based
```bash ```bash
sudo apt-get install cmake make doxygen g++ gettext libnotify-dev pandoc nasm libqrencode-dev \ sudo apt-get install cmake make doxygen g++ gettext libnotify-dev pandoc nasm \
libnotify-dev libnm-dev \ libnotify-dev libnm-dev \
qt6-base-dev \ qt6-base-dev \
qtmultimedia5-dev libqt6svg6-dev qt6-webengine-dev \ qtmultimedia5-dev libqt6svg6-dev qt6-webengine-dev \
@@ -73,7 +73,7 @@ sudo apt-get install cmake make doxygen g++ gettext libnotify-dev pandoc nasm li
#### Dependencies, Fedora based #### Dependencies, Fedora based
```bash ```bash
sudo dnf install qt6-qtsvg-devel qt6-qtwebengine-devel qt6-qtmultimedia-devel qt6-qtdeclarative-devel qt6-qtquickcontrols2-devel qt6-qtquickcontrols qrencode-devel NetworkManager-libnm-devel sudo dnf install qt6-qtsvg-devel qt6-qtwebengine-devel qt6-qtmultimedia-devel qt6-qtdeclarative-devel qt6-qtquickcontrols2-devel qt6-qtquickcontrols NetworkManager-libnm-devel
``` ```
### Qt from sources ### Qt from sources

View File

@@ -112,7 +112,7 @@ ZYPPER_CLIENT_DEPENDENCIES = [
'qt6-svg-devel', 'qt6-multimedia-devel', 'qt6-multimedia-imports', 'qt6-svg-devel', 'qt6-multimedia-devel', 'qt6-multimedia-imports',
'qt6-declarative-devel', 'qt6-qmlcompiler-private-devel', 'qt6-declarative-devel', 'qt6-qmlcompiler-private-devel',
'qt6-quickcontrols2-devel', 'qt6-shadertools-devel', 'qt6-quickcontrols2-devel', 'qt6-shadertools-devel',
'qrencode-devel', 'NetworkManager-devel', 'hunspell-devel', 'libhunspell-devel' 'NetworkManager-devel', 'hunspell-devel', 'libhunspell-devel'
] ]
ZYPPER_QT_WEBENGINE = [ ZYPPER_QT_WEBENGINE = [
@@ -139,7 +139,7 @@ DNF_CLIENT_DEPENDENCIES = [
'libnotify-devel', 'libnotify-devel',
'qt6-qtbase-devel', 'qt6-qtbase-devel',
'qt6-qtsvg-devel', 'qt6-qtmultimedia-devel', 'qt6-qtdeclarative-devel', 'qt6-qtsvg-devel', 'qt6-qtmultimedia-devel', 'qt6-qtdeclarative-devel',
'qrencode-devel', 'NetworkManager-libnm-devel', 'hunspell-devel', 'libhunspell-devel' 'NetworkManager-libnm-devel', 'hunspell-devel', 'libhunspell-devel'
] ]
DNF_QT_WEBENGINE = ['qt6-qtwebengine-devel'] DNF_QT_WEBENGINE = ['qt6-qtwebengine-devel']
@@ -171,7 +171,7 @@ APT_CLIENT_DEPENDENCIES = [
'qml6-module-qtquick-dialogs', 'qml6-module-qtquick-layouts', 'qml6-module-qtquick-dialogs', 'qml6-module-qtquick-layouts',
'qml6-module-qtquick-shapes', 'qml6-module-qtquick-window', 'qml6-module-qtquick-shapes', 'qml6-module-qtquick-window',
'qml6-module-qtquick-templates', 'qml6-module-qt-labs-platform', 'qml6-module-qtquick-templates', 'qml6-module-qt-labs-platform',
'libqrencode-dev', 'libnm-dev', 'hunspell', 'libhunspell-dev' 'libnm-dev', 'hunspell', 'libhunspell-dev'
] ]
APT_QT_WEBENGINE = [ APT_QT_WEBENGINE = [
@@ -194,7 +194,7 @@ PACMAN_CLIENT_DEPENDENCIES = [
'qt6-declarative', 'qt6-5compat', 'qt6-multimedia', 'qt6-declarative', 'qt6-5compat', 'qt6-multimedia',
'qt6-networkauth', 'qt6-shadertools', 'qt6-networkauth', 'qt6-shadertools',
'qt6-svg', 'qt6-tools', 'qt6-svg', 'qt6-tools',
'qrencode', 'libnm', 'hunspell' 'libnm', 'hunspell'
] ]
PACMAN_QT_WEBENGINE = ['qt6-webengine'] PACMAN_QT_WEBENGINE = ['qt6-webengine']

View File

@@ -75,7 +75,6 @@ RUN dnf install -y \
pipewire-devel \ pipewire-devel \
pulseaudio-libs-devel \ pulseaudio-libs-devel \
python3-html5lib \ python3-html5lib \
qrencode-devel \
speex-devel \ speex-devel \
speexdsp-devel \ speexdsp-devel \
sqlite-devel \ sqlite-devel \

View File

@@ -64,7 +64,6 @@ RUN dnf install -y \
libappindicator-gtk3-devel \ libappindicator-gtk3-devel \
libnotify-devel \ libnotify-devel \
libupnp-devel \ libupnp-devel \
qrencode-devel \
libargon2-devel \ libargon2-devel \
libsndfile-devel \ libsndfile-devel \
libdrm \ libdrm \

View File

@@ -61,7 +61,6 @@ RUN dnf install -y \
libappindicator-gtk3-devel \ libappindicator-gtk3-devel \
libnotify-devel \ libnotify-devel \
libupnp-devel \ libupnp-devel \
qrencode-devel \
libargon2-devel \ libargon2-devel \
libsndfile-devel \ libsndfile-devel \
libdrm \ libdrm \

View File

@@ -55,7 +55,6 @@ RUN dnf install -y \
libappindicator-gtk3-devel \ libappindicator-gtk3-devel \
libnotify-devel \ libnotify-devel \
libupnp-devel \ libupnp-devel \
qrencode-devel \
libargon2-devel \ libargon2-devel \
libsndfile-devel \ libsndfile-devel \
gperf \ gperf \

View File

@@ -55,7 +55,6 @@ RUN dnf install -y \
libappindicator-gtk3-devel \ libappindicator-gtk3-devel \
libnotify-devel \ libnotify-devel \
libupnp-devel \ libupnp-devel \
qrencode-devel \
libargon2-devel \ libargon2-devel \
libsndfile-devel \ libsndfile-devel \
gperf \ gperf \

View File

@@ -57,7 +57,6 @@ RUN zypper --non-interactive install -y \
libappindicator-devel \ libappindicator-devel \
sqlite3-devel \ sqlite3-devel \
gtk3-devel\ gtk3-devel\
qrencode-devel \
python311 \ python311 \
python311-python-dateutil \ python311-python-dateutil \
python311-html5lib \ python311-html5lib \

View File

@@ -101,7 +101,6 @@
"libxkbcommon" "libxkbcommon"
"md4c" "md4c"
"network-manager" ;libnm "network-manager" ;libnm
"qrencode"
"qtbase" "qtbase"
"qt5compat" "qt5compat"
"qtdeclarative" "qtdeclarative"

View File

@@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 9),
python3, python3,
libnm-dev, libnm-dev,
libnotify-dev, libnotify-dev,
libqrencode-dev,
libayatana-appindicator3-dev | libappindicator3-dev, libayatana-appindicator3-dev | libappindicator3-dev,
# daemon # daemon
libdbus-1-dev, libdbus-1-dev,

View File

@@ -31,9 +31,6 @@ BuildRequires: make
# For generating resources.qrc in build time. # For generating resources.qrc in build time.
BuildRequires: python3 BuildRequires: python3
# Build and runtime dependencies.
BuildRequires: qrencode-devel
%description %description
This package contains the Qt desktop client of Jami. Jami is a free This package contains the Qt desktop client of Jami. Jami is a free
software for universal communication which respects freedoms and software for universal communication which respects freedoms and

View File

@@ -321,7 +321,6 @@ parts:
- gzip - gzip
- libnotify-dev - libnotify-dev
- libpipewire-0.3-dev - libpipewire-0.3-dev
- libqrencode-dev
- libspeex-dev - libspeex-dev
- python3 - python3
- python3-dev - python3-dev
@@ -358,7 +357,6 @@ parts:
- libopus0 - libopus0
- libpcre2-8-0 - libpcre2-8-0
- pipewire-bin - pipewire-bin
- libqrencode4
- libqt-jami - libqt-jami
- libsnappy1v5 - libsnappy1v5
- libspeex1 - libspeex1

View File

@@ -207,7 +207,6 @@ def init_submodules():
# Init the client submodules for Windows other than the daemon. # Init the client submodules for Windows other than the daemon.
submodules = [ submodules = [
"3rdparty/qrencode-win32",
"3rdparty/SortFilterProxyModel", "3rdparty/SortFilterProxyModel",
"3rdparty/md4c", "3rdparty/md4c",
"3rdparty/tidy-html5", "3rdparty/tidy-html5",
@@ -220,21 +219,6 @@ def init_submodules():
sys.exit(1) sys.exit(1)
def build_deps():
"""Build the dependencies for the project."""
print('Building qrencode')
qrencode_dir = os.path.join(repo_root_dir, '3rdparty', 'qrencode-win32')
vs_env_vars = {}
vs_env_vars.update(get_vs_env())
toolset = get_latest_toolset_version()
print(f'Using toolset {toolset}')
msbuild_args = get_ms_build_args("x64", "Release-Lib", toolset)
proj_path = os.path.join(
qrencode_dir, "qrencode-win32", "vc15", "qrcodelib", "qrcodelib.vcxproj"
)
build_project(msbuild_args, proj_path, vs_env_vars)
def cmake_generate(options, env_vars, cmake_build_dir): def cmake_generate(options, env_vars, cmake_build_dir):
"""Generate the cmake project.""" """Generate the cmake project."""
print("Generating cmake project...") print("Generating cmake project...")
@@ -549,7 +533,6 @@ def main():
if parsed_args.init: if parsed_args.init:
init_submodules() init_submodules()
build_deps()
sys.exit(0) sys.exit(0)
config_str = ('Release', 'Beta')[parsed_args.beta] config_str = ('Release', 'Beta')[parsed_args.beta]

View File

@@ -1,89 +0,0 @@
#!/usr/bin/env bash
set -e
# Usage:
# ./build_qrencode.sh -a <architecture>
# Accepted architectures: arm64, x86_64, unified
# If no architecture is specified, the script builds for the host architecture.
# Initialize variables
arch=''
while getopts "a:" OPT; do
case "$OPT" in
a)
arch="${OPTARG}"
;;
\?)
echo "Invalid option: -$OPTARG" >&2
echo "Usage: $0 [-a architecture]"
echo "Accepted architectures: arm64, x86_64, unified"
exit 1
;;
esac
done
# Determine architectures to build
if [[ "$arch" == 'unified' ]]; then
ARCHS=("arm64" "x86_64")
elif [[ "$arch" == '' ]]; then
# Detect host architecture
HOST_ARCH=$(uname -m)
case "$HOST_ARCH" in
x86_64|arm64)
ARCHS=("$HOST_ARCH")
;;
*)
echo "Unsupported host architecture: $HOST_ARCH"
echo "Supported architectures are: arm64, x86_64, unified"
exit 1
;;
esac
else
# Validate specified architecture
case "$arch" in
x86_64|arm64)
ARCHS=("$arch")
;;
*)
echo "Invalid architecture specified: $arch"
echo "Accepted architectures are: arm64, x86_64, unified"
exit 1
;;
esac
fi
TOP="$(pwd)"
QRENCODEDIR="${TOP}/3rdparty/libqrencode"
BUILDDIR="${QRENCODEDIR}/build-libqrencode"
LIBDIR="${QRENCODEDIR}/lib"
INCLUDEDIR="${QRENCODEDIR}/include"
# Clean up build directory
echo "Preparing clean build directory"
rm -rf "$BUILDDIR"
mkdir -p "$BUILDDIR"
# Clean output directories
rm -rf "$LIBDIR" "$INCLUDEDIR"
mkdir -p "$LIBDIR"
mkdir -p "$INCLUDEDIR"
# Convert architectures to semicolon-separated format for cmake
ARCHS_SEMICOLON_SEPARATED=$(IFS=";"; echo "${ARCHS[*]}")
echo "Configuring CMake for architectures: ${ARCHS[*]}"
cd "$BUILDDIR"
cmake "$QRENCODEDIR" \
-DCMAKE_OSX_ARCHITECTURES="$ARCHS_SEMICOLON_SEPARATED" \
-DCMAKE_INSTALL_PREFIX="$QRENCODEDIR" \
-DWITHOUT_PNG=ON \
-DBUILD_SHARED_LIBS=OFF \
-G "Xcode"
echo "Building libqrencode for architectures: ${ARCHS[*]}"
cmake --build . --config Release
echo "Installing libqrencode to $LIBDIR and $INCLUDEDIR"
cmake --install . --config Release
echo "Build and installation completed successfully, with outputs in $LIBDIR and $INCLUDEDIR."

View File

@@ -73,7 +73,6 @@ if(MSVC)
list(APPEND WINDOWS_LIBS list(APPEND WINDOWS_LIBS
${QTWRAPPER_LIB} ${QTWRAPPER_LIB}
${RINGCLIENT_STATIC_LIB} ${RINGCLIENT_STATIC_LIB}
${QRENCODE_LIB}
${GNUTLS_LIB} ${GNUTLS_LIB}
${DRING_LIB} ${DRING_LIB}
${WINDOWS_SYS_LIBS}) ${WINDOWS_SYS_LIBS})