r47350 - in /packages/unstable/libproxy/debian: changelog control control.in patches/0001-pacrunner_webkit-allow-linking-against-javascriptcor.patch patches/series

[laney at users.alioth.debian.org]

Author: laney
Date: Tue Feb 16 13:02:58 2016
New Revision: 47350

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47350
Log:
debian/patches/0001-pacrunner_webkit-allow-linking-against-javascriptcor.patch:
Cherry-pick - allow building against webkit2gtk. Update BDs too.

Added:
    packages/unstable/libproxy/debian/patches/0001-pacrunner_webkit-allow-linking-against-javascriptcor.patch
Modified:
    packages/unstable/libproxy/debian/changelog
    packages/unstable/libproxy/debian/control
    packages/unstable/libproxy/debian/control.in
    packages/unstable/libproxy/debian/patches/series

Modified: packages/unstable/libproxy/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/changelog?rev=47350&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/changelog	[utf-8] (original)
+++ packages/unstable/libproxy/debian/changelog	[utf-8] Tue Feb 16 13:02:58 2016
@@ -13,6 +13,8 @@
   [ Iain Lane ]
   * Ack the NMUs, thanks!
   * Fix the build profiles syntax to the current version.
+  * debian/patches/0001-pacrunner_webkit-allow-linking-against-javascriptcor.patch:
+    Cherry-pick - allow building against webkit2gtk. Update BDs too.
 
  -- Andreas Henriksson <andreas at fatal.se>  Mon, 18 Aug 2014 21:07:56 +0200
 

Modified: packages/unstable/libproxy/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control?rev=47350&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control	[utf-8] (original)
+++ packages/unstable/libproxy/debian/control	[utf-8] Tue Feb 16 13:02:58 2016
@@ -20,8 +20,8 @@
                libmozjs185-dev (>= 1.8.5) <!stage1>,
                kdelibs5-dev <!stage1>,
                libqt4-dev <!stage1>,
-               libwebkitgtk-3.0-dev <!stage1>,
-               libjavascriptcoregtk-3.0-dev <!stage1>,
+               libwebkit2gtk-4.0-dev <!stage1>,
+               libjavascriptcoregtk-4.0-dev <!stage1>,
                libglib2.0-dev (>= 2.26) <!stage1>,
                libxmu-dev <!stage1>
 Standards-Version: 3.9.5

Modified: packages/unstable/libproxy/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control.in?rev=47350&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control.in	[utf-8] (original)
+++ packages/unstable/libproxy/debian/control.in	[utf-8] Tue Feb 16 13:02:58 2016
@@ -16,8 +16,8 @@
                libmozjs185-dev (>= 1.8.5) <!stage1>,
                kdelibs5-dev <!stage1>,
                libqt4-dev <!stage1>,
-               libwebkitgtk-3.0-dev <!stage1>,
-               libjavascriptcoregtk-3.0-dev <!stage1>,
+               libwebkit2gtk-4.0-dev <!stage1>,
+               libjavascriptcoregtk-4.0-dev <!stage1>,
                libglib2.0-dev (>= 2.26) <!stage1>,
                libxmu-dev <!stage1>
 Standards-Version: 3.9.5

Added: packages/unstable/libproxy/debian/patches/0001-pacrunner_webkit-allow-linking-against-javascriptcor.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/patches/0001-pacrunner_webkit-allow-linking-against-javascriptcor.patch?rev=47350&op=file
==============================================================================
--- packages/unstable/libproxy/debian/patches/0001-pacrunner_webkit-allow-linking-against-javascriptcor.patch	(added)
+++ packages/unstable/libproxy/debian/patches/0001-pacrunner_webkit-allow-linking-against-javascriptcor.patch	[utf-8] Tue Feb 16 13:02:58 2016
@@ -0,0 +1,35 @@
+From 00975fa11220af11398f9d89ee2ee0cf17c655d2 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar at 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/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()
+-- 
+2.7.0
+

Modified: packages/unstable/libproxy/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/patches/series?rev=47350&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/patches/series	[utf-8] (original)
+++ packages/unstable/libproxy/debian/patches/series	[utf-8] Tue Feb 16 13:02:58 2016
@@ -1,3 +1,4 @@
 disable-pac-test.patch
 dont_segfault_on_exit.patch
 fix-mozjs-detection.patch
+0001-pacrunner_webkit-allow-linking-against-javascriptcor.patch