diff --git a/.SRCINFO b/.SRCINFO index e5412fe..ad14614 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = firedragon pkgdesc = Librewolf fork build using custom branding, settings & KDE patches by OpenSUSE - pkgver = 100.0.2 - pkgrel = 4 + pkgver = 101.0 + pkgrel = 1 url = https://gitlab.com/dr460nf1r3/settings/ install = firedragon.install arch = x86_64 @@ -63,22 +63,24 @@ pkgbase = firedragon options = !strip options = !lto options = !debug - backup = usr/lib/librewolf/librewolf.cfg - backup = usr/lib/librewolf/distribution/policies.json - source = https://archive.mozilla.org/pub/firefox/releases/100.0.2/source/firefox-100.0.2.source.tar.xz - source = https://archive.mozilla.org/pub/firefox/releases/100.0.2/source/firefox-100.0.2.source.tar.xz.asc + backup = usr/lib/firedragon/firedragon.cfg + backup = usr/lib/firedragon/distribution/policies.json + source = https://archive.mozilla.org/pub/firefox/releases/101.0/source/firefox-101.0.source.tar.xz + source = https://archive.mozilla.org/pub/firefox/releases/101.0/source/firefox-101.0.source.tar.xz.asc source = firedragon.desktop source = git+https://gitlab.com/dr460nf1r3/common.git source = git+https://gitlab.com/dr460nf1r3/settings.git source = librewolf-source::git+https://gitlab.com/librewolf-community/browser/source.git source = librewolf-settings::git+https://gitlab.com/librewolf-community/settings.git + source = cachyos-source::git+https://github.com/CachyOS/CachyOS-Browser-Common.git validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353 - sha256sums = dc109861204f6938fd8f147af89a694eb516f3d4bb64ce3f0116452d654a8417 + sha256sums = 55ab5b517d58bbcbc837640263a8371cf1fba3d9f508e54537c4d2cbbfb86095 sha256sums = SKIP sha256sums = 158152bdb9ef6a83bad62ae03a3d9bc8ae693b34926e53cc8c4de07df20ab22d sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP + sha256sums = SKIP pkgname = firedragon diff --git a/.gitignore b/.gitignore index 415b853..c90e386 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,7 @@ common/ pkg/ settings/ src/ -*.tar.xz +cachyos-source +librewolf-settings +librewolf-source +*.tar.xz* diff --git a/PKGBUILD b/PKGBUILD index e12d456..e8e5960 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,8 +4,8 @@ pkgname=firedragon _pkgname=FireDragon -pkgver=100.0.2 -pkgrel=5 +pkgver=101.0 +pkgrel=1 pkgdesc="Librewolf fork build using custom branding, settings & KDE patches by OpenSUSE" arch=(x86_64 x86_64_v3 aarch64) backup=('usr/lib/firedragon/firedragon.cfg' @@ -36,14 +36,16 @@ source=(https://archive.mozilla.org/pub/firefox/releases/"$pkgver"/source/firefo "git+https://gitlab.com/dr460nf1r3/common.git" "git+https://gitlab.com/dr460nf1r3/settings.git" "librewolf-source::git+https://gitlab.com/librewolf-community/browser/source.git" - "librewolf-settings::git+https://gitlab.com/librewolf-community/settings.git") + "librewolf-settings::git+https://gitlab.com/librewolf-community/settings.git" + "cachyos-source::git+https://github.com/CachyOS/CachyOS-Browser-Common.git") # source_aarch64=() -sha256sums=('dc109861204f6938fd8f147af89a694eb516f3d4bb64ce3f0116452d654a8417' +sha256sums=('55ab5b517d58bbcbc837640263a8371cf1fba3d9f508e54537c4d2cbbfb86095' 'SKIP' '158152bdb9ef6a83bad62ae03a3d9bc8ae693b34926e53cc8c4de07df20ab22d' 'SKIP' 'SKIP' 'SKIP' + 'SKIP' 'SKIP') # sha256sums_aarch64=() validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases @@ -61,6 +63,9 @@ prepare() { local _librewolf_patches_dir _librewolf_patches_dir="${srcdir}/librewolf-source/patches" + local _cachyos_patches_dir + _cachyos_patches_dir="${srcdir}/cachyos-source/patches" + sed -i 's/lib\/librewolf/lib\/firedragon/g' "${_librewolf_patches_dir}/mozilla_dirs.patch" sed -i 's/lib64\/librewolf/lib64\/firedragon/g' "${_librewolf_patches_dir}/mozilla_dirs.patch" sed -i 's/librewolf/firedragon/g' "${_librewolf_patches_dir}/mozilla_dirs.patch" @@ -70,6 +75,9 @@ prepare() { popd pushd "${_librewolf_patches_dir}" && sh "${srcdir}/common/rebrand.sh" popd + pushd "${_cachyos_patches_dir}" && sh "${srcdir}/common/rebrand.sh" + popd + cat >../mozconfig <