summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorstefanwimmer1282023-07-14 12:19:29 +0200
committerstefanwimmer1282023-07-14 13:09:48 +0200
commit5fb56910c1a8392d596f51afcfa66b04d36aea41 (patch)
tree65e204ca7c4ca3683d21775ad7ab9848d2879cd5
parentd228e9821354dbad5480e2cdd91d3a5a93872261 (diff)
downloadaur-5fb56910c1a8392d596f51afcfa66b04d36aea41.tar.gz
Use upstream OpenSUSE patches
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD11
2 files changed, 10 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ecdd38ed19b7..46a42cec8661 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -78,6 +78,7 @@ pkgbase = firedragon-unsigned-extensions
source = librewolf-source::git+https://gitlab.com/librewolf-community/browser/source.git#tag=115.0.2-2
source = librewolf-settings::git+https://gitlab.com/librewolf-community/settings.git
source = cachyos-source::git+https://github.com/CachyOS/CachyOS-Browser-Common.git
+ source = opensuse-source::git+https://github.com/openSUSE/firefox-maintenance.git
validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
sha256sums = 6b2844124c13b4bd9d97ac7f5840f3e957b7631659591f3bea1ac9a89bee1654
sha256sums = SKIP
@@ -87,5 +88,6 @@ pkgbase = firedragon-unsigned-extensions
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
+ sha256sums = SKIP
pkgname = firedragon-unsigned-extensions
diff --git a/PKGBUILD b/PKGBUILD
index dd1801e4f9e8..63b368d01dc0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -45,7 +45,8 @@ source=(https://archive.mozilla.org/pub/firefox/releases/"$pkgver"/source/firefo
"git+https://gitlab.com/dr460nf1r3/settings.git"
"librewolf-source::git+https://gitlab.com/librewolf-community/browser/source.git#tag=115.0.2-2"
"librewolf-settings::git+https://gitlab.com/librewolf-community/settings.git"
- "cachyos-source::git+https://github.com/CachyOS/CachyOS-Browser-Common.git")
+ "cachyos-source::git+https://github.com/CachyOS/CachyOS-Browser-Common.git"
+ "opensuse-source::git+https://github.com/openSUSE/firefox-maintenance.git")
sha256sums=('6b2844124c13b4bd9d97ac7f5840f3e957b7631659591f3bea1ac9a89bee1654'
'SKIP'
'53d3e743f3750522318a786befa196237892c93f20571443fdf82a480e7f0560'
@@ -53,6 +54,7 @@ sha256sums=('6b2844124c13b4bd9d97ac7f5840f3e957b7631659591f3bea1ac9a89bee1654'
'SKIP'
'SKIP'
'SKIP'
+ 'SKIP'
'SKIP')
# sha256sums_aarch64=()
validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
@@ -87,6 +89,9 @@ prepare() {
local _cachyos_patches_dir
_cachyos_patches_dir="${srcdir}/cachyos-source/patches"
+ local _opensuse_patches_dir
+ _opensuse_patches_dir="${srcdir}/opensuse-source/firefox"
+
cat >../mozconfig <<END
ac_add_options --enable-application=browser
mk_add_options MOZ_OBJDIR=${PWD@Q}/obj
@@ -178,8 +183,8 @@ END
patch -Np1 -i "${_librewolf_patches_dir}"/remove_addons.patch
# OpenSUSE KDE patches
- patch -Np1 -i "${_patches_dir}"/kde-upstream/firefox-kde.patch
- patch -Np1 -i "${_patches_dir}"/kde-upstream/mozilla-kde.patch
+ patch -Np1 -i "${_opensuse_patches_dir}"/firefox-kde.patch
+ patch -Np1 -i "${_opensuse_patches_dir}"/mozilla-kde.patch
# Disabling Pocket
patch -Np1 -i "${_librewolf_patches_dir}"/sed-patches/disable-pocket.patch