blob: f31018c3decf33b4f5ae9cd620ab1b3fceb5177c [file] [log] [blame]
Andrew Geisslereff27472021-10-29 15:35:00 -05001From 0cd38e6dbcaff7eef39fd46a60ff8a47e5f488c4 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Sun, 3 Oct 2021 23:08:48 +0200
4Subject: [PATCH] config.ml: make compatible with webkitgtk 2.34.0
5
6Signed-off-by: Alexander Kanavin <alex@linutronix.de>
7---
8 config.mk | 8 ++++----
9 1 file changed, 4 insertions(+), 4 deletions(-)
10
Andrew Geisslereff27472021-10-29 15:35:00 -050011--- a/config.mk
12+++ b/config.mk
Patrick Williams8e7b46e2023-05-01 14:19:06 -050013@@ -2,6 +2,7 @@
14 VERSION = 2.1
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)
Andrew Geisslereff27472021-10-29 15:35:00 -050029
30-GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0`
31-GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0`
32-WEBEXTINC = `pkg-config --cflags 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`
Patrick Williams8e7b46e2023-05-01 14:19:06 -050034+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1)
35+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.1)
36+WEBEXTINC = $(shell $(PKG_CONFIG) --cflags 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)
Andrew Geisslereff27472021-10-29 15:35:00 -050038
39 # includes and libs
40 INCS = $(X11INC) $(GTKINC)