Hello community, here is the log from the commit of package libproxy for openSUSE:Factory checked in at Thu Jul 28 08:52:29 CEST 2011. -------- --- GNOME/libproxy/libproxy-plugins.changes 2011-06-20 20:28:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/libproxy/libproxy-plugins.changes 2011-07-27 14:58:09.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Jul 27 14:53:34 CEST 2011 - vuntz@opensuse.org + +- Build against js instead of xulrunner: + + Add libproxy-mozjs185.patch: taken from upstream, detect + mozjs185 instead of xulrunner in the build system. + + Add pkgconfig(mozjs185) BuildRequires and remove + mozilla-xulrunner-devel BuildRequires. + + Change Supplements of libproxy1-pacrunner-mozjs to use + libmozjs185-1_0 instead of mozilla-xulrunner. +- Change Supplements of libproxy1-pacrunner-webkit to appropriately + use libjavascriptcoregtk-1_0-0/libjavascriptcoregtk-3_0-0 + (depending on %favor_gtk2) instead of libwebkitgtk-0. + +------------------------------------------------------------------- libproxy.changes: same change calling whatdependson for head-i586 New: ---- libproxy-mozjs185.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libproxy-plugins.spec ++++++ --- /var/tmp/diff_new_pack.PqfFPC/_old 2011-07-28 08:46:24.000000000 +0200 +++ /var/tmp/diff_new_pack.PqfFPC/_new 2011-07-28 08:46:24.000000000 +0200 @@ -23,19 +23,6 @@ %define have_mono 0 %endif -%if 0%{?suse_version} > 1130 -%define xulrunner_ver 20 -%else -%if 0%{?suse_version} > 1120 -%define xulrunner_ver 192 -%else -%if 0%{?suse_version} > 1110 -%define xulrunner_ver 191 -%else -%define xulrunner_ver 190 -%endif -%endif -%endif Url: http://code.google.com/p/libproxy/ %define _name libproxy @@ -43,7 +30,7 @@ Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications Version: 0.4.7 -Release: 2 +Release: 3 %if 0%{?build_snapshot} %define _sourcename %{_name} %else @@ -55,6 +42,8 @@ Source99: baselibs.conf # PATCH-FIX-UPSTREAM libproxy-javascriptcoregtk.patch dimstar@opensuse.org -- Fix build with javascriptcoregtk3, which got split out of webkitgtk3. Patch from upstream svn. Patch0: libproxy-javascriptcoregtk.patch +# PATCH-FIX-UPSTREAM libproxy-mozjs185.patch vuntz@opensuse.org -- Build with libmozjs185 instead of xulrunner. Patch from upstream svn. +Patch1: libproxy-mozjs185.patch License: GPLv2+ ; LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake @@ -78,11 +67,7 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(webkitgtk-3.0) %endif -%if 0%{?suse_version} -BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel -%else -BuildRequires: xulrunner-devel -%endif +BuildRequires: pkgconfig(mozjs185) BuildRequires: NetworkManager-devel BuildRequires: libkde4-devel BuildRequires: libqt4-devel @@ -280,7 +265,7 @@ Group: System/Libraries Requires: libproxy1 = %{version} %if 0%{?suse_version} -Supplements: packageand(libproxy1:mozilla-xulrunner%{xulrunner_ver}) +Supplements: packageand(libproxy1:libmozjs185-1_0) %endif # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} @@ -296,7 +281,11 @@ Group: System/Libraries Requires: libproxy1 = %{version} %if 0%{?suse_version} -Supplements: packageand(libproxy1:libwebkitgtk-0) +%if 0%{?favor_gtk2} +Supplements: packageand(libproxy1:libjavascriptcoregtk-1_0-0) +%else +Supplements: packageand(libproxy1:libjavascriptcoregtk-3_0-0) +%endif %endif # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} @@ -323,6 +312,7 @@ %prep %setup -q -n %{_sourcename} %patch0 -p0 +%patch1 -p1 mkdir build %build ++++++ libproxy.spec ++++++ --- /var/tmp/diff_new_pack.PqfFPC/_old 2011-07-28 08:46:24.000000000 +0200 +++ /var/tmp/diff_new_pack.PqfFPC/_new 2011-07-28 08:46:24.000000000 +0200 @@ -23,19 +23,6 @@ %define have_mono 0 %endif -%if 0%{?suse_version} > 1130 -%define xulrunner_ver 20 -%else -%if 0%{?suse_version} > 1120 -%define xulrunner_ver 192 -%else -%if 0%{?suse_version} > 1110 -%define xulrunner_ver 191 -%else -%define xulrunner_ver 190 -%endif -%endif -%endif Url: http://code.google.com/p/libproxy/ %define _name libproxy @@ -43,7 +30,7 @@ Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications Version: 0.4.7 -Release: 3 +Release: 5 %if 0%{?build_snapshot} %define _sourcename %{_name} %else @@ -55,6 +42,8 @@ Source99: baselibs.conf # PATCH-FIX-UPSTREAM libproxy-javascriptcoregtk.patch dimstar@opensuse.org -- Fix build with javascriptcoregtk3, which got split out of webkitgtk3. Patch from upstream svn. Patch0: libproxy-javascriptcoregtk.patch +# PATCH-FIX-UPSTREAM libproxy-mozjs185.patch vuntz@opensuse.org -- Build with libmozjs185 instead of xulrunner. Patch from upstream svn. +Patch1: libproxy-mozjs185.patch License: GPLv2+ ; LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake @@ -78,11 +67,7 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(webkitgtk-3.0) %endif -%if 0%{?suse_version} -BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel -%else -BuildRequires: xulrunner-devel -%endif +BuildRequires: pkgconfig(mozjs185) BuildRequires: NetworkManager-devel BuildRequires: libkde4-devel BuildRequires: libqt4-devel @@ -280,7 +265,7 @@ Group: System/Libraries Requires: libproxy1 = %{version} %if 0%{?suse_version} -Supplements: packageand(libproxy1:mozilla-xulrunner%{xulrunner_ver}) +Supplements: packageand(libproxy1:libmozjs185-1_0) %endif # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} @@ -296,7 +281,11 @@ Group: System/Libraries Requires: libproxy1 = %{version} %if 0%{?suse_version} -Supplements: packageand(libproxy1:libwebkitgtk-0) +%if 0%{?favor_gtk2} +Supplements: packageand(libproxy1:libjavascriptcoregtk-1_0-0) +%else +Supplements: packageand(libproxy1:libjavascriptcoregtk-3_0-0) +%endif %endif # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} @@ -323,6 +312,7 @@ %prep %setup -q -n %{_sourcename} %patch0 -p0 +%patch1 -p1 mkdir build %build ++++++ libproxy-mozjs185.patch ++++++ Index: libproxy-0.4.7/libproxy/cmake/modules/pacrunner_mozjs.cmk =================================================================== --- libproxy-0.4.7.orig/libproxy/cmake/modules/pacrunner_mozjs.cmk +++ libproxy-0.4.7/libproxy/cmake/modules/pacrunner_mozjs.cmk @@ -7,19 +7,15 @@ if(WIN32) include_directories("${MOZJS_INCLUDE_DIR}") endif() elseif(NOT APPLE) - 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) - foreach(MOZJSLIB ${MOZJS_SEARCH_ORDER}) - pkg_search_module(MOZJS ${MOZJSLIB}>=2.0b12) - if(MOZJS_FOUND) - include_directories(${MOZJS_INCLUDE_DIRS}) - link_directories(${MOZJS_LIBRARY_DIRS}) - break() - else() - set(MOZJS_FOUND 0) - endif() - endforeach() + pkg_search_module(MOZJS mozjs185>=1.8.5) + if(MOZJS_FOUND) + include_directories(${MOZJS_INCLUDE_DIRS}) + link_directories(${MOZJS_LIBRARY_DIRS}) + else() + set(MOZJS_FOUND 0) + endif() else() set(MOZJS_FOUND 0) endif() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org