mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-10 16:40:03 +00:00
Code Issues Projects Releases Wiki Activity

surf: Fix build with gtkwebkit 2.40

Browse Source 
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>
This commit is contained in:
Khem Raj
2023-03-27 18:07:43 -07:00
parent 2ce3c15e1f
commit 3ccb099e21
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch
+20 -12
View File
@@ -8,25 +8,33 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
config.mk | 8 ++++---- config.mk | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/config.mk b/config.mk
index 032bf9f..850afbf 100644
--- a/config.mk --- a/config.mk
+++ b/config.mk +++ b/config.mk
@@ -12,10 +12,10 @@ LIBDIR = $(LIBPREFIX)/surf @@ -2,6 +2,7 @@
X11INC = `pkg-config --cflags x11` VERSION = 2.1
X11LIB = `pkg-config --libs x11`
# Customize below to fit your system
+PKG_CONFIG ?= pkg-config
# paths
PREFIX = /usr/local
@@ -9,13 +10,13 @@ MANPREFIX = $(PREFIX)/share/man
LIBPREFIX = $(PREFIX)/lib
LIBDIR = $(LIBPREFIX)/surf
-X11INC = `pkg-config --cflags x11`
-X11LIB = `pkg-config --libs x11`
+X11INC = $(shell $(PKG_CONFIG) --cflags x11)
+X11LIB = $(shell $(PKG_CONFIG) --libs x11)
-GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0` -GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0`
-GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0` -GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0`
-WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` -WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0`
-WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` -WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0`
+GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1` +GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1)
+GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.1` +GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.1)
+WEBEXTINC = `pkg-config --cflags webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0` +WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0)
+WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0` +WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0)
# includes and libs # includes and libs
INCS = $(X11INC) $(GTKINC) INCS = $(X11INC) $(GTKINC)
--
2.20.1
meta-oe/recipes-graphics/surf/surf_2.1.bb
+1 -1
View File
@@ -9,7 +9,7 @@ DEPENDS = "webkitgtk gtk+3 glib-2.0 gcr3"
REQUIRED_DISTRO_FEATURES = "x11 opengl" REQUIRED_DISTRO_FEATURES = "x11 opengl"
SRCREV = "bcd7d74e613fb8af11b40c351f0a6c1a771b2d2b" SRCREV = "665a709b522a6fa18c671f1fc41297603292d0e8"
SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \ SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \
" "
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)}" 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)}"