From e1c1203be0ab6b5de56325134118de45d3f50140 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Wed, 21 Sep 2022 12:40:17 +0200 Subject: [PATCH 1/5] Drop G_REGEX_JAVASCRIPT_COMPAT https://gitlab.gnome.org/GNOME/glib/-/blob/b38d5a991f1d86f5c7d6b00d6f8aecf888b1420b/NEWS#L186-190 --- ephy-uri-tester.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ephy-uri-tester.c b/ephy-uri-tester.c index a0214f8..bdfc1bc 100644 --- a/ephy-uri-tester.c +++ b/ephy-uri-tester.c @@ -304,7 +304,7 @@ ephy_uri_tester_compile_regexp (EphyUriTester *tester, len = gpatt->len; /* TODO: Play with optimization flags */ - regex = g_regex_new (patt, G_REGEX_OPTIMIZE | G_REGEX_JAVASCRIPT_COMPAT, + regex = g_regex_new (patt, G_REGEX_OPTIMIZE, G_REGEX_MATCH_NOTEMPTY, &error); if (error) { g_warning ("%s: %s", G_STRFUNC, error->message); From 65504a6356500af7dccdaf764e963280158009f3 Mon Sep 17 00:00:00 2001 From: jun7 Date: Sun, 12 Feb 2023 07:55:06 +0900 Subject: [PATCH 2/5] change vimb's pkg to 4.1 --- PKGBUILDs/vimb/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILDs/vimb/PKGBUILD b/PKGBUILDs/vimb/PKGBUILD index a512b73..953ecf0 100644 --- a/PKGBUILDs/vimb/PKGBUILD +++ b/PKGBUILDs/vimb/PKGBUILD @@ -4,7 +4,7 @@ pkgver=1 pkgrel=1 pkgdesc="adblock link to wyebadblock for vimb." arch=('x86_64') -url="https://github.com/jun7/wyebadblock" +url="https://github.com/jun7/wyebadblock#4.1" license=('GPL3') depends=('wyebadblock-git' 'vimb') makedepends=() @@ -13,5 +13,5 @@ source=() package() { mkdir -p "$pkgdir/usr/lib/vimb" - ln -s /usr/lib/wyebrowser/adblock.so "$pkgdir/usr/lib/vimb" + ln -s /usr/lib/wyebrowser/4.1/adblock.so "$pkgdir/usr/lib/vimb" } From 9f117999bc8eaaefbe0786d384cf2161c5b23056 Mon Sep 17 00:00:00 2001 From: jun7 Date: Sun, 12 Feb 2023 08:01:45 +0900 Subject: [PATCH 3/5] Revert "change vimb's pkg to 4.1" This reverts commit 65504a6356500af7dccdaf764e963280158009f3. --- PKGBUILDs/vimb/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILDs/vimb/PKGBUILD b/PKGBUILDs/vimb/PKGBUILD index 953ecf0..a512b73 100644 --- a/PKGBUILDs/vimb/PKGBUILD +++ b/PKGBUILDs/vimb/PKGBUILD @@ -4,7 +4,7 @@ pkgver=1 pkgrel=1 pkgdesc="adblock link to wyebadblock for vimb." arch=('x86_64') -url="https://github.com/jun7/wyebadblock#4.1" +url="https://github.com/jun7/wyebadblock" license=('GPL3') depends=('wyebadblock-git' 'vimb') makedepends=() @@ -13,5 +13,5 @@ source=() package() { mkdir -p "$pkgdir/usr/lib/vimb" - ln -s /usr/lib/wyebrowser/4.1/adblock.so "$pkgdir/usr/lib/vimb" + ln -s /usr/lib/wyebrowser/adblock.so "$pkgdir/usr/lib/vimb" } From 3d8bbc9095b2c9121ca11eeeae0b4988393b963d Mon Sep 17 00:00:00 2001 From: jun7 Date: Sun, 12 Feb 2023 11:02:20 +0900 Subject: [PATCH 4/5] for 4.1 --- PKGBUILDs/vimb/PKGBUILD | 17 ----------------- README.md | 9 ++++++--- makefile | 12 +++++++++--- 3 files changed, 15 insertions(+), 23 deletions(-) delete mode 100644 PKGBUILDs/vimb/PKGBUILD diff --git a/PKGBUILDs/vimb/PKGBUILD b/PKGBUILDs/vimb/PKGBUILD deleted file mode 100644 index a512b73..0000000 --- a/PKGBUILDs/vimb/PKGBUILD +++ /dev/null @@ -1,17 +0,0 @@ -# Maintainer: jun7 -pkgname=wyebadblock-vimb -pkgver=1 -pkgrel=1 -pkgdesc="adblock link to wyebadblock for vimb." -arch=('x86_64') -url="https://github.com/jun7/wyebadblock" -license=('GPL3') -depends=('wyebadblock-git' 'vimb') -makedepends=() -source=() - - -package() { - mkdir -p "$pkgdir/usr/lib/vimb" - ln -s /usr/lib/wyebrowser/adblock.so "$pkgdir/usr/lib/vimb" -} diff --git a/README.md b/README.md index 58d9567..4c36a83 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,11 @@ wyebadblock only checks 'easylist.txt' You can check whether wyebab has found easylist.txt by `wyebab --css` +## for webkit2gtk-4.1 + WEBKITVER=4.1 make + sudo WEBKITVER=4.1 make install +Make sure this adds a dir /4.1 before the adblock.so + ## Addition for other webkit2gtk browsers webkit2gtk loads extensions in a dir designated by each apps. So we have to make a link to wyebab in the dir. @@ -53,9 +58,7 @@ There is a PKGBUILD file. see the 'PKGBULDs' dir. ### vimb - sudo ln -s /usr/lib/wyebrowser/adblock.so /usr/lib/vimb - -There is a PKGBUILD file. see the 'PKGBULDs' dir. + sudo ln -s /usr/lib/wyebrowser/4.1/adblock.so /usr/lib/vimb If the path doesn't work, check https://fanglingsu.github.io/vimb/howto.html#block diff --git a/makefile b/makefile index fc51ff4..c6f9288 100644 --- a/makefile +++ b/makefile @@ -1,6 +1,11 @@ LISTNAME=easylist.txt PREFIX ?= /usr +WEBKITVER ?= 4.0 EXTENSION_DIR ?= $(PREFIX)/lib/wyebrowser + +ifneq ($(WEBKITVER), 4.0) + VERDIR=/$(WEBKITVER) +endif ifeq ($(DEBUG), 1) CFLAGS += -Wall else @@ -13,7 +18,7 @@ all: adblock.so wyebab librun.o testrun adblock.so: ab.c ephy-uri-tester.c ephy-uri-tester.h librun.o makefile $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< librun.o -shared -fPIC \ - `pkg-config --cflags --libs gtk+-3.0 glib-2.0 webkit2gtk-4.0` \ + `pkg-config --cflags --libs gtk+-3.0 glib-2.0 webkit2gtk-$(WEBKITVER)` \ $(DDEBUG) -DISEXT -DEXENAME=\"wyebab\" wyebab: ab.c ephy-uri-tester.c ephy-uri-tester.h librun.o makefile @@ -39,11 +44,12 @@ clean: install: install -Dm755 wyebab $(DESTDIR)$(PREFIX)/bin/wyebab - install -Dm755 adblock.so $(DESTDIR)$(EXTENSION_DIR)/adblock.so + install -Dm755 adblock.so $(DESTDIR)$(EXTENSION_DIR)$(VERDIR)/adblock.so uninstall: rm -f $(PREFIX)/bin/wyebab - rm -f $(EXTENSION_DIR)/adblock.so + rm -f $(EXTENSION_DIR)$(VERDIR)/adblock.so + -rmdir $(EXTENSION_DIR)$(VERDIR) -rmdir $(EXTENSION_DIR) From a37da6aef556cc296478fc9d3757e8455f15a79d Mon Sep 17 00:00:00 2001 From: jun7 Date: Sun, 12 Feb 2023 11:15:08 +0900 Subject: [PATCH 5/5] Fix readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4c36a83..6c2c230 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ You can check whether wyebab has found easylist.txt by `wyebab --css` ## for webkit2gtk-4.1 WEBKITVER=4.1 make sudo WEBKITVER=4.1 make install -Make sure this adds a dir /4.1 before the adblock.so +Make sure this adds a dir 4.1/ before the adblock.so ## Addition for other webkit2gtk browsers webkit2gtk loads extensions in a dir designated by each apps.