From 4babcd6664d43deb73649982b1ee416488c065e8 Mon Sep 17 00:00:00 2001 From: june <159748074+june-fish@users.noreply.github.com> Date: Sun, 14 Jun 2026 02:27:57 -0700 Subject: [PATCH] fix (legcord): use electron macros (#12408) * use electron macros * run build script * it builds * use more macros * cleanup and it builds, TODO: fix hack * hack less bad * less evil hack * no mock * less evil hack * same changes for legcord nightly * its fineeeeeeeee --- anda/apps/legcord/nightly/anda.hcl | 1 - .../apps/legcord/nightly/legcord-nightly.spec | 47 ++++++------------- anda/apps/legcord/stable/anda.hcl | 3 -- anda/apps/legcord/stable/legcord.spec | 47 ++++++------------- 4 files changed, 30 insertions(+), 68 deletions(-) diff --git a/anda/apps/legcord/nightly/anda.hcl b/anda/apps/legcord/nightly/anda.hcl index 993068d0b8..bfbaa2b100 100644 --- a/anda/apps/legcord/nightly/anda.hcl +++ b/anda/apps/legcord/nightly/anda.hcl @@ -4,6 +4,5 @@ project pkg { } labels { nightly = 1 - mock = 1 } } diff --git a/anda/apps/legcord/nightly/legcord-nightly.spec b/anda/apps/legcord/nightly/legcord-nightly.spec index 24da306bbc..ac506d88e4 100644 --- a/anda/apps/legcord/nightly/legcord-nightly.spec +++ b/anda/apps/legcord/nightly/legcord-nightly.spec @@ -2,18 +2,15 @@ %global commit_date 20260614 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global debug_package %nil -%global __strip /bin/true -%global __provides_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$ -%ifnarch aarch64 -%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\aarch64*\\.so.*))$ -%elifarch aarch64 -%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\x86_64*\\.so.*)|(.*\\x86-64*\\.so.*))$ -%endif +# terrible evil no good very bad hack +# fix one day +%global __requires_exclude_from (.*)lib(.*)so(.*) Name: legcord-nightly +%electronmeta -D Version: %commit_date.%shortcommit Release: 1%{?dist} -License: OSL-3.0 +License: OSL-3.0 AND %{electron_license} Summary: Custom lightweight Discord client designed to enhance your experience URL: https://github.com/Legcord/Legcord Group: Applications/Internet @@ -31,38 +28,21 @@ while keeping everything lightweight. %git_clone %{url}.git %{commit} %build -pnpm install -pnpm run build -pnpm run package --linux AppImage tar.gz +echo "Electron Builder" > %{rpmbuilddir}/webapp-tool.txt +%pnpm_build -r build %install -mkdir -p %{buildroot}%{_datadir}/legcord -%ifarch aarch64 -mv dist/linux-arm64-unpacked/* %{buildroot}%{_datadir}/legcord -%else -mv dist/linux-unpacked/* -t %{buildroot}%{_datadir}/legcord -%endif - -mkdir -p %{buildroot}%{_bindir} -ln -sf %{_datadir}/legcord/legcord %{buildroot}%{_bindir}/legcord -install -Dm644 dist/.icon-set/icon_16.png %{buildroot}%{_iconsdir}/hicolor/16x16/apps/legcord.png -install -Dm644 dist/.icon-set/icon_32.png %{buildroot}%{_iconsdir}/hicolor/32x32/apps/legcord.png -install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}%{_iconsdir}/hicolor/48x48/apps/legcord.png -install -Dm644 dist/.icon-set/icon_64.png %{buildroot}%{_iconsdir}/hicolor/64x64/apps/legcord.png -install -Dm644 dist/.icon-set/icon_128.png %{buildroot}%{_iconsdir}/hicolor/128x128/apps/legcord.png -install -Dm644 dist/.icon-set/icon_256.png %{buildroot}%{_iconsdir}/hicolor/256x256/apps/legcord.png -install -Dm644 dist/.icon-set/icon_512.png %{buildroot}%{_iconsdir}/hicolor/512x512/apps/legcord.png -install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}%{_iconsdir}/hicolor/1024x1024/apps/legcord.png +%electron_install -i legcord -l -I dist/.icon-set/icon_16.png -I dist/.icon-set/icon_32.png -I dist/.icon-set/icon_48x48.png -I dist/.icon-set/icon_64.png -I dist/.icon-set/icon_128.png -I dist/.icon-set/icon_256.png -I dist/.icon-set/icon_512.png -I dist/.icon-set/icon_1024.png dist/Legcord-*.AppImage --appimage-extract '*.desktop' -desktop-file-install --set-key=Exec --set-value="%{_datadir}/legcord/legcord %U" squashfs-root/legcord.desktop +%desktop_file_install -k Exec,Icon -v "%{_libdir}/legcord-nightly/Legcord",legcord -u %U -f squashfs-root/Legcord.desktop %files %doc README.md %license license.txt -%{_bindir}/legcord -%{_datadir}/applications/legcord.desktop -%{_datadir}/legcord/ +%{_bindir}/legcord-nightly +%{_datadir}/applications/Legcord.desktop +%{_libdir}/legcord-nightly/ %{_iconsdir}/hicolor/16x16/apps/legcord.png %{_iconsdir}/hicolor/32x32/apps/legcord.png %{_iconsdir}/hicolor/48x48/apps/legcord.png @@ -73,6 +53,9 @@ desktop-file-install --set-key=Exec --set-value="%{_datadir}/legcord/legcord %U" %{_iconsdir}/hicolor/1024x1024/apps/legcord.png %changelog +* Mon May 18 2026 june-fish - 1.2.4-1 +- Use electron macros + * Fri Nov 22 2024 owen - 1.0.2-2 - Add nightly package. diff --git a/anda/apps/legcord/stable/anda.hcl b/anda/apps/legcord/stable/anda.hcl index 3a5fd3890d..644535f337 100644 --- a/anda/apps/legcord/stable/anda.hcl +++ b/anda/apps/legcord/stable/anda.hcl @@ -2,7 +2,4 @@ project pkg { rpm { spec = "legcord.spec" } - labels { - mock =1 - } } diff --git a/anda/apps/legcord/stable/legcord.spec b/anda/apps/legcord/stable/legcord.spec index 445ae3002e..cf0ea0b736 100644 --- a/anda/apps/legcord/stable/legcord.spec +++ b/anda/apps/legcord/stable/legcord.spec @@ -1,17 +1,14 @@ -%define debug_package %nil +%global debug_package %nil -# Exclude private libraries -%global __provides_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$ -%ifnarch aarch64 -%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\aarch64*\\.so.*))$ -%elifarch aarch64 -%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\x86_64*\\.so.*)|(.*\\x86-64*\\.so.*))$ -%endif +# terrible evil no good very bad hack +# fix one day +%global __requires_exclude_from (.*)lib(.*)so(.*) Name: legcord +%electronmeta -D Version: 1.2.4 Release: 1%{?dist} -License: OSL-3.0 +License: OSL-3.0 AND %{electron_license} Summary: Custom lightweight Discord client designed to enhance your experience URL: https://github.com/Legcord/Legcord Group: Applications/Internet @@ -30,38 +27,21 @@ while keeping everything lightweight. %git_clone %url v%version %build -pnpm install -pnpm run build -pnpm run package --linux AppImage tar.gz +echo "Electron Builder" > %{rpmbuilddir}/webapp-tool.txt +%pnpm_build -r build %install -mkdir -p %{buildroot}%{_datadir}/legcord -%ifarch aarch64 -mv dist/linux-arm64-unpacked/* %{buildroot}%{_datadir}/legcord -%else -mv dist/linux-unpacked/* -t %{buildroot}%{_datadir}/legcord -%endif - -mkdir -p %{buildroot}%{_bindir} -ln -sf %{_datadir}/legcord/legcord %{buildroot}%{_bindir}/legcord -install -Dm644 dist/.icon-set/icon_16.png %{buildroot}%{_iconsdir}/hicolor/16x16/apps/legcord.png -install -Dm644 dist/.icon-set/icon_32.png %{buildroot}%{_iconsdir}/hicolor/32x32/apps/legcord.png -install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}%{_iconsdir}/hicolor/48x48/apps/legcord.png -install -Dm644 dist/.icon-set/icon_64.png %{buildroot}%{_iconsdir}/hicolor/64x64/apps/legcord.png -install -Dm644 dist/.icon-set/icon_128.png %{buildroot}%{_iconsdir}/hicolor/128x128/apps/legcord.png -install -Dm644 dist/.icon-set/icon_256.png %{buildroot}%{_iconsdir}/hicolor/256x256/apps/legcord.png -install -Dm644 dist/.icon-set/icon_512.png %{buildroot}%{_iconsdir}/hicolor/512x512/apps/legcord.png -install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}%{_iconsdir}/hicolor/1024x1024/apps/legcord.png +%electron_install -i legcord -l -I dist/.icon-set/icon_16.png -I dist/.icon-set/icon_32.png -I dist/.icon-set/icon_48x48.png -I dist/.icon-set/icon_64.png -I dist/.icon-set/icon_128.png -I dist/.icon-set/icon_256.png -I dist/.icon-set/icon_512.png -I dist/.icon-set/icon_1024.png dist/Legcord-*.AppImage --appimage-extract '*.desktop' -desktop-file-install --set-key=Exec --set-value="%{_datadir}/legcord/legcord %U" squashfs-root/legcord.desktop +%desktop_file_install -k Exec,Icon -v "%{_libdir}/legcord/Legcord",legcord -u %U -f squashfs-root/Legcord.desktop %files %doc README.md %license license.txt %{_bindir}/legcord -%{_datadir}/applications/legcord.desktop -%{_datadir}/legcord/ +%{_datadir}/applications/Legcord.desktop +%{_libdir}/legcord/ %{_iconsdir}/hicolor/16x16/apps/legcord.png %{_iconsdir}/hicolor/32x32/apps/legcord.png %{_iconsdir}/hicolor/48x48/apps/legcord.png @@ -72,6 +52,9 @@ desktop-file-install --set-key=Exec --set-value="%{_datadir}/legcord/legcord %U" %{_iconsdir}/hicolor/1024x1024/apps/legcord.png %changelog +* Mon May 18 2026 june-fish - 1.2.4-1 +- Use electron macros + * Mon Oct 21 2024 madonuko - 1.0.2-2 - Rename to LegCord.