commit libproxy for openSUSE:Factory

Hello community, here is the log from the commit of package libproxy for openSUSE:Factory checked in at 2012-03-19 09:58:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libproxy (Old) and /work/SRC/openSUSE:Factory/.libproxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libproxy", Maintainer is "gnome-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libproxy/libproxy-plugins.changes 2012-02-03 10:23:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libproxy.new/libproxy-plugins.changes 2012-03-19 09:58:18.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 13 21:19:29 UTC 2012 - dimstar@opensuse.org + +- Add libproxy-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- libproxy.changes: same change New: ---- libproxy-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libproxy-plugins.spec ++++++ --- /var/tmp/diff_new_pack.6kqEVa/_old 2012-03-19 09:58:23.000000000 +0100 +++ /var/tmp/diff_new_pack.6kqEVa/_new 2012-03-19 09:58:23.000000000 +0100 @@ -51,6 +51,8 @@ Patch1: libproxy-mozjs185.patch # PATCH-FIX-UPSTREAM libproxy-trim-ignores.patch bnc#739069 dimstar@opensuse.org -- Trim strings in ignore list; taken from upstream svn, r821. Patch2: libproxy-trim-ignores.patch +# PATCH-FIX-UPSTREAM libproxy-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7. Taken from upstream svn, r833. +Patch3: libproxy-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ @@ -73,10 +75,10 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(webkitgtk-3.0) %endif -BuildRequires: pkgconfig(mozjs185) BuildRequires: NetworkManager-devel BuildRequires: libkde4-devel BuildRequires: libqt4-devel +BuildRequires: pkgconfig(mozjs185) %endif %else %if 0%{?have_mono} @@ -309,6 +311,7 @@ %patch0 -p0 %patch1 -p1 %patch2 -p0 +%patch3 -p1 mkdir build %build ++++++ libproxy.spec ++++++ --- /var/tmp/diff_new_pack.6kqEVa/_old 2012-03-19 09:58:23.000000000 +0100 +++ /var/tmp/diff_new_pack.6kqEVa/_new 2012-03-19 09:58:23.000000000 +0100 @@ -51,6 +51,8 @@ Patch1: libproxy-mozjs185.patch # PATCH-FIX-UPSTREAM libproxy-trim-ignores.patch bnc#739069 dimstar@opensuse.org -- Trim strings in ignore list; taken from upstream svn, r821. Patch2: libproxy-trim-ignores.patch +# PATCH-FIX-UPSTREAM libproxy-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7. Taken from upstream svn, r833. +Patch3: libproxy-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ @@ -73,10 +75,10 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(webkitgtk-3.0) %endif -BuildRequires: pkgconfig(mozjs185) BuildRequires: NetworkManager-devel BuildRequires: libkde4-devel BuildRequires: libqt4-devel +BuildRequires: pkgconfig(mozjs185) %endif %else %if 0%{?have_mono} @@ -309,6 +311,7 @@ %patch0 -p0 %patch1 -p1 %patch2 -p0 +%patch3 -p1 mkdir build %build ++++++ libproxy-gcc47.patch ++++++ Index: libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp =================================================================== --- libproxy-0.4.7.orig/libproxy/modules/config_sysconfig.cpp +++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp @@ -21,6 +21,9 @@ #include <cstdlib> #include <map> #include <fstream> +#include +#include + #include "../extension_config.hpp" using namespace libproxy; Index: libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp =================================================================== --- libproxy-0.4.7.orig/libproxy/modules/pacrunner_mozjs.cpp +++ libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp @@ -18,6 +18,7 @@ ******************************************************************************/ #include <cstring> // ? +#include // gethostname #include "../extension_pacrunner.hpp" using namespace libproxy; @@ -85,7 +86,7 @@ static JSBool myIpAddress(JSContext *cx, if (!gethostname(hostname, 1023)) { JSString *myhost = JS_NewStringCopyN(cx, hostname, strlen(hostname)); jsval arg = STRING_TO_JSVAL(myhost); - return dnsResolve_(cx, 1, &arg); + return dnsResolve_(cx, arg, vp); } JS_free(cx, hostname); JS_SET_RVAL(cx, vp, JSVAL_NULL); Index: libproxy-0.4.7/libproxy/modules/pacrunner_natus.cpp =================================================================== --- libproxy-0.4.7.orig/libproxy/modules/pacrunner_natus.cpp +++ libproxy-0.4.7/libproxy/modules/pacrunner_natus.cpp @@ -18,6 +18,7 @@ ******************************************************************************/ #include "../extension_pacrunner.hpp" +#include // gethostname using namespace libproxy; #define I_ACKNOWLEDGE_THAT_NATUS_IS_NOT_STABLE Index: libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp =================================================================== --- libproxy-0.4.7.orig/libproxy/modules/pacrunner_webkit.cpp +++ libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp @@ -18,6 +18,7 @@ ******************************************************************************/ #include "../extension_pacrunner.hpp" +#include // gethostname using namespace libproxy; #ifdef __APPLE__ Index: libproxy-0.4.7/libproxy/url.cpp =================================================================== --- libproxy-0.4.7.orig/libproxy/url.cpp +++ libproxy-0.4.7/libproxy/url.cpp @@ -33,6 +33,7 @@ #include <cstdlib> // For atoi() #include // For stat() #include <algorithm> // For transform() +#include // For read() close() #ifdef WIN32 #include -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org