blob: d273d1459f1fd7a31fc19ce0bd22c32b3fb4fc87 [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---
Patrick Williams520786c2023-06-25 16:20:36 -05008Upstream-Status: Pending
9
Andrew Geisslereff27472021-10-29 15:35:00 -050010 config.mk | 8 ++++----
11 1 file changed, 4 insertions(+), 4 deletions(-)
12
Andrew Geisslereff27472021-10-29 15:35:00 -050013--- a/config.mk
14+++ b/config.mk
Patrick Williams8e7b46e2023-05-01 14:19:06 -050015@@ -2,6 +2,7 @@
16 VERSION = 2.1
17
18 # Customize below to fit your system
19+PKG_CONFIG ?= pkg-config
20
21 # paths
22 PREFIX = /usr/local
23@@ -9,13 +10,13 @@ MANPREFIX = $(PREFIX)/share/man
24 LIBPREFIX = $(PREFIX)/lib
25 LIBDIR = $(LIBPREFIX)/surf
26
27-X11INC = `pkg-config --cflags x11`
28-X11LIB = `pkg-config --libs x11`
29+X11INC = $(shell $(PKG_CONFIG) --cflags x11)
30+X11LIB = $(shell $(PKG_CONFIG) --libs x11)
Andrew Geisslereff27472021-10-29 15:35:00 -050031
32-GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0`
33-GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0`
34-WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0`
35-WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0`
Patrick Williams8e7b46e2023-05-01 14:19:06 -050036+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1)
37+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.1)
38+WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0)
39+WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0)
Andrew Geisslereff27472021-10-29 15:35:00 -050040
41 # includes and libs
42 INCS = $(X11INC) $(GTKINC)