diff options
Diffstat (limited to 'meta-oe/recipes-graphics/surf/surf')
| -rw-r--r-- | meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch | 30 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch | 42 |
2 files changed, 72 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch b/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch new file mode 100644 index 0000000000..6011f4e3ac --- /dev/null +++ b/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch @@ -0,0 +1,30 @@ +From 9de4f5fa81891e14e205fe61e1408f1218369e55 Mon Sep 17 00:00:00 2001 +From: Leon Anavi <leon.anavi@konsulko.com> +Date: Tue, 18 May 2021 15:03:22 +0000 +Subject: [PATCH] config.mk: Fix compiler and linker + +Fix LIBS + +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> +--- +Upstream-Status: Pending + + config.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config.mk b/config.mk +index 2eb9fb0..032bf9f 100644 +--- a/config.mk ++++ b/config.mk +@@ -19,7 +19,7 @@ WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio- + + # includes and libs + INCS = $(X11INC) $(GTKINC) +-LIBS = $(X11LIB) $(GTKLIB) -lgthread-2.0 ++LIBS = -lc -lX11 ${GTKLIB} -lgthread-2.0 + + # flags + CPPFLAGS = -DVERSION=\"$(VERSION)\" -DGCR_API_SUBJECT_TO_CHANGE \ +-- +2.17.1 + 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..d273d1459f --- /dev/null +++ b/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch @@ -0,0 +1,42 @@ +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> +--- +Upstream-Status: Pending + + config.mk | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/config.mk ++++ b/config.mk +@@ -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 = $(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) |