[libproxy] Remove the mozilla-js detection script
Nicolas Chauvet
kwizart at fedoraproject.org
Tue Mar 29 14:52:52 UTC 2011
commit 88ff338480efde3a491a5bbfdf6c60034e979a33
Author: Nicolas Chauvet <kwizart at gmail.com>
Date: Tue Mar 29 16:52:37 2011 +0200
Remove the mozilla-js detection script
libproxy-trunk.patch | 31 -------------------------------
1 files changed, 0 insertions(+), 31 deletions(-)
---
diff --git a/libproxy-trunk.patch b/libproxy-trunk.patch
index 607d4e0..bc50959 100644
--- a/libproxy-trunk.patch
+++ b/libproxy-trunk.patch
@@ -1,34 +1,3 @@
-diff -ur libproxy-0.4.6/libproxy/cmake/modules/pacrunner_mozjs.cmk libproxy-trunk/libproxy/cmake/modules/pacrunner_mozjs.cmk
---- libproxy-0.4.6/libproxy/cmake/modules/pacrunner_mozjs.cmk 2010-09-01 22:23:34.000000000 +0200
-+++ libproxy-trunk/libproxy/cmake/modules/pacrunner_mozjs.cmk 2011-03-29 12:12:09.833395003 +0200
-@@ -7,16 +7,19 @@
- include_directories("${MOZJS_INCLUDE_DIR}")
- endif()
- elseif(NOT APPLE)
-- set(MOZJS_SEARCH_ORDER "xulrunner-js;firefox-js;mozilla-js;seamonkey-js" CACHE STRING "MozJS search order")
-+ set(MOZJS_SEARCH_ORDER "mozilla-js;xulrunner-js;firefox-js;seamonkey-js" CACHE STRING "MozJS search order")
- option(WITH_MOZJS "Search for MOZJS package" ON)
- if (WITH_MOZJS)
-- pkg_search_module(MOZJS ${MOZJS_SEARCH_ORDER})
-- if(MOZJS_FOUND)
-- include_directories(${MOZJS_INCLUDE_DIRS})
-- link_directories(${MOZJS_LIBRARY_DIRS})
-- else()
-- set(MOZJS_FOUND 0)
-- endif()
-+ foreach(MOZJSLIB ${MOZJS_SEARCH_ORDER})
-+ pkg_search_module(MOZJS ${MOZJSLIB}>=2.0)
-+ if(MOZJS_FOUND)
-+ include_directories(${MOZJS_INCLUDE_DIRS})
-+ link_directories(${MOZJS_LIBRARY_DIRS})
-+ break()
-+ else()
-+ set(MOZJS_FOUND 0)
-+ endif()
-+ endforeach()
- else()
- set(MOZJS_FOUND 0)
- endif()
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
More information about the scm-commits
mailing list