diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-10-11 20:41:36 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-10-16 09:50:38 -0700 |
commit | a93f9de2e76650b24391bcf13093b3131601e364 (patch) | |
tree | d695fc3e6768b4991cd48ef9554208df0490f8aa | |
parent | 66986b24687fff8cf7937bb1de8013378072c67d (diff) | |
download | meta-openembedded-a93f9de2e76650b24391bcf13093b3131601e364.tar.gz |
surf: add a webkit 2.34 compatibility patch
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
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 | 3 |
2 files changed, 34 insertions, 1 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 new file mode 100644 index 0000000000..2fb44eb0e7 --- /dev/null +++ b/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch @@ -0,0 +1,32 @@ +From 0cd38e6dbcaff7eef39fd46a60ff8a47e5f488c4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Sun, 3 Oct 2021 23:08:48 +0200 +Subject: [PATCH] config.ml: make compatible with webkitgtk 2.34.0 + +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` + +-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` + + # includes and libs + INCS = $(X11INC) $(GTKINC) +-- +2.20.1 + diff --git a/meta-oe/recipes-graphics/surf/surf_2.1.bb b/meta-oe/recipes-graphics/surf/surf_2.1.bb index 307ee9b981..710ed9bce9 100644 --- a/meta-oe/recipes-graphics/surf/surf_2.1.bb +++ b/meta-oe/recipes-graphics/surf/surf_2.1.bb @@ -11,7 +11,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \ file://0001-config.mk-Fix-compiler-and-linker.patch \ -" + file://0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch \ + " SRCREV = "bcd7d74e613fb8af11b40c351f0a6c1a771b2d2b" S = "${WORKDIR}/git" |