--- a/MozillaFirefox/MozillaFirefox.changes Thu Mar 08 18:07:20 2012 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes Tue Mar 13 08:06:57 2012 +0100
@@ -1,7 +1,7 @@
-------------------------------------------------------------------
-Thu Mar 8 17:03:11 UTC 2012 - wr@rosenauer.org
-
-- update to version 11.0b6
+Fri Mar 9 21:47:07 UTC 2012 - wr@rosenauer.org
+
+- update to Firefox 11.0 (bnc#750044)
- ported and reenabled KDE integration (bnc#746591)
- explicitely build-require X libs
--- a/MozillaFirefox/MozillaFirefox.spec Thu Mar 08 18:07:20 2012 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec Tue Mar 13 08:06:57 2012 +0100
@@ -17,8 +17,8 @@
#
-%define major 10
-%define mainver %major.99
+%define major 11
+%define mainver %major.0
Name: MozillaFirefox
BuildRequires: Mesa-devel
@@ -48,7 +48,7 @@
BuildRequires: nss-shared-helper-devel
Version: %{mainver}
Release: 0
-%define releasedate 2012030700
+%define releasedate 2012031200
Provides: firefox = %{mainver}
Provides: firefox = %{version}-%{release}
Provides: web_browser
@@ -90,6 +90,7 @@
Patch12: mozilla-linux3.patch
Patch14: mozilla-disable-neon-option.patch
Patch15: mozilla-yarr-pcre.patch
+Patch16: mozilla-sle11-gcc.patch
# Firefox/browser
Patch31: firefox-browser-css.patch
Patch32: firefox-cross-desktop.patch
@@ -218,6 +219,7 @@
%patch12 -p1
%patch14 -p1
#%patch15 -p1
+%patch16 -p1
#
%patch31 -p1
%patch32 -p1
@@ -280,7 +282,7 @@
ac_add_options --disable-debug
ac_add_options --enable-startup-notification
#ac_add_options --enable-chrome-format=jar
-ac_add_options --enable-update-channel=beta
+ac_add_options --enable-update-channel=release
EOF
%if %suse_version > 1130
cat << EOF >> $MOZCONFIG
--- a/MozillaFirefox/create-tar.sh Thu Mar 08 18:07:20 2012 +0100
+++ b/MozillaFirefox/create-tar.sh Tue Mar 13 08:06:57 2012 +0100
@@ -1,9 +1,9 @@
#!/bin/bash
-CHANNEL="beta"
+CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_11_0b6_RELEASE"
-VERSION="10.99"
+RELEASE_TAG="FIREFOX_11_0_RELEASE"
+VERSION="11.0"
# mozilla
hg clone http://hg.mozilla.org/$BRANCH mozilla
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-sle11-gcc.patch Tue Mar 13 08:06:57 2012 +0100
@@ -0,0 +1,1 @@
+../mozilla-sle11-gcc.patch
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-sle11-gcc.patch Tue Mar 13 08:06:57 2012 +0100
@@ -0,0 +1,24 @@
+# HG changeset patch
+# Parent 39e596b823926b5add22bb263734c6c872ee2aad
+diff --git a/layout/xul/base/src/nsXULTooltipListener.h b/layout/xul/base/src/nsXULTooltipListener.h
+--- a/layout/xul/base/src/nsXULTooltipListener.h
++++ b/layout/xul/base/src/nsXULTooltipListener.h
+@@ -107,17 +107,17 @@ protected:
+ static void sTooltipCallback (nsITimer* aTimer, void* aListener);
+
+ // screen coordinates of the last mousemove event, stored so that the
+ // tooltip can be opened at this location.
+ PRInt32 mMouseScreenX, mMouseScreenY;
+
+ // various constants for tooltips
+ enum {
+- kTooltipMouseMoveTolerance = 7, // 7 pixel tolerance for mousemove event
++ kTooltipMouseMoveTolerance = 7 // 7 pixel tolerance for mousemove event
+ };
+
+ // flag specifying if the tooltip has already been displayed by a MouseMove
+ // event. The flag is reset on MouseOut so that the tooltip will display
+ // the next time the mouse enters the node (bug #395668).
+ bool mTooltipShownOnce;
+
+ #ifdef MOZ_XUL
--- a/series Thu Mar 08 18:07:20 2012 +0100
+++ b/series Tue Mar 13 08:06:57 2012 +0100
@@ -18,6 +18,7 @@
mozilla-linux3.patch
mozilla-arm-cpu-detection.patch
mozilla-disable-neon-option.patch
+mozilla-sle11-gcc.patch
#mozilla-yarr-pcre.patch
# Firefox patches
--- a/xulrunner/create-tar.sh Thu Mar 08 18:07:20 2012 +0100
+++ b/xulrunner/create-tar.sh Tue Mar 13 08:06:57 2012 +0100
@@ -1,9 +1,9 @@
#!/bin/bash
-CHANNEL="beta"
+CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_11_0b6_RELEASE"
-VERSION="10.99"
+RELEASE_TAG="FIREFOX_11_0_RELEASE"
+VERSION="11.0"
# mozilla
hg clone http://hg.mozilla.org/$BRANCH mozilla
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/xulrunner/mozilla-sle11-gcc.patch Tue Mar 13 08:06:57 2012 +0100
@@ -0,0 +1,1 @@
+../mozilla-sle11-gcc.patch
\ No newline at end of file
--- a/xulrunner/xulrunner.changes Thu Mar 08 18:07:20 2012 +0100
+++ b/xulrunner/xulrunner.changes Tue Mar 13 08:06:57 2012 +0100
@@ -1,7 +1,7 @@
-------------------------------------------------------------------
-Thu Mar 8 17:05:47 UTC 2012 - wr@rosenauer.org
+Fri Mar 9 21:49:05 UTC 2012 - wr@rosenauer.org
-- update to version 11.0b6
+- update to version 11.0 (bnc#750044)
- fix build on ARM
- disable jemalloc on s390(x)
--- a/xulrunner/xulrunner.spec Thu Mar 08 18:07:20 2012 +0100
+++ b/xulrunner/xulrunner.spec Tue Mar 13 08:06:57 2012 +0100
@@ -44,9 +44,9 @@
%endif
BuildRequires: mozilla-nspr-devel >= 4.9.0
BuildRequires: mozilla-nss-devel >= 3.13.3
-Version: 10.99
+Version: 11.0
Release: 0
-%define releasedate 2012030700
+%define releasedate 2012031200
%define version_internal 11.0
%define apiversion 11
%define uaweight 1100000
@@ -80,6 +80,7 @@
Patch14: mozilla-linux3.patch
Patch15: mozilla-arm-cpu-detection.patch
Patch17: mozilla-yarr-pcre.patch
+Patch18: mozilla-sle11-gcc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: mozilla-js = %{version}
Requires(post): update-alternatives coreutils
@@ -199,6 +200,7 @@
%patch14 -p1
%patch15 -p1
#%patch17 -p1
+%patch18 -p1
%build
# no need to add build time to binaries