diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-03-27 18:07:43 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-04-05 15:56:47 -0700 |
commit | 3ccb099e214df3fb72b088ccb23f87b0436a2f0c (patch) | |
tree | e3af1056a1ed62c926f0fa145c69f7f065b063a4 | |
parent | 2ce3c15e1f43024d1e8aa742493642b010e0a089 (diff) | |
download | meta-openembedded-3ccb099e214df3fb72b088ccb23f87b0436a2f0c.tar.gz |
surf: Fix build with gtkwebkit 2.40
2.40 have two recipes one for gtk4 and another one for gtk3
use the gtk3 option.
Use PKG_CONFIG variable to provide a facility to override if needed
Update to latest on webkit2 branch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch | 32 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/surf/surf_2.1.bb | 2 |
2 files changed, 21 insertions, 13 deletions
diff --git a/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch b/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch index 2fb44eb0e7..f31018c3de 100644 --- a/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch +++ b/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch | |||
@@ -8,25 +8,33 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> | |||
8 | config.mk | 8 ++++---- | 8 | config.mk | 8 ++++---- |
9 | 1 file changed, 4 insertions(+), 4 deletions(-) | 9 | 1 file changed, 4 insertions(+), 4 deletions(-) |
10 | 10 | ||
11 | diff --git a/config.mk b/config.mk | ||
12 | index 032bf9f..850afbf 100644 | ||
13 | --- a/config.mk | 11 | --- a/config.mk |
14 | +++ b/config.mk | 12 | +++ b/config.mk |
15 | @@ -12,10 +12,10 @@ LIBDIR = $(LIBPREFIX)/surf | 13 | @@ -2,6 +2,7 @@ |
16 | X11INC = `pkg-config --cflags x11` | 14 | VERSION = 2.1 |
17 | X11LIB = `pkg-config --libs x11` | 15 | |
16 | # Customize below to fit your system | ||
17 | +PKG_CONFIG ?= pkg-config | ||
18 | |||
19 | # paths | ||
20 | PREFIX = /usr/local | ||
21 | @@ -9,13 +10,13 @@ MANPREFIX = $(PREFIX)/share/man | ||
22 | LIBPREFIX = $(PREFIX)/lib | ||
23 | LIBDIR = $(LIBPREFIX)/surf | ||
24 | |||
25 | -X11INC = `pkg-config --cflags x11` | ||
26 | -X11LIB = `pkg-config --libs x11` | ||
27 | +X11INC = $(shell $(PKG_CONFIG) --cflags x11) | ||
28 | +X11LIB = $(shell $(PKG_CONFIG) --libs x11) | ||
18 | 29 | ||
19 | -GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0` | 30 | -GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0` |
20 | -GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0` | 31 | -GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0` |
21 | -WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` | 32 | -WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` |
22 | -WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` | 33 | -WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` |
23 | +GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1` | 34 | +GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1) |
24 | +GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.1` | 35 | +GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.1) |
25 | +WEBEXTINC = `pkg-config --cflags webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0` | 36 | +WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0) |
26 | +WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0` | 37 | +WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0) |
27 | 38 | ||
28 | # includes and libs | 39 | # includes and libs |
29 | INCS = $(X11INC) $(GTKINC) | 40 | INCS = $(X11INC) $(GTKINC) |
30 | -- | ||
31 | 2.20.1 | ||
32 | |||
diff --git a/meta-oe/recipes-graphics/surf/surf_2.1.bb b/meta-oe/recipes-graphics/surf/surf_2.1.bb index 7523ed5877..7140a72845 100644 --- a/meta-oe/recipes-graphics/surf/surf_2.1.bb +++ b/meta-oe/recipes-graphics/surf/surf_2.1.bb | |||
@@ -9,7 +9,7 @@ DEPENDS = "webkitgtk gtk+3 glib-2.0 gcr3" | |||
9 | 9 | ||
10 | REQUIRED_DISTRO_FEATURES = "x11 opengl" | 10 | REQUIRED_DISTRO_FEATURES = "x11 opengl" |
11 | 11 | ||
12 | SRCREV = "bcd7d74e613fb8af11b40c351f0a6c1a771b2d2b" | 12 | SRCREV = "665a709b522a6fa18c671f1fc41297603292d0e8" |
13 | SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \ | 13 | SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \ |
14 | " | 14 | " |
15 | SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'soup3', 'file://0001-config.mk-Fix-compiler-and-linker.patch file://0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch', '', d)}" | 15 | SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'soup3', 'file://0001-config.mk-Fix-compiler-and-linker.patch file://0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch', '', d)}" |