diff --git a/INSTALL.md b/INSTALL.md index 766eb3d8b..6f8830d2b 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -56,7 +56,7 @@ It should be (For now qt5 only is packaged by distributions, so names can change #### Dependencies, Debian based ```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 \ qt6-base-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 ```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 diff --git a/build.py b/build.py index c54ced7ed..8f95e86b7 100755 --- a/build.py +++ b/build.py @@ -112,7 +112,7 @@ ZYPPER_CLIENT_DEPENDENCIES = [ 'qt6-svg-devel', 'qt6-multimedia-devel', 'qt6-multimedia-imports', 'qt6-declarative-devel', 'qt6-qmlcompiler-private-devel', 'qt6-quickcontrols2-devel', 'qt6-shadertools-devel', - 'qrencode-devel', 'NetworkManager-devel', 'hunspell-devel', 'libhunspell-devel' + 'NetworkManager-devel', 'hunspell-devel', 'libhunspell-devel' ] ZYPPER_QT_WEBENGINE = [ @@ -139,7 +139,7 @@ DNF_CLIENT_DEPENDENCIES = [ 'libnotify-devel', 'qt6-qtbase-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'] @@ -171,7 +171,7 @@ APT_CLIENT_DEPENDENCIES = [ 'qml6-module-qtquick-dialogs', 'qml6-module-qtquick-layouts', 'qml6-module-qtquick-shapes', 'qml6-module-qtquick-window', 'qml6-module-qtquick-templates', 'qml6-module-qt-labs-platform', - 'libqrencode-dev', 'libnm-dev', 'hunspell', 'libhunspell-dev' + 'libnm-dev', 'hunspell', 'libhunspell-dev' ] APT_QT_WEBENGINE = [ @@ -194,7 +194,7 @@ PACMAN_CLIENT_DEPENDENCIES = [ 'qt6-declarative', 'qt6-5compat', 'qt6-multimedia', 'qt6-networkauth', 'qt6-shadertools', 'qt6-svg', 'qt6-tools', - 'qrencode', 'libnm', 'hunspell' + 'libnm', 'hunspell' ] PACMAN_QT_WEBENGINE = ['qt6-webengine'] diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_alma_10 b/extras/packaging/gnu-linux/docker/Dockerfile_alma_10 index 7ea6bede8..79f9ae3a7 100644 --- a/extras/packaging/gnu-linux/docker/Dockerfile_alma_10 +++ b/extras/packaging/gnu-linux/docker/Dockerfile_alma_10 @@ -75,7 +75,6 @@ RUN dnf install -y \ pipewire-devel \ pulseaudio-libs-devel \ python3-html5lib \ - qrencode-devel \ speex-devel \ speexdsp-devel \ sqlite-devel \ @@ -91,4 +90,4 @@ RUN dnf install -y \ yasm ADD extras/packaging/gnu-linux/scripts/install-ffmpeg-for-qt.sh /opt/install-ffmpeg-for-qt.sh ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh -CMD ["/opt/build-package-rpm.sh"] \ No newline at end of file +CMD ["/opt/build-package-rpm.sh"] diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_alma_9 b/extras/packaging/gnu-linux/docker/Dockerfile_alma_9 index ba5decc0c..3c8d17438 100644 --- a/extras/packaging/gnu-linux/docker/Dockerfile_alma_9 +++ b/extras/packaging/gnu-linux/docker/Dockerfile_alma_9 @@ -64,7 +64,6 @@ RUN dnf install -y \ libappindicator-gtk3-devel \ libnotify-devel \ libupnp-devel \ - qrencode-devel \ libargon2-devel \ libsndfile-devel \ libdrm \ @@ -102,4 +101,4 @@ RUN dnf install -y \ pipewire-devel ADD extras/packaging/gnu-linux/scripts/install-ffmpeg-for-qt.sh /opt/install-ffmpeg-for-qt.sh ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh -CMD ["/opt/build-package-rpm.sh"] \ No newline at end of file +CMD ["/opt/build-package-rpm.sh"] diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_41 b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_41 index 5b70c1ed6..1b9bc0826 100644 --- a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_41 +++ b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_41 @@ -61,7 +61,6 @@ RUN dnf install -y \ libappindicator-gtk3-devel \ libnotify-devel \ libupnp-devel \ - qrencode-devel \ libargon2-devel \ libsndfile-devel \ libdrm \ diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_42 b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_42 index 2e9fa3d5b..977b420dd 100644 --- a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_42 +++ b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_42 @@ -55,7 +55,6 @@ RUN dnf install -y \ libappindicator-gtk3-devel \ libnotify-devel \ libupnp-devel \ - qrencode-devel \ libargon2-devel \ libsndfile-devel \ gperf \ diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_43 b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_43 index b715e5793..41571c0fb 100644 --- a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_43 +++ b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_43 @@ -55,7 +55,6 @@ RUN dnf install -y \ libappindicator-gtk3-devel \ libnotify-devel \ libupnp-devel \ - qrencode-devel \ libargon2-devel \ libsndfile-devel \ gperf \ diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.6 b/extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.6 index 3ff00c91f..0702856fc 100644 --- a/extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.6 +++ b/extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.6 @@ -57,7 +57,6 @@ RUN zypper --non-interactive install -y \ libappindicator-devel \ sqlite3-devel \ gtk3-devel\ - qrencode-devel \ python311 \ python311-python-dateutil \ python311-html5lib \ diff --git a/extras/packaging/gnu-linux/guix/manifest.scm b/extras/packaging/gnu-linux/guix/manifest.scm index e1fa8b5dc..b1c26faf0 100644 --- a/extras/packaging/gnu-linux/guix/manifest.scm +++ b/extras/packaging/gnu-linux/guix/manifest.scm @@ -101,7 +101,6 @@ "libxkbcommon" "md4c" "network-manager" ;libnm - "qrencode" "qtbase" "qt5compat" "qtdeclarative" diff --git a/extras/packaging/gnu-linux/rules/debian/control b/extras/packaging/gnu-linux/rules/debian/control index c445ed4bd..26e903375 100644 --- a/extras/packaging/gnu-linux/rules/debian/control +++ b/extras/packaging/gnu-linux/rules/debian/control @@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 9), python3, libnm-dev, libnotify-dev, - libqrencode-dev, libayatana-appindicator3-dev | libappindicator3-dev, # daemon libdbus-1-dev, diff --git a/extras/packaging/gnu-linux/rules/rpm/jami.spec b/extras/packaging/gnu-linux/rules/rpm/jami.spec index a9dbd3128..20c97482b 100644 --- a/extras/packaging/gnu-linux/rules/rpm/jami.spec +++ b/extras/packaging/gnu-linux/rules/rpm/jami.spec @@ -31,9 +31,6 @@ BuildRequires: make # For generating resources.qrc in build time. BuildRequires: python3 -# Build and runtime dependencies. -BuildRequires: qrencode-devel - %description This package contains the Qt desktop client of Jami. Jami is a free software for universal communication which respects freedoms and diff --git a/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml b/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml index 8d1e7505d..1adb53fe3 100644 --- a/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml +++ b/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml @@ -321,7 +321,6 @@ parts: - gzip - libnotify-dev - libpipewire-0.3-dev - - libqrencode-dev - libspeex-dev - python3 - python3-dev @@ -358,7 +357,6 @@ parts: - libopus0 - libpcre2-8-0 - pipewire-bin - - libqrencode4 - libqt-jami - libsnappy1v5 - libspeex1 diff --git a/extras/scripts/build-windows.py b/extras/scripts/build-windows.py index 3bdd40910..210db43f0 100644 --- a/extras/scripts/build-windows.py +++ b/extras/scripts/build-windows.py @@ -207,7 +207,6 @@ def init_submodules(): # Init the client submodules for Windows other than the daemon. submodules = [ - "3rdparty/qrencode-win32", "3rdparty/SortFilterProxyModel", "3rdparty/md4c", "3rdparty/tidy-html5", @@ -220,21 +219,6 @@ def init_submodules(): 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): """Generate the cmake project.""" print("Generating cmake project...") @@ -549,7 +533,6 @@ def main(): if parsed_args.init: init_submodules() - build_deps() sys.exit(0) config_str = ('Release', 'Beta')[parsed_args.beta] diff --git a/extras/scripts/build_qrencode.sh b/extras/scripts/build_qrencode.sh deleted file mode 100755 index 5eb3d2064..000000000 --- a/extras/scripts/build_qrencode.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bash -set -e - -# Usage: -# ./build_qrencode.sh -a -# 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." diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c5228ccfa..a1aeb22fe 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -73,7 +73,6 @@ if(MSVC) list(APPEND WINDOWS_LIBS ${QTWRAPPER_LIB} ${RINGCLIENT_STATIC_LIB} - ${QRENCODE_LIB} ${GNUTLS_LIB} ${DRING_LIB} ${WINDOWS_SYS_LIBS})