[PR PATCH] badwolf: use libwebkit2gtk41, adopt.

[PR PATCH] badwolf: use libwebkit2gtk41, adopt.

[yoshiyoshyosh]

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

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

https://github.com/yoshiyoshyosh/void-packages bad
https://github.com/void-linux/void-packages/pull/45558

badwolf: use libwebkit2gtk41, adopt.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (`x86_64`)
Crossbuilt for: `armv6l`

GNOME [recommends using libsoup3](https://discourse.gnome.org/t/please-build-against-libsoup-3-by-default/10190) instead of libsoup2. build worked fine with 41.

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

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

From eeed248d28e696ca25df94034b8320d90dd31ac2 Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Fri, 11 Aug 2023 22:45:31 -0500
Subject: [PATCH] badwolf: use libwebkit2gtk41, adopt.

---
 srcpkgs/badwolf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/badwolf/template b/srcpkgs/badwolf/template
index 87226ec7a0407..69adca664e012 100644
--- a/srcpkgs/badwolf/template
+++ b/srcpkgs/badwolf/template
@@ -1,14 +1,14 @@
 # Template file for 'badwolf'
 pkgname=badwolf
 version=1.2.2
-revision=1
+revision=2
 build_style=configure
 make_check_target=test
 hostmakedepends="pkg-config gettext"
-makedepends="webkit2gtk-devel libsoup-devel"
+makedepends="libwebkit2gtk41-devel"
 checkdepends="mdocml"
 short_desc="Minimalist and privacy-oriented WebKitGTK+ browser"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="yosh <yosh-git@riseup.net>"
 license="BSD-3-Clause"
 homepage="https://hacktivis.me/projects/badwolf"
 changelog="https://hacktivis.me/releases/badwolf-${version}.txt"

Re: [PR REVIEW] badwolf: use libwebkit2gtk41, adopt.

[mhmdanas]

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#discussion_r1292332745

Comment:
I think it's better to depend on `libsoup3-devel` explicitly here.

Re: [PR REVIEW] badwolf: use libwebkit2gtk41, adopt.

[yoshiyoshyosh]

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

New review comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#discussion_r1292336284

Comment:
hmm, there does indeed seem to be more packages that define both `webkit2gtk-devel` and `libsoup3-devel` explicitly than only the former (quick two-pass grep shows 9/16 not including badwolf). guess it wouldn't hurt

Re: [PR PATCH] [Updated] badwolf: use libwebkit2gtk41, adopt.

[yoshiyoshyosh]

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

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

https://github.com/yoshiyoshyosh/void-packages bad
https://github.com/void-linux/void-packages/pull/45558

badwolf: use libwebkit2gtk41, adopt.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (`x86_64`)
Crossbuilt for: `armv6l`

GNOME [recommends using libsoup3](https://discourse.gnome.org/t/please-build-against-libsoup-3-by-default/10190) instead of libsoup2. build worked fine with 41.

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

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

From 089532aaf800b984b5c96415109978038661866f Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Fri, 11 Aug 2023 22:45:31 -0500
Subject: [PATCH] badwolf: use libwebkit2gtk41, adopt.

---
 srcpkgs/badwolf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/badwolf/template b/srcpkgs/badwolf/template
index 87226ec7a0407..80b9f99cc7987 100644
--- a/srcpkgs/badwolf/template
+++ b/srcpkgs/badwolf/template
@@ -1,14 +1,14 @@
 # Template file for 'badwolf'
 pkgname=badwolf
 version=1.2.2
-revision=1
+revision=2
 build_style=configure
 make_check_target=test
 hostmakedepends="pkg-config gettext"
-makedepends="webkit2gtk-devel libsoup-devel"
+makedepends="libwebkit2gtk41-devel libsoup3-devel"
 checkdepends="mdocml"
 short_desc="Minimalist and privacy-oriented WebKitGTK+ browser"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="yosh <yosh-git@riseup.net>"
 license="BSD-3-Clause"
 homepage="https://hacktivis.me/projects/badwolf"
 changelog="https://hacktivis.me/releases/badwolf-${version}.txt"

Re: [PR REVIEW] badwolf: use libwebkit2gtk41, adopt.

[yoshiyoshyosh]

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

New review comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#discussion_r1292336284

Comment:
hmm, there does indeed seem to be more packages that define both `libwebkit2gtk41-devel` and `libsoup3-devel` explicitly than only the former (quick two-pass grep shows 9/16 not including badwolf). guess it wouldn't hurt

Re: [PR REVIEW] badwolf: use libwebkit2gtk41, adopt.

[mhmdanas]

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#discussion_r1292344660

Comment:
I just think it's better to have explicit, instead of implicit, dependencies. :)

Re: [PR REVIEW] badwolf: use libwebkit2gtk41, adopt.

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#discussion_r1294269847

Comment:
> notice: Packagers should consider setting the URI parsing library (guri or libsoup2) in WITH_URI_PARSER

?

Re: [PR REVIEW] badwolf: use libwebkit2gtk41, adopt.

[yoshiyoshyosh]

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

New review comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#discussion_r1294800701

Comment:
oh. good catch. I might be blind.
looking back at the logs and configure script, this means that the build with this PR was silently building with the `GUri` backend instead of `libsoup`. there's a few options to consider moving forward now:
1) use `libwebkit2gtk41` with `libsoup2`, something the configure script warns about
2) use `libwebkit2gtk41` with `guri` (the current pr, just would need some template cleaning), which goes against the favoring of the software
3) abandon both routes and keep `webkit2gtk` with `libsoup2`, which the GNOME team seems to be moving away from, though not really any time too soon

I guess it's a no-win situation, but (3) is probably the most preferable for stability right now until GNOME fully moves away from libsoup2.

Re: [PR REVIEW] badwolf: use libwebkit2gtk41, adopt.

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#discussion_r1295291972

Comment:
Why the 2nd option goes against the favoring of the software?

Re: [PR REVIEW] badwolf: use libwebkit2gtk41, adopt.

[yoshiyoshyosh]

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

New review comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#discussion_r1295301219

Comment:
I was led to believe that due to [this commit](https://hacktivis.me/git/badwolf/commit/0199df2a85269e4f7f759a75e7ad89fa7386a1a4.html), but perhaps that truly only applies to `webkit2gtk-4.0`? I guess if it doesn't memleak then it doesn't matter since the software does support both.
I'll try using `webkit2gtk-4.1` and explicitly using `GUri`. Seems to be the move.

Re: [PR PATCH] [Updated] badwolf: use libwebkit2gtk41, adopt.

[yoshiyoshyosh]

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

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

https://github.com/yoshiyoshyosh/void-packages bad
https://github.com/void-linux/void-packages/pull/45558

badwolf: use libwebkit2gtk41, adopt.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (`x86_64`)
Crossbuilt for: `armv6l`

GNOME [recommends using libsoup3](https://discourse.gnome.org/t/please-build-against-libsoup-3-by-default/10190) instead of libsoup2. build worked fine with 41.

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

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

From 733cd01661adc7a3e46a6cfa7f8beda0e7ae10ba Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Fri, 11 Aug 2023 22:45:31 -0500
Subject: [PATCH] badwolf: use libwebkit2gtk41, adopt.

---
 srcpkgs/badwolf/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/badwolf/template b/srcpkgs/badwolf/template
index 87226ec7a0407..1fa6f49ccc48d 100644
--- a/srcpkgs/badwolf/template
+++ b/srcpkgs/badwolf/template
@@ -1,22 +1,23 @@
 # Template file for 'badwolf'
 pkgname=badwolf
 version=1.2.2
-revision=1
+revision=2
 build_style=configure
 make_check_target=test
 hostmakedepends="pkg-config gettext"
-makedepends="webkit2gtk-devel libsoup-devel"
+makedepends="libwebkit2gtk41-devel"
 checkdepends="mdocml"
 short_desc="Minimalist and privacy-oriented WebKitGTK+ browser"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="yosh <yosh-git@riseup.net>"
 license="BSD-3-Clause"
 homepage="https://hacktivis.me/projects/badwolf"
 changelog="https://hacktivis.me/releases/badwolf-${version}.txt"
 distfiles="https://hacktivis.me/releases/badwolf-${version}.tar.gz"
 checksum=fcdf1b0d7111071db53f785cd3cecfb4c7ba852403a5697037b281e7fe262a4b
 
-pre_configure() {
-	export PREFIX=/usr
+do_configure() {
+	PREFIX=/usr WITH_WEBKITGTK=4.1 WITH_URI_PARSER=guri \
+		./configure ${configure_args}
 }
 
 post_install() {

Re: [PR PATCH] [Updated] badwolf: use libwebkit2gtk41, adopt.

[yoshiyoshyosh]

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

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

https://github.com/yoshiyoshyosh/void-packages bad
https://github.com/void-linux/void-packages/pull/45558

badwolf: use libwebkit2gtk41, adopt.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (`x86_64`)
Crossbuilt for: `armv6l`

GNOME [recommends using libsoup3](https://discourse.gnome.org/t/please-build-against-libsoup-3-by-default/10190) instead of libsoup2. build worked fine with 41.

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

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

From 7a42a782e382fd0ca325b1728723c91b556c3a09 Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Fri, 11 Aug 2023 22:45:31 -0500
Subject: [PATCH] badwolf: update to 1.3.0, adopt.

---
 srcpkgs/badwolf/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/badwolf/template b/srcpkgs/badwolf/template
index 87226ec7a0407..f0bf598c5d94d 100644
--- a/srcpkgs/badwolf/template
+++ b/srcpkgs/badwolf/template
@@ -1,22 +1,24 @@
 # Template file for 'badwolf'
 pkgname=badwolf
-version=1.2.2
+version=1.3.0
 revision=1
 build_style=configure
+configure_args="PREFIX=/usr WITH_WEBKITGTK=4.1 WITH_URI_PARSER=guri"
+make_cmd=ninja
 make_check_target=test
-hostmakedepends="pkg-config gettext"
-makedepends="webkit2gtk-devel libsoup-devel"
+hostmakedepends="pkg-config gettext ninja ed"
+makedepends="libwebkit2gtk41-devel"
 checkdepends="mdocml"
 short_desc="Minimalist and privacy-oriented WebKitGTK+ browser"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="yosh <yosh-git@riseup.net>"
 license="BSD-3-Clause"
 homepage="https://hacktivis.me/projects/badwolf"
 changelog="https://hacktivis.me/releases/badwolf-${version}.txt"
 distfiles="https://hacktivis.me/releases/badwolf-${version}.tar.gz"
-checksum=fcdf1b0d7111071db53f785cd3cecfb4c7ba852403a5697037b281e7fe262a4b
+checksum=276dfccba8addfc205ceb10477668e4b2b6a4853f344c86d5c1e35b1c703459f
 
-pre_configure() {
-	export PREFIX=/usr
+do_install() {
+	DESTDIR=${DESTDIR} ninja install
 }
 
 post_install() {

Re: badwolf: update to 1.3.0, adopt.

[0323pin]

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

New comment by 0323pin on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#issuecomment-1763479808

Comment:
Hi,

I've tried this on my Void-musl system. It builds fine but, it fails on launching with "failed to spawn child process `/usr/bin/bwrap`"

```
[Sun Oct 15 21:10] pin@muslbox ~$ badwolf
Running Badwolf version: 1.3.0
Buildtime WebKit version: 2.40.0
Runtime WebKit version: 2.40.0
webkit-web-extension directory set to: /home/pin/.local/share/badwolf/webkit-web-extension
Bookmarks: No loadable file found at /home/pin/.local/share/badwolf/bookmarks.xbel

(badwolf:6219): GLib-GObject-CRITICAL **: 21:10:55.494: g_object_ref: assertion 'G_IS_OBJECT (object)' failed
badwolf: Checking for userscripts matching /home/pin/.local/share/badwolf/scripts/*.js
badwolf: Notice: No userscripts found
content-filters file set to: /home/pin/.config/badwolf/content-filters.json

** (badwolf:6219): ERROR **: 21:10:55.686: Failed to start dbus proxy: Failed to spawn child process “/usr/bin/bwrap” (No such file or directory)
Trace/breakpoint trap
```

Re: badwolf: update to 1.3.0, adopt.

[0323pin]

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

New comment by 0323pin on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#issuecomment-1763479808

Comment:
Hi,

I've tried this on my Void-musl system. It builds fine but, it fails on launching with:

```
 $ badwolf
Running Badwolf version: 1.3.0
Buildtime WebKit version: 2.40.0
Runtime WebKit version: 2.40.0
webkit-web-extension directory set to: /home/pin/.local/share/badwolf/webkit-web-extension
Bookmarks: No loadable file found at /home/pin/.local/share/badwolf/bookmarks.xbel

(badwolf:6219): GLib-GObject-CRITICAL **: 21:10:55.494: g_object_ref: assertion 'G_IS_OBJECT (object)' failed
badwolf: Checking for userscripts matching /home/pin/.local/share/badwolf/scripts/*.js
badwolf: Notice: No userscripts found
content-filters file set to: /home/pin/.config/badwolf/content-filters.json

** (badwolf:6219): ERROR **: 21:10:55.686: Failed to start dbus proxy: Failed to spawn child process “/usr/bin/bwrap” (No such file or directory)
Trace/breakpoint trap
```

Re: badwolf: update to 1.3.0, adopt.

[yoshiyoshyosh]

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

New comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#issuecomment-1775987475

Comment:
@0323pin heya, sorry for late reply, was incredibly busy this past week.

it seems that `webkit2gtk` depends on `bwrap`, yet `libwebkit2gtk41` does not, meaning `bwrap` isn't provided. Apologies!

still a bit iffy about making this migration as a whole, but gnome's seemingly not maintaining `libsoup2` anymore, which probably won't be good some time in the future.

Re: [PR PATCH] [Updated] badwolf: update to 1.3.0, adopt.

[yoshiyoshyosh]

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

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

https://github.com/yoshiyoshyosh/void-packages bad
https://github.com/void-linux/void-packages/pull/45558

badwolf: update to 1.3.0, adopt.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (`x86_64`)
Crossbuilt for: `armv6l`

~~GNOME [recommends using libsoup3](https://discourse.gnome.org/t/please-build-against-libsoup-3-by-default/10190) instead of libsoup2. build worked fine with 41.~~

what really should have been said above ^ is that GNOME is moving away from libsoup2 for their software. badwolf doesn't explicitly support libsoup3, but it does support `GUri`. it's probably better in the long term to use the compatible libwebkitgtk41+GUri build

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

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

From 8d278c44ebb53cd5bca0f7d864b7acff65d897af Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Fri, 11 Aug 2023 22:45:31 -0500
Subject: [PATCH] badwolf: update to 1.3.0, adopt.

---
 srcpkgs/badwolf/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/badwolf/template b/srcpkgs/badwolf/template
index 87226ec7a0407..56d75eb97dfe2 100644
--- a/srcpkgs/badwolf/template
+++ b/srcpkgs/badwolf/template
@@ -1,22 +1,25 @@
 # Template file for 'badwolf'
 pkgname=badwolf
-version=1.2.2
+version=1.3.0
 revision=1
 build_style=configure
+configure_args="PREFIX=/usr WITH_WEBKITGTK=4.1 WITH_URI_PARSER=guri"
+make_cmd=ninja
 make_check_target=test
-hostmakedepends="pkg-config gettext"
-makedepends="webkit2gtk-devel libsoup-devel"
+hostmakedepends="pkg-config gettext ninja ed"
+makedepends="libwebkit2gtk41-devel"
 checkdepends="mdocml"
+depends="bubblewrap"
 short_desc="Minimalist and privacy-oriented WebKitGTK+ browser"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="yosh <yosh-git@riseup.net>"
 license="BSD-3-Clause"
 homepage="https://hacktivis.me/projects/badwolf"
 changelog="https://hacktivis.me/releases/badwolf-${version}.txt"
 distfiles="https://hacktivis.me/releases/badwolf-${version}.tar.gz"
-checksum=fcdf1b0d7111071db53f785cd3cecfb4c7ba852403a5697037b281e7fe262a4b
+checksum=276dfccba8addfc205ceb10477668e4b2b6a4853f344c86d5c1e35b1c703459f
 
-pre_configure() {
-	export PREFIX=/usr
+do_install() {
+	DESTDIR=${DESTDIR} ninja install
 }
 
 post_install() {

Re: [PR PATCH] [Updated] badwolf: update to 1.3.0, adopt.

[yoshiyoshyosh]

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

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

https://github.com/yoshiyoshyosh/void-packages bad
https://github.com/void-linux/void-packages/pull/45558

badwolf: update to 1.3.0, adopt.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (`x86_64`)
Crossbuilt for: `armv6l`

~~GNOME [recommends using libsoup3](https://discourse.gnome.org/t/please-build-against-libsoup-3-by-default/10190) instead of libsoup2. build worked fine with 41.~~

what really should have been said above ^ is that GNOME is moving away from libsoup2 for their software. badwolf doesn't explicitly support libsoup3, but it does support `GUri`. it's probably better in the long term to use the compatible libwebkitgtk41+GUri build

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

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

From 5962971a7ad4e058f7c472bf7f3c3df59780fe3c Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Fri, 11 Aug 2023 22:45:31 -0500
Subject: [PATCH] badwolf: update to 1.3.0, adopt.

---
 srcpkgs/badwolf/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/badwolf/template b/srcpkgs/badwolf/template
index 87226ec7a0407..ec6e4fb2e32e3 100644
--- a/srcpkgs/badwolf/template
+++ b/srcpkgs/badwolf/template
@@ -1,22 +1,25 @@
 # Template file for 'badwolf'
 pkgname=badwolf
-version=1.2.2
+version=1.3.0
 revision=1
 build_style=configure
+configure_args="PREFIX=/usr WITH_WEBKITGTK=4.1 WITH_URI_PARSER=guri"
+make_cmd=ninja
 make_check_target=test
-hostmakedepends="pkg-config gettext"
-makedepends="webkit2gtk-devel libsoup-devel"
+hostmakedepends="pkg-config gettext ninja ed"
+makedepends="libwebkit2gtk41-devel"
+depends="bubblewrap"
 checkdepends="mdocml"
 short_desc="Minimalist and privacy-oriented WebKitGTK+ browser"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="yosh <yosh-git@riseup.net>"
 license="BSD-3-Clause"
 homepage="https://hacktivis.me/projects/badwolf"
 changelog="https://hacktivis.me/releases/badwolf-${version}.txt"
 distfiles="https://hacktivis.me/releases/badwolf-${version}.tar.gz"
-checksum=fcdf1b0d7111071db53f785cd3cecfb4c7ba852403a5697037b281e7fe262a4b
+checksum=276dfccba8addfc205ceb10477668e4b2b6a4853f344c86d5c1e35b1c703459f
 
-pre_configure() {
-	export PREFIX=/usr
+do_install() {
+	DESTDIR=${DESTDIR} ninja install
 }
 
 post_install() {

Re: badwolf: update to 1.3.0, adopt.

[0323pin]

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

New comment by 0323pin on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#issuecomment-1776521834

Comment:
@yoshiyoshyosh No worries, thanks for the potential fix.

I don't have the time today but, should be able to test tomorrow and will report back here.

> still a bit iffy about making this migration as a whole, but gnome's seemingly not maintaining libsoup2 anymore

What else, Gnome 😞 

Re: badwolf: update to 1.3.0, adopt.

[0323pin]

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

New comment by 0323pin on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#issuecomment-1778705721

Comment:
@yoshiyoshyosh You need to add `xdg-dbus-proxy` to the cook. Else, I'm getting `bwrap: Can't find source path /usr/bin/xdg-dbus-proxy: No such file or directory`.

Installing it solves the issue and the browser runs fine on my machine.

![2023-10-25-094349_1920x1080_scrot](https://github.com/void-linux/void-packages/assets/90570748/02eb48f6-cd80-486b-ba95-bce6c0658e86)

Re: [PR PATCH] [Updated] badwolf: update to 1.3.0, adopt.

[yoshiyoshyosh]

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

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

https://github.com/yoshiyoshyosh/void-packages bad
https://github.com/void-linux/void-packages/pull/45558

badwolf: update to 1.3.0, adopt.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (`x86_64`)
Crossbuilt for: `armv6l`

~~GNOME [recommends using libsoup3](https://discourse.gnome.org/t/please-build-against-libsoup-3-by-default/10190) instead of libsoup2. build worked fine with 41.~~

what really should have been said above ^ is that GNOME is moving away from libsoup2 for their software. badwolf doesn't explicitly support libsoup3, but it does support `GUri`. it's probably better in the long term to use the compatible libwebkitgtk41+GUri build

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

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

From 5ed86e27249d4060487b47fcacef5c76737237ec Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Fri, 11 Aug 2023 22:45:31 -0500
Subject: [PATCH] badwolf: update to 1.3.0, adopt.

---
 srcpkgs/badwolf/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/badwolf/template b/srcpkgs/badwolf/template
index 87226ec7a0407..3ce926fb6c79b 100644
--- a/srcpkgs/badwolf/template
+++ b/srcpkgs/badwolf/template
@@ -1,22 +1,25 @@
 # Template file for 'badwolf'
 pkgname=badwolf
-version=1.2.2
+version=1.3.0
 revision=1
 build_style=configure
+configure_args="PREFIX=/usr WITH_WEBKITGTK=4.1 WITH_URI_PARSER=guri"
+make_cmd=ninja
 make_check_target=test
-hostmakedepends="pkg-config gettext"
-makedepends="webkit2gtk-devel libsoup-devel"
+hostmakedepends="pkg-config gettext ninja ed"
+makedepends="libwebkit2gtk41-devel"
+depends="bubblewrap xdg-dbus-proxy"
 checkdepends="mdocml"
 short_desc="Minimalist and privacy-oriented WebKitGTK+ browser"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="yosh <yosh-git@riseup.net>"
 license="BSD-3-Clause"
 homepage="https://hacktivis.me/projects/badwolf"
 changelog="https://hacktivis.me/releases/badwolf-${version}.txt"
 distfiles="https://hacktivis.me/releases/badwolf-${version}.tar.gz"
-checksum=fcdf1b0d7111071db53f785cd3cecfb4c7ba852403a5697037b281e7fe262a4b
+checksum=276dfccba8addfc205ceb10477668e4b2b6a4853f344c86d5c1e35b1c703459f
 
-pre_configure() {
-	export PREFIX=/usr
+do_install() {
+	DESTDIR=${DESTDIR} ninja install
 }
 
 post_install() {

Re: badwolf: update to 1.3.0, adopt.

[0323pin]

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

New comment by 0323pin on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#issuecomment-1781466618

Comment:
Anyone with commit access ... can this be merged now?
Thanks!

Re: badwolf: update to 1.3.0, adopt.

[0323pin]

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

New comment by 0323pin on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#issuecomment-1781466618

Comment:
@sgn, @mhmdanas or, anyone with commit access ... can this be merged now?
Thanks!

Re: badwolf: update to 1.3.0, adopt.

[mhmdanas]

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

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#issuecomment-1782641652

Comment:
@0323pin I don't know why you assume I have commit access, because I don't. :)

Re: badwolf: update to 1.3.0, adopt.

[0323pin]

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

New comment by 0323pin on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#issuecomment-1782792732

Comment:
> @0323pin I don't know why you assume I have commit access, because I don't. :)

You were assigned as reviewer, so I assumed you had commit access. My bad, sorry about that.

Re: badwolf: update to 1.3.0, adopt.

[0323pin]

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

New comment by 0323pin on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#issuecomment-1793488357

Comment:
**Bump.**

Can someone merge this?

Re: badwolf: update to 1.3.0, adopt.

[0323pin]

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

New comment by 0323pin on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#issuecomment-1817863303

Comment:
@classabbyamp please

Re: badwolf: update to 1.3.0, adopt.

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#issuecomment-1950746207

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: badwolf: update to 1.3.0, adopt.

[yoshiyoshyosh]

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

New comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#issuecomment-1951668330

Comment:
still relevant

Re: badwolf: update to 1.3.0, adopt.

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#issuecomment-1960587022

Comment:
> it seems that webkit2gtk depends on bwrap, yet libwebkit2gtk41 does not, meaning bwrap isn't provided. Apologies!

This should be fixed by https://github.com/void-linux/void-packages/commit/5534c3c4fbe335b7cddb107059e50912beab3ee2 (once it is done building)

Re: [PR REVIEW] badwolf: update to 1.3.0, adopt.

[oreo639]

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

New review comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#discussion_r1500266532

Comment:
These can be removed as they are dependencies of webkitgtk and not badwolf itself.

Re: [PR REVIEW] badwolf: update to 1.3.0, adopt.

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#discussion_r1500279414

Comment:
```suggestion
do_install() {
	DESTDIR=${DESTDIR} ninja install
```

Re: [PR REVIEW] badwolf: update to 1.3.0, adopt.

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#discussion_r1500279728

Comment:
I think we remove this too.

Re: [PR PATCH] [Updated] badwolf: update to 1.3.0, adopt.

[yoshiyoshyosh]

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

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

https://github.com/yoshiyoshyosh/void-packages bad
https://github.com/void-linux/void-packages/pull/45558

badwolf: update to 1.3.0, adopt.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (`x86_64`)
Crossbuilt for: `armv6l`

~~GNOME [recommends using libsoup3](https://discourse.gnome.org/t/please-build-against-libsoup-3-by-default/10190) instead of libsoup2. build worked fine with 41.~~

what really should have been said above ^ is that GNOME is moving away from libsoup2 for their software. badwolf doesn't explicitly support libsoup3, but it does support `GUri`. it's probably better in the long term to use the compatible libwebkitgtk41+GUri build

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

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

From 0cbd0bf4c24ac77e419cf900945e3d5343fc6997 Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Fri, 11 Aug 2023 22:45:31 -0500
Subject: [PATCH] badwolf: update to 1.3.0, adopt.

---
 srcpkgs/badwolf/template | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/badwolf/template b/srcpkgs/badwolf/template
index 87226ec7a04073..e34a186dd840e7 100644
--- a/srcpkgs/badwolf/template
+++ b/srcpkgs/badwolf/template
@@ -1,24 +1,23 @@
 # Template file for 'badwolf'
 pkgname=badwolf
-version=1.2.2
+version=1.3.0
 revision=1
 build_style=configure
+configure_args="PREFIX=/usr WITH_WEBKITGTK=4.1 WITH_URI_PARSER=guri"
+make_cmd=ninja
 make_check_target=test
-hostmakedepends="pkg-config gettext"
-makedepends="webkit2gtk-devel libsoup-devel"
+hostmakedepends="pkg-config gettext ninja ed"
+makedepends="libwebkit2gtk41-devel"
 checkdepends="mdocml"
 short_desc="Minimalist and privacy-oriented WebKitGTK+ browser"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="yosh <yosh-git@riseup.net>"
 license="BSD-3-Clause"
 homepage="https://hacktivis.me/projects/badwolf"
 changelog="https://hacktivis.me/releases/badwolf-${version}.txt"
 distfiles="https://hacktivis.me/releases/badwolf-${version}.tar.gz"
-checksum=fcdf1b0d7111071db53f785cd3cecfb4c7ba852403a5697037b281e7fe262a4b
+checksum=276dfccba8addfc205ceb10477668e4b2b6a4853f344c86d5c1e35b1c703459f
 
-pre_configure() {
-	export PREFIX=/usr
-}
-
-post_install() {
+do_install() {
+	DESTDIR=${DESTDIR} ninja install
 	vlicense COPYING
 }

Re: badwolf: update to 1.3.0, adopt.

[yoshiyoshyosh]

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

New comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#issuecomment-1962213985

Comment:
the template lint fail was due to the cloning failing fsr, `xlint` shows no issues so I'm sure it's fine

Re: badwolf: update to 1.3.0, adopt.

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#issuecomment-1962286240

Comment:
Re: https://github.com/void-linux/void-packages/pull/45558#discussion_r1500279728 Did you forget to remove mdocml from checkdepends or is it needed for the tests? The tests seem to run fine without it for me?

Re: badwolf: update to 1.3.0, adopt.

[yoshiyoshyosh]

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

New comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/45558#issuecomment-1962287478

Comment:
> Re: [#45558 (comment)](https://github.com/void-linux/void-packages/pull/45558#discussion_r1500279728) Did you forget to remove mdocml from checkdepends or is it needed for the tests? The tests seem to run fine without it for me?

whoops, didn't realize they were referring to the mdocml part--thought it was a reiteration of the `depends` part. apologies!

yeah, it doesn't look like mdocml is needed at all anymore. 

Re: [PR PATCH] [Updated] badwolf: update to 1.3.0, adopt.

[yoshiyoshyosh]

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

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

https://github.com/yoshiyoshyosh/void-packages bad
https://github.com/void-linux/void-packages/pull/45558

badwolf: update to 1.3.0, adopt.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (`x86_64`)
Crossbuilt for: `armv6l`

~~GNOME [recommends using libsoup3](https://discourse.gnome.org/t/please-build-against-libsoup-3-by-default/10190) instead of libsoup2. build worked fine with 41.~~

what really should have been said above ^ is that GNOME is moving away from libsoup2 for their software. badwolf doesn't explicitly support libsoup3, but it does support `GUri`. it's probably better in the long term to use the compatible libwebkitgtk41+GUri build

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

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

From 1c34f08f5d2fdd45238c80a6dd3f3634e1e22c60 Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Fri, 11 Aug 2023 22:45:31 -0500
Subject: [PATCH] badwolf: update to 1.3.0, adopt.

---
 srcpkgs/badwolf/template | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/badwolf/template b/srcpkgs/badwolf/template
index 87226ec7a04073..6cbc9b31248ab4 100644
--- a/srcpkgs/badwolf/template
+++ b/srcpkgs/badwolf/template
@@ -1,24 +1,22 @@
 # Template file for 'badwolf'
 pkgname=badwolf
-version=1.2.2
+version=1.3.0
 revision=1
 build_style=configure
+configure_args="PREFIX=/usr WITH_WEBKITGTK=4.1 WITH_URI_PARSER=guri"
+make_cmd=ninja
 make_check_target=test
-hostmakedepends="pkg-config gettext"
-makedepends="webkit2gtk-devel libsoup-devel"
-checkdepends="mdocml"
+hostmakedepends="pkg-config gettext ninja ed"
+makedepends="libwebkit2gtk41-devel"
 short_desc="Minimalist and privacy-oriented WebKitGTK+ browser"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="yosh <yosh-git@riseup.net>"
 license="BSD-3-Clause"
 homepage="https://hacktivis.me/projects/badwolf"
 changelog="https://hacktivis.me/releases/badwolf-${version}.txt"
 distfiles="https://hacktivis.me/releases/badwolf-${version}.tar.gz"
-checksum=fcdf1b0d7111071db53f785cd3cecfb4c7ba852403a5697037b281e7fe262a4b
+checksum=276dfccba8addfc205ceb10477668e4b2b6a4853f344c86d5c1e35b1c703459f
 
-pre_configure() {
-	export PREFIX=/usr
-}
-
-post_install() {
+do_install() {
+	DESTDIR=${DESTDIR} ninja install
 	vlicense COPYING
 }

Re: [PR PATCH] [Merged]: badwolf: update to 1.3.0, adopt.

[oreo639]

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

There's a merged pull request on the void-packages repository

badwolf: update to 1.3.0, adopt.
https://github.com/void-linux/void-packages/pull/45558

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

- I built this PR locally for my native architecture, (`x86_64`)
Crossbuilt for: `armv6l`

~~GNOME [recommends using libsoup3](https://discourse.gnome.org/t/please-build-against-libsoup-3-by-default/10190) instead of libsoup2. build worked fine with 41.~~

what really should have been said above ^ is that GNOME is moving away from libsoup2 for their software. badwolf doesn't explicitly support libsoup3, but it does support `GUri`. it's probably better in the long term to use the compatible libwebkitgtk41+GUri build