Almalinux: build on stable version withotu plugin store

GitLab: #1418 Change-Id: I37239869e691a621138ae0616695f8efdf4b47ca
Donation banner: patch focus when press tab
2025-10-30 07:53:33 +08:00 · 2023-12-01 15:29:06 -04:00 · 2023-12-01 13:52:26 -05:00
5 changed files with 162 additions and 18 deletions
--- a/build.py
+++ b/build.py
@ -45,7 +45,7 @@ APT_BASED_DISTROS = [
 ]

 DNF_BASED_DISTROS = [
-    'fedora', 'rhel',
+    'fedora', 'rhel', 'almalinux',
 ]

 PACMAN_BASED_DISTROS = [
--- a/extras/packaging/gnu-linux/Makefile
+++ b/extras/packaging/gnu-linux/Makefile
@ -171,6 +171,7 @@ DISTRIBUTIONS := \
 	fedora_37 \
 	fedora_38 \
 	fedora_39 \
+	alma_9 \
 	opensuse-leap_15.4 \
 	snap

--- a/extras/packaging/gnu-linux/docker/Dockerfile_alma_9
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_alma_9
@ -0,0 +1,105 @@
+FROM almalinux:9
+RUN dnf clean all
+RUN dnf update -y
+RUN dnf install -y epel-release
+RUN dnf install -y 'dnf-command(config-manager)'
+RUN dnf config-manager --set-enabled crb
+RUN dnf config-manager --set-enabled appstream
+RUN dnf install -y dnf-command\(builddep\) rpmdevtools && \
+    dnf install -y mock
+RUN yum install -y wget && \
+    wget https://repo.almalinux.org/almalinux/9/devel/x86_64/os/Packages/uuid-c++-devel-1.6.2-55.el9.x86_64.rpm && \
+    yum localinstall -y uuid-c++-devel-1.6.2-55.el9.x86_64.rpm && \
+    rm -f uuid-c++-devel-1.6.2-55.el9.x86_64.rpm
+RUN yum install -y xorg-x11-xauth
+RUN dnf install -y \
+        git \
+        rpm-build \
+        tar \
+        make \
+        autoconf \
+        automake \
+        nasm \
+        speexdsp-devel \
+        pulseaudio-libs-devel \
+        libcanberra-devel \
+        libcurl-devel \
+        libtool \
+        mesa-libgbm-devel \
+        mesa-dri-drivers \
+        dbus-devel \
+        expat-devel \
+        pcre-devel \
+        yaml-cpp-devel \
+        libXext-devel \
+        libXfixes-devel \
+        yasm \
+        speex-devel \
+        gsm-devel \
+        chrpath \
+        check \
+        astyle \
+        gettext-devel \
+        gcc-c++ \
+        which \
+        alsa-lib-devel \
+        systemd-devel \
+        libuuid-devel \
+        uuid-devel \
+        gnutls-devel \
+        nettle-devel \
+        opus-devel \
+        patch \
+        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 \
+        libdrm \
+        gperf \
+        bison \
+        clang \
+        clang-devel \
+        llvm-devel \
+        nodejs \
+        flex \
+        gstreamer1 gstreamer1-devel \
+        gstreamer1-plugins-base-devel \
+        gstreamer1-plugins-good \
+        gstreamer1-plugins-bad-free-devel \
+        nss-devel \
+        libxcb* \
+        libxkb* \
+        libX11-devel \
+        vulkan-devel \
+        libXrender-devel \
+        xcb-util-* \
+        xz \
+        xkeyboard-config \
+        libnotify \
+        wget \
+        libstdc++-static \
+        sqlite-devel \
+        perl-generators \
+        perl-English \
+        libxshmfence-devel \
+        ninja-build \
+        clang \
+        cmake \
+        fmt-devel \
+        python3-html5lib \
+        cups-devel
+ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh
+CMD ["/opt/build-package-rpm.sh"]
--- a/extras/packaging/gnu-linux/scripts/build-package-rpm.sh
+++ b/extras/packaging/gnu-linux/scripts/build-package-rpm.sh
@ -113,6 +113,8 @@ if [ ! -f "${RPM_PATH}" ]; then
            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc38.x86_64.rpm "${RPM_PATH}"
        elif [[ "${DISTRIBUTION}" == "fedora_39" ]]; then
            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc39.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
            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-*.rpm "${RPM_PATH}"
        fi
--- a/src/app/mainview/components/DonationBanner.qml
+++ b/src/app/mainview/components/DonationBanner.qml
@ -50,8 +50,8 @@ Rectangle {
            Layout.row: 0
            Layout.column: 0
            Layout.rowSpan: 2
-            Layout.preferredHeight: 70
-            Layout.preferredWidth: 45
+            Layout.preferredHeight: 53
+            Layout.preferredWidth: 43
            Layout.leftMargin: 10
            Layout.topMargin: 10
            Layout.bottomMargin: 15
@ -61,10 +61,16 @@ Rectangle {
            Image {
                id: donationImage
                height: parent.height
-                width: 50
+                width: parent.width
                anchors.centerIn: parent
                source: JamiResources.icon_donate_svg
            }
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    Qt.openUrlExternally(JamiTheme.donationUrl);
+                }
+            }
        }

        Rectangle {
@ -90,6 +96,12 @@ Rectangle {

                font.pointSize: JamiTheme.textFontSize
            }
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    Qt.openUrlExternally(JamiTheme.donationUrl);
+                }
+            }
        }

        Rectangle {
@ -102,8 +114,26 @@ Rectangle {

            color: JamiTheme.transparentColor

-            Text {
-                id: notNowText
+            PushButton {
+                //Scaffold{}
+                id: notNowButton
+                anchors.top: parent.top
+                anchors.left: parent.left
+                height: 15
+                width: 75
+                preferredLeftMargin: 0
+                preferredRightMargin: 0
+                buttonText: JamiStrings.notNow
+                buttonTextColor: JamiTheme.donationButtonTextColor
+                buttonTextFontSize: JamiTheme.textFontSize + 4
+                normalColor: "transparent"
+                hoveredColor: "transparent"
+                pressedColor: "transparent"
+                onClicked: {
+                    // When the user clicks on "Not now", we set the donation date to 7 days from now (1 for the test)
+                    UtilsAdapter.setAppValue(Settings.Key.Donation2023VisibleDate, new Date(new Date().getTime() + 7 * 24 * 60 * 60 * 1000).toISOString().slice(0, 16).replace("T", " "));
+                    donation.donationVisible = Qt.binding(() => JamiQmlUtils.isDonationBannerVisible());
+                }
                MouseArea {
                    cursorShape: Qt.PointingHandCursor
                    anchors.fill: parent
@ -113,11 +143,6 @@ Rectangle {
                        donation.donationVisible = Qt.binding(() => JamiQmlUtils.isDonationBannerVisible());
                    }
                }
-                text: JamiStrings.notNow
-                color: JamiTheme.donationButtonTextColor
-                anchors.top: parent.top
-                anchors.left: parent.left
-                font.pointSize: JamiTheme.textFontSize
            }
        }

@ -129,8 +154,24 @@ Rectangle {
            Layout.preferredWidth: (parent.width - 50) / 2
            color: JamiTheme.transparentColor

-            Text {
-                id: donateText
+            PushButton {
+                //Scaffold{}
+                id: donateButton
+                anchors.top: parent.top
+                anchors.left: parent.left
+                height: 15
+                width: 75
+                preferredLeftMargin: 0
+                preferredRightMargin: 0
+                buttonText: JamiStrings.donation
+                buttonTextColor: JamiTheme.donationButtonTextColor
+                buttonTextFontSize: JamiTheme.textFontSize + 4
+                normalColor: "transparent"
+                hoveredColor: "transparent"
+                pressedColor: "transparent"
+                onClicked: {
+                    Qt.openUrlExternally(JamiTheme.donationUrl);
+                }
                MouseArea {
                    cursorShape: Qt.PointingHandCursor
                    anchors.fill: parent
@ -138,11 +179,6 @@ Rectangle {
                        Qt.openUrlExternally(JamiTheme.donationUrl);
                    }
                }
-                text: JamiStrings.donation
-                font.pointSize: JamiTheme.textFontSize
-                color: JamiTheme.donationButtonTextColor
-                anchors.top: parent.top
-                anchors.left: parent.left
            }
        }
    }
Author	SHA1	Message	Date
lcoursodon	ffff7baf16	Almalinux: build on stable version withotu plugin store GitLab: #1418 Change-Id: I37239869e691a621138ae0616695f8efdf4b47ca	2023-12-01 15:29:06 -04:00
lcoursodon	67904773d7	Donation banner: patch focus when press tab Change-Id: I113e412fdda28ef91be8fdc506309c4f84bc7350	2023-12-01 13:52:26 -05:00