From 10a68197d5530c2494a08d18b3f8980873124abb Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 2 May 2024 18:33:47 +0800 Subject: [PATCH 1/8] chore(rebuild): appimagelauncher Signed-off-by: madomado --- anda/tools/appimagelauncher/appimagelauncher.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/appimagelauncher/appimagelauncher.spec b/anda/tools/appimagelauncher/appimagelauncher.spec index 10420ae589..bbe0fbc859 100644 --- a/anda/tools/appimagelauncher/appimagelauncher.spec +++ b/anda/tools/appimagelauncher/appimagelauncher.spec @@ -3,7 +3,7 @@ Name: appimagelauncher Version: 2.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Helper application for Linux distributions serving as a kind of "entry point" for running and integrating AppImages License: MIT From 0f92031f6270bba757f3a4e4cd0329805278e78a Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 7 May 2024 10:43:40 +0800 Subject: [PATCH 2/8] fix(appimagelauncher): try mold Signed-off-by: madomado --- anda/tools/appimagelauncher/appimagelauncher.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/tools/appimagelauncher/appimagelauncher.spec b/anda/tools/appimagelauncher/appimagelauncher.spec index bbe0fbc859..ea9ae71f18 100644 --- a/anda/tools/appimagelauncher/appimagelauncher.spec +++ b/anda/tools/appimagelauncher/appimagelauncher.spec @@ -13,6 +13,7 @@ Patch0: use-fedora-qtlinguist.patch BuildRequires: make +BuildRequires: mold BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: glib2-devel @@ -47,7 +48,7 @@ BuildRequires: libqtxdg-devel -DUSE_SYSTEM_XDGUTILS=ON \ -DUSE_SYSTEM_LIBAPPIMAGE=ON -%cmake_build +mold -run %cmake_build %install From 7f225b934e506c028bc7350f4f15091780ad1884 Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 7 May 2024 10:48:28 +0800 Subject: [PATCH 3/8] some funky mold -run and macro expansion stuff Signed-off-by: madomado --- anda/tools/appimagelauncher/appimagelauncher.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/anda/tools/appimagelauncher/appimagelauncher.spec b/anda/tools/appimagelauncher/appimagelauncher.spec index ea9ae71f18..78e9744cf1 100644 --- a/anda/tools/appimagelauncher/appimagelauncher.spec +++ b/anda/tools/appimagelauncher/appimagelauncher.spec @@ -48,8 +48,11 @@ BuildRequires: libqtxdg-devel -DUSE_SYSTEM_XDGUTILS=ON \ -DUSE_SYSTEM_LIBAPPIMAGE=ON -mold -run %cmake_build - +cat< build.sh +%cmake_build +EOF +chmod +x build.sh +mold -run ./build.sh %install %cmake_install From a87002d493b1a16f2e9df833a8f2611734ed9bc8 Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 7 May 2024 10:54:02 +0800 Subject: [PATCH 4/8] clang? Signed-off-by: madomado --- anda/tools/appimagelauncher/appimagelauncher.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/tools/appimagelauncher/appimagelauncher.spec b/anda/tools/appimagelauncher/appimagelauncher.spec index 78e9744cf1..fde438f508 100644 --- a/anda/tools/appimagelauncher/appimagelauncher.spec +++ b/anda/tools/appimagelauncher/appimagelauncher.spec @@ -15,7 +15,7 @@ Patch0: use-fedora-qtlinguist.patch BuildRequires: make BuildRequires: mold BuildRequires: cmake -BuildRequires: gcc-c++ +BuildRequires: clang++ BuildRequires: glib2-devel BuildRequires: cairo-devel BuildRequires: fuse-devel @@ -39,6 +39,7 @@ BuildRequires: libqtxdg-devel %build +export CXX="${CXX:clang++}" %cmake -DBUILD_SHARED_LIBS:BOOL=OFF \ -DUSE_SYSTEM_LIBARCHIVE=ON \ -DUSE_SYSTEM_LIBCURL=ON \ From caf74aa8ae9db8ca5e3e8c30767dc2a2a336e7d7 Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 7 May 2024 10:59:41 +0800 Subject: [PATCH 5/8] Update appimagelauncher.spec Signed-off-by: madomado --- anda/tools/appimagelauncher/appimagelauncher.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/appimagelauncher/appimagelauncher.spec b/anda/tools/appimagelauncher/appimagelauncher.spec index fde438f508..89605a3933 100644 --- a/anda/tools/appimagelauncher/appimagelauncher.spec +++ b/anda/tools/appimagelauncher/appimagelauncher.spec @@ -15,7 +15,7 @@ Patch0: use-fedora-qtlinguist.patch BuildRequires: make BuildRequires: mold BuildRequires: cmake -BuildRequires: clang++ +BuildRequires: clang BuildRequires: glib2-devel BuildRequires: cairo-devel BuildRequires: fuse-devel From f07d02cd8ea7ba141abbab8c9a330b857bc35dde Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 7 May 2024 11:17:08 +0800 Subject: [PATCH 6/8] clang++? Signed-off-by: madomado --- anda/tools/appimagelauncher/appimagelauncher.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/anda/tools/appimagelauncher/appimagelauncher.spec b/anda/tools/appimagelauncher/appimagelauncher.spec index 89605a3933..ca3aa6ebc8 100644 --- a/anda/tools/appimagelauncher/appimagelauncher.spec +++ b/anda/tools/appimagelauncher/appimagelauncher.spec @@ -29,6 +29,8 @@ BuildRequires: libappimageupdate-devel BuildRequires: systemd-rpm-macros BuildRequires: librsvg2-devel BuildRequires: libqtxdg-devel +BuildRequires: /usr/bin/ranlib +BuildRequires: /usr/bin/ar %description @@ -39,9 +41,8 @@ BuildRequires: libqtxdg-devel %build -export CXX="${CXX:clang++}" -%cmake -DBUILD_SHARED_LIBS:BOOL=OFF \ - -DUSE_SYSTEM_LIBARCHIVE=ON \ +%define __cxx clang++ +%cmake -DBUILD_SHARED_LIBS:BOOL=OFF \ -DUSE_SYSTEM_LIBARCHIVE=ON \ -DUSE_SYSTEM_LIBCURL=ON \ -DUSE_SYSTEM_SQUASHFUSE=ON \ -DUSE_SYSTEM_BOOST=ON \ From 2b0ff67bc3f0dbbba48e7ef3bb08f0a6474b7bd9 Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 7 May 2024 11:24:15 +0800 Subject: [PATCH 7/8] dunno Signed-off-by: madomado --- anda/tools/appimagelauncher/appimagelauncher.spec | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/anda/tools/appimagelauncher/appimagelauncher.spec b/anda/tools/appimagelauncher/appimagelauncher.spec index ca3aa6ebc8..deba31bbfe 100644 --- a/anda/tools/appimagelauncher/appimagelauncher.spec +++ b/anda/tools/appimagelauncher/appimagelauncher.spec @@ -13,9 +13,8 @@ Patch0: use-fedora-qtlinguist.patch BuildRequires: make -BuildRequires: mold BuildRequires: cmake -BuildRequires: clang +BuildRequires: gcc-c++ BuildRequires: glib2-devel BuildRequires: cairo-devel BuildRequires: fuse-devel @@ -41,7 +40,6 @@ BuildRequires: /usr/bin/ar %build -%define __cxx clang++ %cmake -DBUILD_SHARED_LIBS:BOOL=OFF \ -DUSE_SYSTEM_LIBARCHIVE=ON \ -DUSE_SYSTEM_LIBCURL=ON \ -DUSE_SYSTEM_SQUASHFUSE=ON \ @@ -49,12 +47,7 @@ BuildRequires: /usr/bin/ar -DUSE_SYSTEM_CURL=ON \ -DUSE_SYSTEM_XDGUTILS=ON \ -DUSE_SYSTEM_LIBAPPIMAGE=ON - -cat< build.sh %cmake_build -EOF -chmod +x build.sh -mold -run ./build.sh %install %cmake_install From 154e3dd1e12054ed525b42750c248846282e35ac Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 7 May 2024 12:16:53 +0800 Subject: [PATCH 8/8] Update appimagelauncher.spec Signed-off-by: madomado --- anda/tools/appimagelauncher/appimagelauncher.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/anda/tools/appimagelauncher/appimagelauncher.spec b/anda/tools/appimagelauncher/appimagelauncher.spec index deba31bbfe..e4c68cd2aa 100644 --- a/anda/tools/appimagelauncher/appimagelauncher.spec +++ b/anda/tools/appimagelauncher/appimagelauncher.spec @@ -40,14 +40,22 @@ BuildRequires: /usr/bin/ar %build -%cmake -DBUILD_SHARED_LIBS:BOOL=OFF \ -DUSE_SYSTEM_LIBARCHIVE=ON \ +%cmake \ + -DBUILD_SHARED_LIBS:BOOL=OFF \ + -DUSE_SYSTEM_LIBARCHIVE=ON \ -DUSE_SYSTEM_LIBCURL=ON \ -DUSE_SYSTEM_SQUASHFUSE=ON \ -DUSE_SYSTEM_BOOST=ON \ -DUSE_SYSTEM_CURL=ON \ -DUSE_SYSTEM_XDGUTILS=ON \ - -DUSE_SYSTEM_LIBAPPIMAGE=ON + -DUSE_SYSTEM_LIBAPPIMAGE=ON \ + -DBUILD_TESTING='OFF' \ + -Wno-dev + +make libappimageupdate libappimageupdate-qt %cmake_build +make + %install %cmake_install