From 6af89f647ad9c386e3ddd1c3ac0318a3c3e4ccb9 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 29 Mar 2011 16:32:13 +0200 Subject: [PATCH] libproxy: Don't backport natus support --- libproxy-trunk.patch | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/libproxy-trunk.patch b/libproxy-trunk.patch index 02aa6fc..607d4e0 100644 --- a/libproxy-trunk.patch +++ b/libproxy-trunk.patch @@ -29,31 +29,6 @@ diff -ur libproxy-0.4.6/libproxy/cmake/modules/pacrunner_mozjs.cmk libproxy-trun else() set(MOZJS_FOUND 0) endif() -diff -ur libproxy-0.4.6/libproxy/cmake/modules.cmk libproxy-trunk/libproxy/cmake/modules.cmk ---- libproxy-0.4.6/libproxy/cmake/modules.cmk 2010-09-01 22:23:34.000000000 +0200 -+++ libproxy-trunk/libproxy/cmake/modules.cmk 2011-03-29 12:12:09.856395005 +0200 -@@ -14,11 +14,12 @@ - include(cmake/modules/config_macosx.cmk) - include(cmake/modules/network_networkmanager.cmk) - include(cmake/modules/pacrunner_mozjs.cmk) -+include(cmake/modules/pacrunner_natus.cmk) - include(cmake/modules/pacrunner_webkit.cmk) - - # Build the pacrunner into libproxy unless we are building for multiple engines - set(BIPR 1) --if(MOZJS_FOUND AND WEBKIT_FOUND) -+if((MOZJS_FOUND AND WEBKIT_FOUND) OR (MOZJS_FOUND AND NATUS_FOUND) OR (WEBKIT_FOUND AND NATUS_FOUND)) - set(BIPR 0) - endif() - -@@ -36,6 +37,7 @@ - px_module(ignore_ip 1 1) - px_module(network_networkmanager "${NM_FOUND}" 0 ${NM_LIBRARIES}) - px_module(pacrunner_mozjs "${MOZJS_FOUND}" ${BIPR} ${MOZJS_LIBRARIES}) -+px_module(pacrunner_natus "${NATUS_FOUND}" ${BIPR} ${NATUS_LIBRARIES}) - px_module(pacrunner_webkit "${WEBKIT_FOUND}" ${BIPR} ${WEBKIT_LIBRARIES}) - px_module(wpad_dns_alias 1 1) - message("") diff -ur libproxy-0.4.6/libproxy/modules/config_gnome.cpp libproxy-trunk/libproxy/modules/config_gnome.cpp --- libproxy-0.4.6/libproxy/modules/config_gnome.cpp 2010-09-01 22:23:34.000000000 +0200 +++ libproxy-trunk/libproxy/modules/config_gnome.cpp 2011-03-29 12:12:10.920395004 +0200