From febb0e80bffe78fc929d631ec496735bd7202640 Mon Sep 17 00:00:00 2001 From: xiota Date: Mon, 20 May 2024 01:42:09 +0000 Subject: [PATCH] 11.13.2 --- .SRCINFO | 20 +++++++++++--------- .nvchecker.toml | 5 +++++ PKGBUILD | 31 ++++++++++++++++++++----------- 3 files changed, 36 insertions(+), 20 deletions(-) create mode 100644 .nvchecker.toml diff --git a/.SRCINFO b/.SRCINFO index 0460c2dd34425..50246fad3b722 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = floorp pkgdesc = Firefox-based web browser focused on performance and customizability - pkgver = 11.13.0 + pkgver = 11.13.2 pkgrel = 1 url = https://github.com/Floorp-Projects/Floorp arch = x86_64 @@ -55,28 +55,30 @@ pkgbase = floorp optdepends = networkmanager: Location detection via available WiFi networks optdepends = speech-dispatcher: Text-to-Speech optdepends = xdg-desktop-portal: Screensharing with Wayland - provides = floorp=11.13.0 + provides = floorp=11.13.2 conflicts = floorp options = !debug options = !emptydirs options = !lto options = !makeflags options = !strip - source = Floorp::git+https://github.com/Floorp-Projects/Floorp.git#tag=v11.13.0 + source = Floorp::git+https://github.com/Floorp-Projects/Floorp.git#tag=v11.13.2 source = floorp-projects.floorp-core::git+https://github.com/Floorp-Projects/Floorp-core.git source = floorp-projects.unified-l10n-central::git+https://github.com/Floorp-Projects/Unified-l10n-central.git source = floorp.desktop - source = 18d19413472f-24a6ea8.patch::https://aur.archlinux.org/cgit/aur.git/plain/18d19413472f.patch?h=firefox-esr&id=24a6ea8 - source = 6af7194e2778-24a6ea8.patch::https://aur.archlinux.org/cgit/aur.git/plain/6af7194e2778.patch?h=firefox-esr&id=24a6ea8 - source = b1cc62489fae-24a6ea8.patch::https://aur.archlinux.org/cgit/aur.git/plain/b1cc62489fae.patch?h=firefox-esr&id=24a6ea8 + source = patch-python3.12-bug1831512-27ecdfd.patch::https://aur.archlinux.org/cgit/aur.git/plain/patch-python3.12-bug1831512.patch?h=firedragon&id=27ecdfd + source = patch-python3.12-bug1860051-27ecdfd.patch::https://aur.archlinux.org/cgit/aur.git/plain/patch-python3.12-bug1860051.patch?h=firedragon&id=27ecdfd + source = patch-python3.12-bug1866829-27ecdfd.patch::https://aur.archlinux.org/cgit/aur.git/plain/patch-python3.12-bug1866829.patch?h=firedragon&id=27ecdfd + source = patch-python3.12-bug1874280-27ecdfd.patch::https://aur.archlinux.org/cgit/aur.git/plain/patch-python3.12-bug1874280.patch?h=firedragon&id=27ecdfd source = floorp-projects.private-components::git+https://github.com/Floorp-Projects/Floorp-private-components.git sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = 07a63f189beaafe731237afed0aac3e1cfd489e432841bd2a61daa42977fb273 - sha256sums = 3cc55401ed5e027f1b9e667b0b52296af11f3c5c62b4a80b7e55cda0e117ed18 - sha256sums = 6952f93889acb514e3b06e251ea901df88c39b429da9677cd5547d90a8b6c73e - sha256sums = f66a944fa8804c16b1f7bd9b42b18bfc2552a891adc148085f4b91685e8db117 + sha256sums = 9516c36c145d365c3b65153d83a5b3b0dd8a319b5c30d47a390070892bd431b3 + sha256sums = 168d16a027a81c311c58f9302858244dfa5517f0a95a8d3df1abbf9b93b9d455 + sha256sums = df27ed1e0da5b192224978dc2a593a97e18e6e22062c611fc32b277500324e62 + sha256sums = cf1c69fd3338fd8f5e482f55b669160b08dfb021f2348b620f0a85dd9dee8150 sha256sums = SKIP pkgname = floorp diff --git a/.nvchecker.toml b/.nvchecker.toml new file mode 100644 index 0000000000000..9c3da3c98ed7e --- /dev/null +++ b/.nvchecker.toml @@ -0,0 +1,5 @@ +[floorp] +source = "github" +github = "Floorp-Projects/Floorp" +prefix = "v" +use_latest_release = true diff --git a/PKGBUILD b/PKGBUILD index 789d7c4e9d334..f9a001644d0ce 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -16,7 +16,7 @@ ## basic info _pkgname="floorp" pkgname="$_pkgname" -pkgver=11.13.0 +pkgver=11.13.2 pkgrel=1 pkgdesc="Firefox-based web browser focused on performance and customizability" url="https://github.com/Floorp-Projects/Floorp" @@ -103,7 +103,7 @@ _main_package() { !strip ) - _patch_commit="24a6ea8" + _patch_commit="27ecdfd" _pkgsrc="Floorp" source=( @@ -112,9 +112,10 @@ _main_package() { "floorp-projects.unified-l10n-central"::"git+https://github.com/Floorp-Projects/Unified-l10n-central.git" "$_pkgname.desktop" - "18d19413472f-$_patch_commit.patch"::"https://aur.archlinux.org/cgit/aur.git/plain/18d19413472f.patch?h=firefox-esr&id=$_patch_commit" - "6af7194e2778-$_patch_commit.patch"::"https://aur.archlinux.org/cgit/aur.git/plain/6af7194e2778.patch?h=firefox-esr&id=$_patch_commit" - "b1cc62489fae-$_patch_commit.patch"::"https://aur.archlinux.org/cgit/aur.git/plain/b1cc62489fae.patch?h=firefox-esr&id=$_patch_commit" + "patch-python3.12-bug1831512-$_patch_commit.patch"::"https://aur.archlinux.org/cgit/aur.git/plain/patch-python3.12-bug1831512.patch?h=firedragon&id=$_patch_commit" + "patch-python3.12-bug1860051-$_patch_commit.patch"::"https://aur.archlinux.org/cgit/aur.git/plain/patch-python3.12-bug1860051.patch?h=firedragon&id=$_patch_commit" + "patch-python3.12-bug1866829-$_patch_commit.patch"::"https://aur.archlinux.org/cgit/aur.git/plain/patch-python3.12-bug1866829.patch?h=firedragon&id=$_patch_commit" + "patch-python3.12-bug1874280-$_patch_commit.patch"::"https://aur.archlinux.org/cgit/aur.git/plain/patch-python3.12-bug1874280.patch?h=firedragon&id=$_patch_commit" ) sha256sums=( 'SKIP' @@ -122,9 +123,10 @@ _main_package() { 'SKIP' '07a63f189beaafe731237afed0aac3e1cfd489e432841bd2a61daa42977fb273' - '3cc55401ed5e027f1b9e667b0b52296af11f3c5c62b4a80b7e55cda0e117ed18' - '6952f93889acb514e3b06e251ea901df88c39b429da9677cd5547d90a8b6c73e' - 'f66a944fa8804c16b1f7bd9b42b18bfc2552a891adc148085f4b91685e8db117' + '9516c36c145d365c3b65153d83a5b3b0dd8a319b5c30d47a390070892bd431b3' + '168d16a027a81c311c58f9302858244dfa5517f0a95a8d3df1abbf9b93b9d455' + 'df27ed1e0da5b192224978dc2a593a97e18e6e22062c611fc32b277500324e62' + 'cf1c69fd3338fd8f5e482f55b669160b08dfb021f2348b620f0a85dd9dee8150' ) if [[ "${_build_private::1}" == "t" ]]; then @@ -269,9 +271,16 @@ ac_add_options --enable-private-components END fi - patch -Np1 -F100 -i "$srcdir/18d19413472f-$_patch_commit.patch" - patch -Np1 -F100 -i "$srcdir/6af7194e2778-$_patch_commit.patch" - patch -Np1 -F100 -i "$srcdir/b1cc62489fae-$_patch_commit.patch" + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + src="${src%.zst}" + if [[ $src == *.patch ]]; then + printf '\nApplying patch: %s\n' "$src" + patch -Np1 -F100 -i "${srcdir:?}/$src" + fi + done } build() {