--- a/MozillaFirefox/MozillaFirefox.changes Fri Jan 28 18:06:54 2011 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes Thu Feb 03 10:42:10 2011 +0100
@@ -1,5 +1,11 @@
-------------------------------------------------------------------
-Fri Jan 28 08:56 UTC 2011 - wr@rosenauer.org
+Wed Feb 2 19:16:15 UTC 2011 - wr@rosenauer.org
+
+- update to version 4.0b11
+- rebased some patches
+
+-------------------------------------------------------------------
+Fri Jan 28 08:56:12 UTC 2011 - wr@rosenauer.org
- set correct desktop file name within KDE for 11.4 and up
- add devel package with macros for extensions (from lnussel@suse.de)
--- a/MozillaFirefox/MozillaFirefox.spec Fri Jan 28 18:06:54 2011 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec Thu Feb 03 10:42:10 2011 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package MozillaFirefox (Version 4.0b10)
+# spec file for package MozillaFirefox (Version 4.0b11)
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# 2006-2011 Wolfgang Rosenauer
@@ -31,15 +31,15 @@
BuildRequires: wireless-tools
%endif
%if 0%{?use_xulrunner}
-BuildRequires: %{xulrunner}-devel = 2.0b10
+BuildRequires: %{xulrunner}-devel = 2.0b11
%endif
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version: %{mainver}b10
+Version: %{mainver}b11
Release: 1
Provides: web_browser
Provides: firefox = %{version}-%{release}
Provides: firefox = %{mainver}
-%define releasedate 2011012100
+%define releasedate 2011020200
Summary: Mozilla Firefox Web Browser
Url: http://www.mozilla.org/
Group: Productivity/Networking/Web/Browsers
--- a/firefox-browser-css.patch Fri Jan 28 18:06:54 2011 +0100
+++ b/firefox-browser-css.patch Thu Feb 03 10:42:10 2011 +0100
@@ -9,13 +9,13 @@
diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
-@@ -811,16 +811,30 @@ toolbar[iconsize="small"] #fullscreen-bu
- -moz-margin-end: 3px;
+@@ -990,16 +990,30 @@ toolbar[iconsize="small"] #feed-button {
}
- #PopupAutoComplete,
- #PopupAutoCompleteRichResult {
- direction: ltr !important;
+ .urlbar-over-link-host-label,
+ .urlbar-over-link-path-label {
+ padding: 0;
+ margin: 0;
}
+#PopupAutoCompleteRichResult .autocomplete-richlistitem {
@@ -32,11 +32,11 @@
+ color: -moz-Fieldtext !important;
+}
+
- #PopupAutoComplete:-moz-locale-dir(rtl) > tree > treerows {
- direction: rtl;
+ /* Favicon */
+ #page-proxy-favicon,
+ #urlbar-throbber {
+ width: 16px;
+ height: 16px;
}
- #PopupAutoComplete .autocomplete-treebody {
- direction: ltr;
- }
-
+ #page-proxy-stack {
--- a/firefox-kde.patch Fri Jan 28 18:06:54 2011 +0100
+++ b/firefox-kde.patch Thu Feb 03 10:42:10 2011 +0100
@@ -23,7 +23,7 @@
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1062 @@
+@@ -0,0 +1,1066 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -597,7 +597,9 @@
+ </hbox>
+ </hbox>
+ </box>
-+ <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
++ <box id="urlbar-display-box" align="center">
++ <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
++ </box>
+ <hbox id="urlbar-icons">
+ <image id="page-report-button"
+ class="urlbar-icon"
@@ -673,8 +675,8 @@
+ placespopup="true"
+ context="placesContext"
+ openInTabs="children"
-+ oncommand="BookmarksEventHandler.onCommand(event);"
-+ onclick="BookmarksEventHandler.onClick(event);"
++ oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
++ onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
+ onpopupshowing="BookmarksMenuButton.onPopupShowing(event);
+ if (!this.parentNode._placesView)
+ new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');"
@@ -773,8 +775,8 @@
+ <hbox flex="1"
+ id="PlacesToolbar"
+ context="placesContext"
-+ onclick="BookmarksEventHandler.onClick(event);"
-+ oncommand="BookmarksEventHandler.onCommand(event);"
++ onclick="BookmarksEventHandler.onClick(event, this._placesView);"
++ oncommand="BookmarksEventHandler.onCommand(event, this._placesView);"
+ tooltip="bhTooltip"
+ popupsinherittooltip="true">
+ <toolbarbutton class="bookmark-item bookmarks-toolbar-customize"
@@ -1005,6 +1007,7 @@
+ contentcontextmenu="contentAreaContextMenu"
+ autocompletepopup="PopupAutoComplete"
+ onclick="return contentAreaClick(event, false);"/>
++ <statuspanel id="statusbar-display" label=""/>
+ </vbox>
+ <vbox id="browser-border-end" hidden="true" layer="true"/>
+ </hbox>
@@ -1018,7 +1021,8 @@
+ mode="icons" iconsize="small" defaulticonsize="small"
+ lockiconsize="true"
+ defaultset="addonbar-closebutton,spring,status-bar"
-+ customizable="true">
++ customizable="true"
++ key="key_toggleAddonBar">
+ <toolbarbutton id="addonbar-closebutton"
+ tooltiptext="&addonBarCloseButton.tooltip;"
+ oncommand="setToolbarVisibility(this.parentNode, false);"/>
@@ -1089,10 +1093,10 @@
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
-@@ -20,16 +20,18 @@ browser.jar:
- * content/browser/aboutHome.xhtml (content/aboutHome.xhtml)
- * content/browser/aboutHome.js (content/aboutHome.js)
+@@ -22,16 +22,18 @@ browser.jar:
* content/browser/aboutHome.css (content/aboutHome.css)
+ content/browser/aboutHome-restore-icon.png (content/aboutHome-restore-icon.png)
+ content/browser/aboutHome-restore-icon-rtl.png (content/aboutHome-restore-icon-rtl.png)
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
* content/browser/browser.css (content/browser.css)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-cairo-return.patch Thu Feb 03 10:42:10 2011 +0100
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User Wolfgang Rosenauer <wr@rosenauer.org>
+# Parent e36e1a20cb5e1ba0e4bc3facac58029544d92e0a
+Bug 631155 - undefined return value in function '_cairo_surface_wrapper_flush'
+
+diff --git a/gfx/cairo/cairo/src/cairo-surface-wrapper.c b/gfx/cairo/cairo/src/cairo-surface-wrapper.c
+--- a/gfx/cairo/cairo/src/cairo-surface-wrapper.c
++++ b/gfx/cairo/cairo/src/cairo-surface-wrapper.c
+@@ -526,9 +526,12 @@ _cairo_surface_wrapper_fini (cairo_surfa
+ }
+
+ cairo_status_t
+ _cairo_surface_wrapper_flush (cairo_surface_wrapper_t *wrapper)
+ {
+ if (wrapper->target->backend->flush) {
+ return wrapper->target->backend->flush(wrapper->target);
+ }
++
++ // this is preliminary to cool down gcc and build checks
++ return CAIRO_STATUS_SUCCESS;
+ }
--- a/mozilla-xulrunner20/create-tar.sh Fri Jan 28 18:06:54 2011 +0100
+++ b/mozilla-xulrunner20/create-tar.sh Thu Feb 03 10:42:10 2011 +0100
@@ -1,8 +1,8 @@
#!/bin/bash
BRANCH="mozilla-central"
-RELEASE_TAG="FIREFOX_4_0b10_RELEASE"
-VERSION="2.0b10"
+RELEASE_TAG="FIREFOX_4_0b11_RELEASE"
+VERSION="2.0b11"
# mozilla
hg clone http://hg.mozilla.org/$BRANCH mozilla
@@ -14,7 +14,7 @@
# l10n
test ! -d l10n && mkdir l10n
for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do
- case $locale in
+ case $locale in
ja-JP-mac|en-US)
;;
*)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-xulrunner20/mozilla-cairo-return.patch Thu Feb 03 10:42:10 2011 +0100
@@ -0,0 +1,1 @@
+../mozilla-cairo-return.patch
\ No newline at end of file
--- a/mozilla-xulrunner20/mozilla-xulrunner20.changes Fri Jan 28 18:06:54 2011 +0100
+++ b/mozilla-xulrunner20/mozilla-xulrunner20.changes Thu Feb 03 10:42:10 2011 +0100
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Feb 2 19:15:14 UTC 2011 - wr@rosenauer.org
+
+- update to 2.0b11
+- fixed build check for missing return value (bmo#631155 )
+ (mozilla-cairo-return.patch)
+
-------------------------------------------------------------------
Sat Jan 22 21:56:16 UTC 2011 - wr@rosenauer.org
--- a/mozilla-xulrunner20/mozilla-xulrunner20.spec Fri Jan 28 18:06:54 2011 +0100
+++ b/mozilla-xulrunner20/mozilla-xulrunner20.spec Thu Feb 03 10:42:10 2011 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package mozilla-xulrunner20 (Version 2.0b10)
+# spec file for package mozilla-xulrunner20 (Version 2.0b11)
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# 2006-2011 Wolfgang Rosenauer
@@ -30,10 +30,10 @@
BuildRequires: wireless-tools
%endif
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version: 2.0b10
+Version: 2.0b11
Release: 1
-%define releasedate 2011012100
-%define version_internal 2.0b10
+%define releasedate 2011020200
+%define version_internal 2.0b11
%define apiversion 2.0
%define uaweight 199900
Summary: Mozilla Runtime Environment 2.0
@@ -72,6 +72,7 @@
Patch11: mozilla-cpuid.patch
Patch12: mozilla-language.patch
Patch13: mozilla-gio.patch
+Patch14: mozilla-cairo-return.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: mozilla-js20 = %{version}
Requires(post): update-alternatives coreutils
@@ -213,6 +214,7 @@
%endif
%patch12 -p1
%patch13 -p1
+%patch14 -p1
%build
kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3)
--- a/series Fri Jan 28 18:06:54 2011 +0100
+++ b/series Thu Feb 03 10:42:10 2011 +0100
@@ -13,6 +13,7 @@
#mozilla-cairo-lcd.patch
mozilla-language.patch
mozilla-gio.patch
+mozilla-cairo-return.patch
# Firefox patches
firefox-linkorder.patch