# HG changeset patch # User Wolfgang Rosenauer # Date 1413025411 -7200 # Node ID 3ab2530d5879b7b4dc230190c9f3b80a175ab916 # Parent f61bd1cd52c22742c6090def5219d8287f7c22c0 remove obsolete patch which was required only with 11.2 and older diff -r f61bd1cd52c2 -r 3ab2530d5879 MozillaFirefox/mozilla-libproxy-compat.patch --- a/MozillaFirefox/mozilla-libproxy-compat.patch Sat Oct 11 10:33:51 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-libproxy-compat.patch \ No newline at end of file diff -r f61bd1cd52c2 -r 3ab2530d5879 mozilla-libproxy-compat.patch --- a/mozilla-libproxy-compat.patch Sat Oct 11 10:33:51 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -# HG changeset patch -# Parent 99164862ccce7947259465dcf9edbf6375d56413 -# User Wolfgang Rosenauer -No bug - libproxy API change picked up in bmo#769764 but fails in openSUSE 11.2 and earlier. Still cast to char* to make "all" happy -Note: Remove that patch when openSUSE 11.2 runs out of any support! - -diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp ---- a/toolkit/system/unixproxy/nsLibProxySettings.cpp -+++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp -@@ -67,17 +67,17 @@ nsUnixSystemProxySettings::GetProxyForUR - - if (!mProxyFactory) { - mProxyFactory = px_proxy_factory_new(); - } - NS_ENSURE_TRUE(mProxyFactory, NS_ERROR_NOT_AVAILABLE); - - char **proxyArray = nullptr; - proxyArray = px_proxy_factory_get_proxies(mProxyFactory, -- PromiseFlatCString(aSpec).get()); -+ (char *) (PromiseFlatCString(aSpec).get())); - NS_ENSURE_TRUE(proxyArray, NS_ERROR_NOT_AVAILABLE); - - // Translate libproxy's output to PAC string as expected - // libproxy returns an array of proxies in the format: - // ://[username:password@]proxy:port - // or - // direct:// - // diff -r f61bd1cd52c2 -r 3ab2530d5879 series --- a/series Sat Oct 11 10:33:51 2014 +0200 +++ b/series Sat Oct 11 13:03:31 2014 +0200 @@ -13,7 +13,6 @@ mozilla-icu-strncat.patch mozilla-arm-disable-edsp.patch mozilla-idldir.patch -mozilla-libproxy-compat.patch # Firefox patches firefox-kde.patch