[PR PATCH] New package: firefox-ublock-origin-1.62.0

[PR PATCH] New package: firefox-ublock-origin-1.62.0

[Emru1]

[-- Attachment #1: Type: text/plain, Size: 1038 bytes --]

There is a new pull request by Emru1 against master on the void-packages repository

https://github.com/Emru1/void-packages ublock
https://github.com/void-linux/void-packages/pull/54135

New package: firefox-ublock-origin-1.62.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): Good question


#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

I've based this template on Alpine's one.
Installs uBlock Origin for Firefox systemwide.
I'm going to use it in some deployments.
Is this package any good? Or shouldn't it be in repo?
Extension is installed same way as in `firefox-i18n` and `firefox-esr-i18n` packages.

A patch file from https://github.com/void-linux/void-packages/pull/54135.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ublock-54135.patch --]
[-- Type: text/x-diff, Size: 2337 bytes --]

From a7e3b3409d76562723951f36cfaf6e5a39afb40d Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Tue, 28 Jan 2025 13:36:12 +0100
Subject: [PATCH] New package: firefox-ublock-origin-1.62.0

---
 srcpkgs/firefox-ublock-origin/INSTALL.msg |  2 ++
 srcpkgs/firefox-ublock-origin/template    | 34 +++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 srcpkgs/firefox-ublock-origin/INSTALL.msg
 create mode 100644 srcpkgs/firefox-ublock-origin/template

diff --git a/srcpkgs/firefox-ublock-origin/INSTALL.msg b/srcpkgs/firefox-ublock-origin/INSTALL.msg
new file mode 100644
index 00000000000000..b170dd10b30fde
--- /dev/null
+++ b/srcpkgs/firefox-ublock-origin/INSTALL.msg
@@ -0,0 +1,2 @@
+After installing this package restart Firefox twice to properly setup
+extension.
diff --git a/srcpkgs/firefox-ublock-origin/template b/srcpkgs/firefox-ublock-origin/template
new file mode 100644
index 00000000000000..14bbbbe5fed3db
--- /dev/null
+++ b/srcpkgs/firefox-ublock-origin/template
@@ -0,0 +1,34 @@
+# Template file for 'firefox-ublock-origin'
+pkgname=firefox-ublock-origin
+version=1.62.0
+revision=1
+hostmakedepends="python3 zip"
+depends="firefox"
+short_desc="Effecient blocker for Firefox"
+maintainer="Emil Tomczyk <emru@emru.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://ublockorigin.com/"
+_uassets_master="5722991a9ad362eaf4f2bb6ff64f08cccbafa2ef"
+_uassets_ghpages="2dde847869577e87fb9e0e095ac25323eba26560"
+distfiles="https://github.com/gorhill/uBlock/archive/refs/tags/${version}.tar.gz
+https://github.com/uBlockOrigin/uAssets/archive/${_uassets_master}.tar.gz
+https://github.com/uBlockOrigin/uAssets/archive/${_uassets_ghpages}.tar.gz"
+checksum="1f9d69f968ddec2ccfd3b104a3e0cda80403efd1a63356924406cf5296cde67b
+ a04e029394796104f60c346625707e1740069df8aea7e35af6d679b7b6febccb
+ afb5a554eefe4f4f8ecb8217d29518df71c76f1e85a10ffbd788c61e400c736d"
+
+post_extract() {
+	mkdir -p uBlock-${version}/dist/build/uAssets
+	mv uAssets-${_uassets_master} uBlock-${version}/dist/build/uAssets/main
+	mv uAssets-${_uassets_ghpages} uBlock-${version}/dist/build/uAssets/prod
+}
+
+do_build() {
+	cd uBlock-${version}
+	make firefox
+}
+
+do_install() {
+	vinstall uBlock-${version}/dist/build/uBlock0.firefox.xpi 0644 \
+		usr/lib/firefox/browser/extensions uBlock0@raymondhill.net.xpi
+}

Re: [PR REVIEW] New package: firefox-ublock-origin-1.62.0

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 328 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/54135#discussion_r1932180845

Comment:
This is unnecessary, wheter you adopt `vsrcextract` or not. Without `vsrcextract`, you probably need to set `build_wrksrc`. In either case, just set `make_build_target="firefox"`.

Re: [PR REVIEW] New package: firefox-ublock-origin-1.62.0

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 199 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/54135#discussion_r1932169699

Comment:
See `vsrcextract` for a better way to manage this.

Re: [PR REVIEW] New package: firefox-ublock-origin-1.62.0

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/54135#discussion_r1932180845

Comment:
This is unnecessary, whether you adopt `vsrcextract` or not. Without `vsrcextract`, you probably need to set `build_wrksrc`. In either case, just set `make_build_target="firefox"`.

Re: [PR PATCH] [Updated] New package: firefox-ublock-origin-1.62.0

[Emru1]

[-- Attachment #1: Type: text/plain, Size: 1043 bytes --]

There is an updated pull request by Emru1 against master on the void-packages repository

https://github.com/Emru1/void-packages ublock
https://github.com/void-linux/void-packages/pull/54135

New package: firefox-ublock-origin-1.62.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): Good question


#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

I've based this template on Alpine's one.
Installs uBlock Origin for Firefox systemwide.
I'm going to use it in some deployments.
Is this package any good? Or shouldn't it be in repo?
Extension is installed same way as in `firefox-i18n` and `firefox-esr-i18n` packages.

A patch file from https://github.com/void-linux/void-packages/pull/54135.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ublock-54135.patch --]
[-- Type: text/x-diff, Size: 1896 bytes --]

From b903f6ee12309d14fc8be7f5923c96b29e1a9702 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Tue, 28 Jan 2025 13:36:12 +0100
Subject: [PATCH] New package: firefox-ublock-origin-1.62.0

---
 srcpkgs/firefox-ublock-origin/template | 32 ++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/firefox-ublock-origin/template

diff --git a/srcpkgs/firefox-ublock-origin/template b/srcpkgs/firefox-ublock-origin/template
new file mode 100644
index 00000000000000..877bdcbff06c99
--- /dev/null
+++ b/srcpkgs/firefox-ublock-origin/template
@@ -0,0 +1,32 @@
+# Template file for 'firefox-ublock-origin'
+pkgname=firefox-ublock-origin
+version=1.62.0
+revision=1
+build_style=gnu-makefile
+make_build_target="firefox"
+hostmakedepends="python3 zip"
+depends="firefox"
+short_desc="Effecient blocker for Firefox"
+maintainer="Emil Tomczyk <emru@emru.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://ublockorigin.com/"
+_uassets_master="5722991a9ad362eaf4f2bb6ff64f08cccbafa2ef"
+_uassets_ghpages="2dde847869577e87fb9e0e095ac25323eba26560"
+distfiles="https://github.com/gorhill/uBlock/archive/refs/tags/${version}.tar.gz
+https://github.com/uBlockOrigin/uAssets/archive/${_uassets_master}.tar.gz
+https://github.com/uBlockOrigin/uAssets/archive/${_uassets_ghpages}.tar.gz"
+checksum="1f9d69f968ddec2ccfd3b104a3e0cda80403efd1a63356924406cf5296cde67b
+ a04e029394796104f60c346625707e1740069df8aea7e35af6d679b7b6febccb
+ afb5a554eefe4f4f8ecb8217d29518df71c76f1e85a10ffbd788c61e400c736d"
+skip_extraction="${_uassets_master}.tar.gz
+${_uassets_ghpages}.tar.gz"
+
+post_extract() {
+	vsrcextract -C dist/build/uAssets/main ${_uassets_master}.tar.gz
+	vsrcextract -C dist/build/uAssets/prod ${_uassets_ghpages}.tar.gz
+}
+
+do_install() {
+	vinstall dist/build/uBlock0.firefox.xpi 0644 \
+		usr/lib/firefox/browser/extensions uBlock0@raymondhill.net.xpi
+}