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 /meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch | |
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>
Diffstat (limited to 'meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch')
-rw-r--r-- | meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch | 32 |
1 files changed, 20 insertions, 12 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> config.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/config.mk b/config.mk -index 032bf9f..850afbf 100644 --- a/config.mk +++ b/config.mk -@@ -12,10 +12,10 @@ LIBDIR = $(LIBPREFIX)/surf - X11INC = `pkg-config --cflags x11` - X11LIB = `pkg-config --libs x11` +@@ -2,6 +2,7 @@ + VERSION = 2.1 + + # 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` -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` -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` -+GTKLIB = `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` -+WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0` ++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1) ++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.1) ++WEBEXTINC = $(shell $(PKG_CONFIG) --cflags 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 INCS = $(X11INC) $(GTKINC) --- -2.20.1 - |