46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
|
From 00975fa11220af11398f9d89ee2ee0cf17c655d2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dominique Leuenberger <dimstar@opensuse.org>
|
||
|
|
Date: Mon, 18 Jan 2016 19:13:14 +0100
|
||
|
|
Subject: [PATCH] pacrunner_webkit: allow linking against javascriptcore-4.0
|
||
|
|
|
||
|
|
---
|
||
|
|
NEWS | 5 +++++
|
||
|
|
libproxy/cmake/modules/pacrunner_webkit.cmk | 9 ++++++---
|
||
|
|
2 files changed, 11 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/NEWS b/NEWS
|
||
|
|
index 89ec2c7..0676831 100644
|
||
|
|
--- a/NEWS
|
||
|
|
+++ b/NEWS
|
||
|
|
@@ -1,3 +1,8 @@
|
||
|
|
+New in Version 0.4.13
|
||
|
|
+==============================
|
||
|
|
+* Allow linking webkit pacrunner against javascriptcore-4.0
|
||
|
|
+ (webkit2)
|
||
|
|
+
|
||
|
|
New in version 0.4.12
|
||
|
|
==============================
|
||
|
|
* Move development to github.com/libproxy/libproxy
|
||
|
|
diff --git a/libproxy/cmake/modules/pacrunner_webkit.cmk b/libproxy/cmake/modules/pacrunner_webkit.cmk
|
||
|
|
index 0a99d18..c5afcc2 100644
|
||
|
|
--- a/libproxy/cmake/modules/pacrunner_webkit.cmk
|
||
|
|
+++ b/libproxy/cmake/modules/pacrunner_webkit.cmk
|
||
|
|
@@ -13,11 +13,14 @@ elseif(APPLE)
|
||
|
|
endif()
|
||
|
|
else()
|
||
|
|
if(WITH_WEBKIT3)
|
||
|
|
- px_check_modules(WEBKIT "javascriptcoregtk-3.0 >= 1.5.0")
|
||
|
|
+ px_check_modules(WEBKIT "javascriptcoregtk-4.0")
|
||
|
|
if(NOT WEBKIT_LIBRARIES)
|
||
|
|
- px_check_modules(WEBKIT "webkitgtk-3.0 < 1.5.0")
|
||
|
|
+ px_check_modules(WEBKIT "javascriptcoregtk-3.0 >= 1.5.0")
|
||
|
|
+ if(NOT WEBKIT_LIBRARIES)
|
||
|
|
+ px_check_modules(WEBKIT "webkitgtk-3.0 < 1.5.0")
|
||
|
|
+ endif(NOT WEBKIT_LIBRARIES)
|
||
|
|
endif(NOT WEBKIT_LIBRARIES)
|
||
|
|
- else()
|
||
|
|
+ else(WITH_WEBKIT3)
|
||
|
|
px_check_modules(WEBKIT webkit-1.0)
|
||
|
|
endif()
|
||
|
|
endif()
|