Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/surf/files/
Date: Sun, 22 Nov 2020 13:19:55
Message-Id: 1606051183.69d796c341cf1ae78d883b64e742c72b0cf97f82.juippis@gentoo
1 commit: 69d796c341cf1ae78d883b64e742c72b0cf97f82
2 Author: parazyd <parazyd <AT> dyne <DOT> org>
3 AuthorDate: Sun Nov 22 13:18:15 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 22 13:19:43 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69d796c3
7
8 www-client/surf: Rebase 9999 patch.
9
10 Signed-off-by: Ivan Jelincic <parazyd <AT> dyne.org>
11 Closes: https://github.com/gentoo/gentoo/pull/18267
12 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
13
14 www-client/surf/files/surf-9999-gentoo.patch | 11 +++++------
15 1 file changed, 5 insertions(+), 6 deletions(-)
16
17 diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-9999-gentoo.patch
18 index 7b783e8feb8..30111395f00 100644
19 --- a/www-client/surf/files/surf-9999-gentoo.patch
20 +++ b/www-client/surf/files/surf-9999-gentoo.patch
21 @@ -1,5 +1,5 @@
22 diff --git a/config.mk b/config.mk
23 -index 5e68e38..fa45b55 100644
24 +index f1910bf..55d7066 100644
25 --- a/config.mk
26 +++ b/config.mk
27 @@ -4,18 +4,18 @@ VERSION = 2.0
28 @@ -19,13 +19,12 @@ index 5e68e38..fa45b55 100644
29
30 -GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0`
31 -GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0`
32 --WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0`
33 --WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0`
34 +-WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0`
35 +-WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0`
36 +GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0)
37 +GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.0)
38 -+WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
39 -+WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
40 ++WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0)
41 ++WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0)
42
43 # includes and libs
44 INCS = $(X11INC) $(GTKINC)
45 -