From 3f572a4139ac02c76eaa6045670422875a1a3a00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20M=C3=BCller?= Date: Sun, 17 Sep 2023 14:08:29 +0200 Subject: [PATCH] RPM & CI: Build rpm packages against native qtsingleapplication MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcus Müller --- .github/workflows/all.yml | 9 ++++++--- dist/clementine.spec.in | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml index 3ee6aef00..ac90d1f23 100644 --- a/.github/workflows/all.yml +++ b/.github/workflows/all.yml @@ -231,6 +231,7 @@ jobs: qt5-qtbase-devel qt5-qtx11extras-devel qt5-rpm-macros + qtsingleapplication-qt5-devel rpmdevtools sha2-devel sparsehash-devel @@ -242,7 +243,7 @@ jobs: run: git config --global --add safe.directory ${GITHUB_WORKSPACE} - name: cmake working-directory: bin - run: cmake .. + run: cmake -DUSE_SYSTEM_QTSINGLEAPPLICATION=On .. - name: Build source tarball working-directory: bin run: ../dist/maketarball.sh @@ -303,6 +304,7 @@ jobs: qt5-qtbase-devel qt5-qtx11extras-devel qt5-rpm-macros + qtsingleapplication-qt5-devel rpmdevtools sha2-devel sparsehash-devel @@ -314,7 +316,7 @@ jobs: run: git config --global --add safe.directory ${GITHUB_WORKSPACE} - name: cmake working-directory: bin - run: cmake .. + run: cmake -DUSE_SYSTEM_QTSINGLEAPPLICATION=On .. - name: Build source tarball working-directory: bin run: ../dist/maketarball.sh @@ -375,6 +377,7 @@ jobs: qt5-qtbase-devel qt5-qtx11extras-devel qt5-rpm-macros + qtsingleapplication-qt5-devel rpmdevtools sha2-devel sparsehash-devel @@ -386,7 +389,7 @@ jobs: run: git config --global --add safe.directory ${GITHUB_WORKSPACE} - name: cmake working-directory: bin - run: cmake .. + run: cmake -DUSE_SYSTEM_QTSINGLEAPPLICATION=On .. - name: Build source tarball working-directory: bin run: ../dist/maketarball.sh diff --git a/dist/clementine.spec.in b/dist/clementine.spec.in index 673e9c145..caf45b121 100644 --- a/dist/clementine.spec.in +++ b/dist/clementine.spec.in @@ -18,6 +18,7 @@ BuildRequires: liblastfm-qt5-devel BuildRequires: desktop-file-utils BuildRequires: hicolor-icon-theme BuildRequires: libappstream-glib +BuildRequires: qtsingleapplication-qt5-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gio-2.0)