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