# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1357624469 -3600
# Node ID 5eb2128332e56def3f3017a6286ccec2f47300bb
# Parent  9124c1a643c5eb1b20c9a1617d8ee814b115eeaf
18.0 release

diff -r 9124c1a643c5 -r 5eb2128332e5 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Mon Dec 24 11:48:38 2012 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Tue Jan 08 06:54:29 2013 +0100
@@ -1,11 +1,13 @@
 -------------------------------------------------------------------
-Thu Nov 29 20:22:22 UTC 2012 - wr@rosenauer.org
-
-- update to Firefox 18.0b2
-  * requires NSS 3.14
+Sun Jan  6 21:54:18 UTC 2013 - wr@rosenauer.org
+
+- update to Firefox 18.0 (bnc#796895)
+  * requires NSS 3.14.1
   * removed obsolete SLE11 patches (mozilla-gcc43*)
 - ported patches
 - reenable WebRTC
+- added mozilla-libproxy-compat.patch for libproxy API compat
+  on openSUSE 11.2 and earlier
 
 -------------------------------------------------------------------
 Thu Nov 29 19:56:51 UTC 2012 - wr@rosenauer.org
diff -r 9124c1a643c5 -r 5eb2128332e5 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Mon Dec 24 11:48:38 2012 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Tue Jan 08 06:54:29 2013 +0100
@@ -17,9 +17,9 @@
 #
 
 
-%define major 17
-%define mainver %major.99
-%define update_channel beta
+%define major 18
+%define mainver %major.0
+%define update_channel release
 
 Name:           MozillaFirefox
 BuildRequires:  Mesa-devel
@@ -45,7 +45,7 @@
 BuildRequires:  wireless-tools
 %endif
 BuildRequires:  mozilla-nspr-devel >= 4.9.4
-BuildRequires:  mozilla-nss-devel >= 3.14
+BuildRequires:  mozilla-nss-devel >= 3.14.1
 BuildRequires:  nss-shared-helper-devel
 %if %suse_version > 1140
 BuildRequires:  pkgconfig(gstreamer-0.10)
@@ -54,7 +54,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012122200
+%define         releasedate 2013010500
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -99,6 +99,7 @@
 Patch14:        mozilla-ppc.patch
 Patch15:        mozilla-gstreamer-760140.patch
 Patch16:        mozilla-webrtc.patch
+Patch17:        mozilla-libproxy-compat.patch
 # Firefox/browser
 Patch30:        firefox-browser-css.patch
 Patch31:        firefox-kde.patch
@@ -233,6 +234,7 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 #
 %patch30 -p1
 %if %suse_version >= 1110
diff -r 9124c1a643c5 -r 5eb2128332e5 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Mon Dec 24 11:48:38 2012 +0100
+++ b/MozillaFirefox/create-tar.sh	Tue Jan 08 06:54:29 2013 +0100
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="beta"
+CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_18_0b5_RELEASE"
-VERSION="17.99"
+RELEASE_TAG="FIREFOX_18_0_RELEASE"
+VERSION="18.0"
 
 # mozilla
 echo "cloning $BRANCH..."
diff -r 9124c1a643c5 -r 5eb2128332e5 MozillaFirefox/mozilla-libproxy-compat.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-libproxy-compat.patch	Tue Jan 08 06:54:29 2013 +0100
@@ -0,0 +1,1 @@
+../mozilla-libproxy-compat.patch
\ No newline at end of file
diff -r 9124c1a643c5 -r 5eb2128332e5 mozilla-libproxy-compat.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-libproxy-compat.patch	Tue Jan 08 06:54:29 2013 +0100
@@ -0,0 +1,28 @@
+# HG changeset patch
+# Parent 99164862ccce7947259465dcf9edbf6375d56413
+# User Wolfgang Rosenauer <wr@rosenauer.org>
+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:
+   // <procotol>://[username:password@]proxy:port
+   // or
+   // direct://
+   //
diff -r 9124c1a643c5 -r 5eb2128332e5 series
--- a/series	Mon Dec 24 11:48:38 2012 +0100
+++ b/series	Tue Jan 08 06:54:29 2013 +0100
@@ -19,6 +19,7 @@
 mozilla-ppc.patch
 mozilla-idldir.patch
 mozilla-webrtc.patch
+mozilla-libproxy-compat.patch
 #mozilla-disable-neon-option.patch
 
 # Firefox patches