diff --git a/extras/packaging/gnu-linux/Makefile b/extras/packaging/gnu-linux/Makefile index 1eb20537187313ebde65b316ecc4c3be82a9e8d8..48e19d9e3b03fa212b2f64aa8214e2d303f97813 100644 --- a/extras/packaging/gnu-linux/Makefile +++ b/extras/packaging/gnu-linux/Makefile @@ -171,6 +171,7 @@ DISTRIBUTIONS := \ fedora_39 \ fedora_40 \ fedora_41 \ + fedora_42 \ alma_9 \ opensuse-leap_15.5 \ opensuse-leap_15.6 \ diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_42 b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_42 new file mode 100644 index 0000000000000000000000000000000000000000..12e95563088c797d430abcf47564c214d44b6eda --- /dev/null +++ b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_42 @@ -0,0 +1,97 @@ +FROM fedora:42 + +RUN dnf clean all +RUN dnf update -y + +RUN dnf install -y dnf-command\(builddep\) rpmdevtools && \ + dnf install -y mock + +RUN dnf group install -y x-software-development + +RUN dnf install -y \ + git \ + make \ + autoconf \ + automake \ + nasm \ + speexdsp-devel \ + pulseaudio-libs-devel \ + libcanberra-devel \ + libcurl-devel \ + libtool \ + mesa-libgbm-devel \ + dbus-devel \ + expat-devel \ + pcre-devel \ + yaml-cpp-devel \ + yasm \ + speex-devel \ + gsm-devel \ + chrpath \ + check \ + astyle \ + uuid-c++-devel \ + gettext-devel \ + gcc14 \ + gcc14-c++ \ + which \ + alsa-lib-devel \ + systemd-devel \ + uuid-devel \ + gnutls-devel \ + nettle-devel \ + opus-devel \ + jsoncpp-devel \ + libnatpmp-devel \ + webkitgtk4-devel \ + cryptopp-devel \ + libva-devel \ + libvdpau-devel \ + msgpack-devel \ + NetworkManager-libnm-devel \ + openssl-devel \ + clutter-devel \ + clutter-gtk-devel \ + libappindicator-gtk3-devel \ + libnotify-devel \ + libupnp-devel \ + qrencode-devel \ + libargon2-devel \ + libsndfile-devel \ + gperf \ + bison \ + clang18-devel \ + llvm18-devel \ + nodejs \ + flex \ + gstreamer1-plugins-base-devel \ + gstreamer1-plugins-good \ + gstreamer1-plugins-bad-free-devel \ + nss-devel \ + libxcb* \ + libxkb* \ + vulkan-devel \ + xcb-util-* \ + wget \ + libstdc++-static \ + sqlite-devel \ + perl-generators \ + perl-English \ + libxshmfence-devel \ + ninja-build \ + cmake \ + fmt-devel \ + python3.10 \ + cups-devel \ + pipewire-devel + +# Use GCC 14 instead of GCC 15 (the default on Fedora 42) +# because Qt 6.6.3 fails to build when using the latter. +RUN rm /usr/bin/gcc /usr/bin/g++ /usr/bin/c++ && \ + ln -s /usr/bin/gcc-14 /usr/bin/gcc && \ + ln -s /usr/bin/g++-14 /usr/bin/g++ && \ + ln -s /usr/bin/g++-14 /usr/bin/c++ + +ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh + +CMD ["/opt/build-package-rpm.sh"] diff --git a/extras/packaging/gnu-linux/scripts/build-package-rpm.sh b/extras/packaging/gnu-linux/scripts/build-package-rpm.sh index 7c0e07840b1cd4c5239fcf502c7c8a1245b57e35..93ad5d35cc52812573e6b95cd4a377d395cebfd2 100755 --- a/extras/packaging/gnu-linux/scripts/build-package-rpm.sh +++ b/extras/packaging/gnu-linux/scripts/build-package-rpm.sh @@ -107,6 +107,8 @@ if [ ! -f "${RPM_PATH}" ]; then cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc40.x86_64.rpm "${RPM_PATH}" elif [[ "${DISTRIBUTION}" == "fedora_41" ]]; then cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc41.x86_64.rpm "${RPM_PATH}" + elif [[ "${DISTRIBUTION}" == "fedora_42" ]]; then + cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc42.x86_64.rpm "${RPM_PATH}" elif [[ "${DISTRIBUTION}" == "alma_9" ]]; then cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.el9.x86_64.rpm "${RPM_PATH}" else