Update patchsets

This commit is contained in:
dr460nf1r3 2022-02-12 14:05:45 +01:00
parent 9b10a8b9c5
commit f6325e8fbb
No known key found for this signature in database
GPG Key ID: B5C20B53B5FB19ED
2 changed files with 22 additions and 12 deletions

View File

@ -1,7 +1,7 @@
pkgbase = firedragon pkgbase = firedragon
pkgdesc = Librewolf fork build using custom branding, settings & KDE patches by OpenSUSE pkgdesc = Librewolf fork build using custom branding, settings & KDE patches by OpenSUSE
pkgver = 97.0 pkgver = 97.0
pkgrel = 1 pkgrel = 2
url = https://gitlab.com/dr460nf1r3/settings/ url = https://gitlab.com/dr460nf1r3/settings/
install = firedragon.install install = firedragon.install
arch = x86_64 arch = x86_64

View File

@ -5,7 +5,7 @@
pkgname=firedragon pkgname=firedragon
_pkgname=FireDragon _pkgname=FireDragon
pkgver=97.0 pkgver=97.0
pkgrel=1 pkgrel=2
pkgdesc="Librewolf fork build using custom branding, settings & KDE patches by OpenSUSE" pkgdesc="Librewolf fork build using custom branding, settings & KDE patches by OpenSUSE"
arch=(x86_64 x86_64_v3) arch=(x86_64 x86_64_v3)
backup=('usr/lib/firedragon/firedragon.cfg' backup=('usr/lib/firedragon/firedragon.cfg'
@ -55,7 +55,7 @@ prepare() {
# Prepare KDE patch # Prepare KDE patch
sed -i 's/kmozillahelper/kfiredragonhelper/g' ${_patches_dir}/librewolf/mozilla-kde_after_unity.patch sed -i 's/kmozillahelper/kfiredragonhelper/g' ${_patches_dir}/librewolf/mozilla-kde_after_unity.patch
sed -i 's/kmozillahelper/kfiredragonhelper/g' ${_patches_dir}/kde/mozilla-kde.patch sed -i 's/kmozillahelper/kfiredragonhelper/g' ${_patches_dir}/kde/mozilla-kde.patch
# Arch patches # Arch patches
echo "---- Arch patches" echo "---- Arch patches"
@ -64,7 +64,7 @@ sed -i 's/kmozillahelper/kfiredragonhelper/g' ${_patches_dir}/kde/mozilla-kde.pa
# KDE patches (W. Rosenauer) # KDE patches (W. Rosenauer)
echo "---- Patching for KDE" echo "---- Patching for KDE"
patch -Np1 -i ${_patches_dir}/kde/mozilla-nongnome-proxies.patch patch -Np1 -i ${_patches_dir}/kde/mozilla-nongnome-proxies.patch
patch -Np1 -i ${_patches_dir}/kde/mozilla-kde.patch #patch -Np1 -i ${_patches_dir}/kde/mozilla-kde.patch
# Ubuntu patches # Ubuntu patches
echo "---- Misc patches" echo "---- Misc patches"
@ -75,17 +75,27 @@ sed -i 's/kmozillahelper/kfiredragonhelper/g' ${_patches_dir}/kde/mozilla-kde.pa
# Gentoo patches # Gentoo patches
echo "---- Gentoo patches" echo "---- Gentoo patches"
patch -Np1 -i ${_patches_dir}/gentoo/0019-bmo-1516081-Disable-watchdog-during-PGO-builds.patch patch -Np1 -i ${_patches_dir}/gentoo/0001-Don-t-use-build-id.patch
patch -Np1 -i ${_patches_dir}/gentoo/0025-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
patch -Np1 -i ${_patches_dir}/gentoo/0002-Fortify-sources-properly.patch patch -Np1 -i ${_patches_dir}/gentoo/0002-Fortify-sources-properly.patch
patch -Np1 -i ${_patches_dir}/gentoo/0003-Check-additional-plugins-dir.patch patch -Np1 -i ${_patches_dir}/gentoo/0003-Check-additional-plugins-dir.patch
# patch -Np1 -i ${_patches_dir}/gentoo/0007-Support-sndio-audio-framework.patch patch -Np1 -i ${_patches_dir}/gentoo/0007-Support-sndio-audio-framework.patch
patch -Np1 -i ${_patches_dir}/gentoo/0008-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch patch -Np1 -i ${_patches_dir}/gentoo/0008-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch
patch -Np1 -i ${_patches_dir}/gentoo/0009-bmo-1516803-Fix-building-sandbox.patch
patch -Np1 -i ${_patches_dir}/gentoo/0019-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
patch -Np1 -i ${_patches_dir}/gentoo/0018-Make-PGO-use-toolchain.patch
patch -Np1 -i ${_patches_dir}/gentoo/0020-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
patch -Np1 -i ${_patches_dir}/gentoo/0021-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch patch -Np1 -i ${_patches_dir}/gentoo/0021-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
# patch -Np1 -i ${_patches_dir}/gentoo/0026-Make-elfhack-use-toolchain.patch patch -Np1 -i ${_patches_dir}/gentoo/0022-Fix-building-with-PGO-when-using-GCC.patch
patch -Np1 -i ${_patches_dir}/gentoo/0028-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch patch -Np1 -i ${_patches_dir}/gentoo/0023-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
patch -Np1 -i ${_patches_dir}/gentoo/0029-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch patch -Np1 -i ${_patches_dir}/gentoo/0024-build-Disable-Werror.patch
patch -Np1 -i ${_patches_dir}/gentoo/0031-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch patch -Np1 -i ${_patches_dir}/gentoo/0025-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
patch -Np1 -i ${_patches_dir}/gentoo/0026-Disable-FFVPX-with-VA-API.patch
patch -Np1 -i ${_patches_dir}/gentoo/0027-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
patch -Np1 -i ${_patches_dir}/gentoo/0028-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
patch -Np1 -i ${_patches_dir}/gentoo/0029-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
patch -Np1 -i ${_patches_dir}/gentoo/0030-bgo-816975-fix-build-on-x86.patch
patch -Np1 -i ${_patches_dir}/gentoo/0031-bgo-831903-pip-dont-fail-with-optional-deps.patch
patch -Np1 -i ${_patches_dir}/gentoo/0032-skip-pip-check.patch
# Use more system libs # Use more system libs
echo "---- Patching for system libs" echo "---- Patching for system libs"
@ -108,7 +118,7 @@ sed -i 's/kmozillahelper/kfiredragonhelper/g' ${_patches_dir}/kde/mozilla-kde.pa
patch -Np1 -i ${_patches_dir}/librewolf/unity-menubar.patch patch -Np1 -i ${_patches_dir}/librewolf/unity-menubar.patch
# custom patch that does not conflict with the unity patch # custom patch that does not conflict with the unity patch
# patch -Np1 -i ${_patches_dir}/librewolf/mozilla-kde_after_unity.patch patch -Np1 -i ${_patches_dir}/librewolf/mozilla-kde_after_unity.patch
# Remove Mozilla VPN ads # Remove Mozilla VPN ads
patch -Np1 -i ${_patches_dir}/librewolf/mozilla-vpn-ad.patch patch -Np1 -i ${_patches_dir}/librewolf/mozilla-vpn-ad.patch