From 2a54152559a2b200e2129de56a8d4671854e0095 Mon Sep 17 00:00:00 2001 From: Vitaly Lipatov <lav@etersoft.ru> Date: Fri, 30 Dec 2022 00:57:54 +0300 Subject: [PATCH] epm repack librewolf: add support for rpm and deb systems --- play.d/librewolf.sh | 25 +++++++++++++++++++++---- repack.d/librewolf.sh | 4 ++-- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/play.d/librewolf.sh b/play.d/librewolf.sh index 6669493..b5aa20e 100755 --- a/play.d/librewolf.sh +++ b/play.d/librewolf.sh @@ -6,9 +6,26 @@ DESCRIPTION="LibreWolf - a custom version of Firefox, focused on privacy, securi . $(dirname $0)/common.sh -arch=amd64 -pkgtype=deb +pkgtype=$(epm print info -p) +case $pkgtype in + rpm) + PKG="https://rpm.librewolf.net/pool/librewolf*.rpm" + ;; + deb) + PKG="https://deb.librewolf.net/pool/focal/main/libr/librewolf/librewolf_*all.deb" + ;; + *) + fatal "Package target $pkgtype is not supported yet" + ;; +esac -PKG=$(epm tool eget --list --latest https://deb.librewolf.net/pool/focal/main/libr/librewolf/librewolf_*all.deb) || fatal "Can't get package URL" +case "$(epm print info -s)" in + alt) + # uses old glibc needed for ALT p10 + PKG="https://deb.librewolf.net/pool/focal/main/libr/librewolf/librewolf_*all.deb" + epm install --repack $PKG + exit + ;; +esac -epm install --repack "$PKG" +epm install "$PKG" diff --git a/repack.d/librewolf.sh b/repack.d/librewolf.sh index 4adf612..4a70a35 100755 --- a/repack.d/librewolf.sh +++ b/repack.d/librewolf.sh @@ -13,8 +13,6 @@ subst '1iAutoProv:no' $SPEC move_to_opt subst "s|/usr/share/$PRODUCT/$PRODUCT|$PRODUCT|" $BUILDROOT/usr/share/applications/start-$PRODUCT.desktop -cleanup - rm -f $BUILDROOT/usr/bin/librewolf add_bin_link_command @@ -26,3 +24,5 @@ done for i in $BUILDROOT/$PRODUCTDIR/gmp-clearkey/0.1/lib*.so ; do a= patchelf --set-rpath '$ORIGIN/../../' $i || continue done + +epm --skip-installed install fontconfig glib2 libalsa libatk libcairo libcairo-gobject libdbus libdbus-glib libfreetype libgdk-pixbuf libgio libgtk+3 libharfbuzz libpango libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst -- 2.24.1