commit MozillaFirefox for openSUSE:11.4

28 Sep 2011

Hello community,

here is the log from the commit of package MozillaFirefox for openSUSE:11.4
checked in at Wed Sep 28 17:28:16 CEST 2011.



--------

--- old-versions/11.4/UPDATES/all/MozillaFirefox/MozillaFirefox.changes	2011-09-07 18:08:33.000000000 +0200
+++ 11.4/MozillaFirefox/MozillaFirefox.changes	2011-09-26 08:37:05.000000000 +0200
@@ -1,0 +2,30 @@
+Fri Sep 23 11:22:22 UTC 2011 - wr@rosenauer.org
+
+- update to Firefox 7 (bnc#720264)
+  including
+  * Improve Responsiveness with Memory Reductions
+  * Instant Sync
+  * WebSocket protocol 8
+- removed obsolete mozilla-cairo-lcd.patch
+- rebased patches
+- removed XLIB_SKIP_ARGB_VISUALS=1 from environment in
+  mozilla.sh.in (bnc#680758)
+
+-------------------------------------------------------------------
+Fri Sep 16 06:57:38 UTC 2011 - wr@rosenauer.org
+
+- fixed loading of kde.js under KDE (bnc#718311)
+
+-------------------------------------------------------------------
+Wed Sep 14 07:02:04 UTC 2011 - wr@rosenauer.org
+
+- add dbus-1-glib-devel to BuildRequires (not pulled in
+  automatically anymore on 12.1)
+- increase minversions for NSPR and NSS
+
+-------------------------------------------------------------------
+Fri Sep  9 20:44:15 UTC 2011 - wr@rosenauer.org
+
+- recreated source archive to get correct source-stamp.txt
+
+-------------------------------------------------------------------

calling whatdependson for 11.4-i586


Old:
----
  firefox-6.0.2-source.tar.bz2
  l10n-6.0.2.tar.bz2
  mozilla-cairo-lcd.patch

New:
----
  firefox-7.0-source.tar.bz2
  l10n-7.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ MozillaFirefox.spec ++++++
--- /var/tmp/diff_new_pack.XS6q5d/_old	2011-09-28 17:26:51.000000000 +0200
+++ /var/tmp/diff_new_pack.XS6q5d/_new	2011-09-28 17:26:51.000000000 +0200
@@ -18,24 +18,24 @@
 
 # norootforbuild
 
-%define major 6
-%define mainver %major.0.2
+%define major 7
+%define mainver %major.0
 
 Name:           MozillaFirefox
-BuildRequires:  Mesa-devel autoconf213 fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files yasm zip
+BuildRequires:  Mesa-devel autoconf213 dbus-1-glib-devel fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files yasm zip
 %if %suse_version > 1110
 BuildRequires:  libiw-devel
 BuildRequires:  libproxy-devel
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.8.6
-BuildRequires:  mozilla-nss-devel >= 3.12.8
+BuildRequires:  mozilla-nspr-devel >= 4.8.8
+BuildRequires:  mozilla-nss-devel >= 3.12.10
 BuildRequires:  nss-shared-helper-devel
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Version:        %{mainver}
-Release:        0.<RELEASE2>
-%define         releasedate 2011090700
+Release:        1.<RELEASE2>
+%define         releasedate 2011092200
 Provides:       web_browser
 Provides:       firefox = %{version}-%{release}
 Provides:       firefox = %{mainver}
@@ -66,7 +66,6 @@
 Patch3:         mozilla-prefer_plugin_pref.patch
 Patch4:         mozilla-shared-nss-db.patch
 Patch5:         mozilla-kde.patch
-Patch6:         mozilla-cairo-lcd.patch
 Patch7:         mozilla-language.patch
 Patch9:         mozilla-cairo-return.patch
 Patch10:        mozilla-ntlm-full-path.patch
@@ -197,7 +196,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %patch9 -p1
 %patch10 -p1
@@ -213,8 +211,6 @@
 %patch32 -p1
 %if %suse_version >= 1110
 %patch33 -p1
-# install kde.js
-install -m 644 %{SOURCE6} browser/app/profile/kde.js
 %endif
 %if %suse_version >= 1140
 %patch34 -p1
@@ -311,6 +307,10 @@
 find $RPM_BUILD_ROOT%{progdir} \
      -name "*.js" -o -name "*.jsm" -o -name "*.rdf" | xargs chmod a-x
 mkdir -p $RPM_BUILD_ROOT%{progdir}/searchplugins
+# install kde.js
+%if %suse_version >= 1110
+install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/defaults/pref/kde.js
+%endif
 # install add-plugins.sh
 sed "s:%%PROGDIR:%{progdir}:g" \
   %{SOURCE13} > $RPM_BUILD_ROOT%{progdir}/add-plugins.sh

++++++ compare-locales.tar.bz2 ++++++

++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.XS6q5d/_old	2011-09-28 17:26:51.000000000 +0200
+++ /var/tmp/diff_new_pack.XS6q5d/_new	2011-09-28 17:26:51.000000000 +0200
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 BRANCH="releases/mozilla-release"
-RELEASE_TAG="FIREFOX_6_0_2_RELEASE"
-VERSION="6.0.2"
+RELEASE_TAG="FIREFOX_7_0_RELEASE"
+VERSION="7.0"
 
 # mozilla
 hg clone http://hg.mozilla.org/$BRANCH mozilla

++++++ firefox-6.0.2-source.tar.bz2 -> firefox-7.0-source.tar.bz2 ++++++
old-versions/11.4/UPDATES/all/MozillaFirefox/firefox-6.0.2-source.tar.bz2 11.4/MozillaFirefox/firefox-7.0-source.tar.bz2 differ: char 11, line 1

++++++ firefox-branded-icons.patch ++++++
--- /var/tmp/diff_new_pack.XS6q5d/_old	2011-09-28 17:26:51.000000000 +0200
+++ /var/tmp/diff_new_pack.XS6q5d/_new	2011-09-28 17:26:51.000000000 +0200
@@ -1,15 +1,15 @@
 # HG changeset patch
-# Parent 0a9fd1d7099ccdff12205e23f0d9bf4d93a328ee
+# Parent 6948d58326d5c2e46936e186079421e7d76445e2
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
 +++ b/browser/app/Makefile.in
-@@ -221,16 +221,21 @@ endif
+@@ -199,16 +199,21 @@ DEFINES += -DMOZILLA_OFFICIAL
+ endif
  
  ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
  libs::
  	$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
- 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png   $(DIST)/bin/icons
  	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png  $(DIST)/bin/chrome/icons/default
  	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png  $(DIST)/bin/chrome/icons/default
  	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png  $(DIST)/bin/chrome/icons/default
@@ -29,7 +29,7 @@
 diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
 --- a/browser/branding/official/Makefile.in
 +++ b/browser/branding/official/Makefile.in
-@@ -68,18 +68,21 @@ OSX_BRANDING_FILES = \
+@@ -69,18 +69,21 @@ OSX_BRANDING_FILES = \
  	firefox.icns \
  	disk.icns \
  	document.icns \
@@ -43,7 +43,6 @@
  	default32.png \
  	default48.png \
 +	default256.png \
- 	document.png \
  	mozicon128.png \
  	$(NULL)
  
@@ -51,10 +50,11 @@
  	firefox-os2.ico \
  	document-os2.ico \
  	$(NULL)
+ 
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -416,18 +416,21 @@
+@@ -421,18 +421,21 @@
  #ifdef SHIP_FEEDBACK
  @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
  #endif

++++++ firefox-kde.patch ++++++
--- /var/tmp/diff_new_pack.XS6q5d/_old	2011-09-28 17:26:51.000000000 +0200
+++ /var/tmp/diff_new_pack.XS6q5d/_new	2011-09-28 17:26:51.000000000 +0200
@@ -1,29 +1,8 @@
-diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
---- a/browser/app/Makefile.in
-+++ b/browser/app/Makefile.in
-@@ -44,16 +44,17 @@ srcdir		= @srcdir@
- VPATH		= @srcdir@
- 
- include $(DEPTH)/config/autoconf.mk
- 
- DIRS		= profile/extensions
- 
- PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
- 		  $(srcdir)/profile/channel-prefs.js \
-+		  $(srcdir)/profile/kde.js \
- 		  $(NULL)
- 
- 
- # hardcode en-US for the moment
- AB_CD = en-US
- 
- DEFINES += -DAB_CD=$(AB_CD)
- 
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1076 @@
+@@ -0,0 +1,1038 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -250,15 +229,6 @@
 +      </hbox>
 +    </panel>
 +
-+    <panel id="highlighter-panel"
-+           hidden="true"
-+           ignorekeys="true"
-+           noautofocus="true"
-+           noautohide="true"
-+           onclick="InspectorUI.stopInspecting();"
-+           onmousemove="InspectorUI.highlighter.handleMouseMove(event);"
-+           onMozMousePixelScroll="InspectorUI.highlighter.handlePixelScroll(event);"/>
-+
 +    <panel id="inspector-tree-panel"
 +           orient="vertical"
 +           hidden="true"
@@ -276,26 +246,6 @@
 +                       accesskey="&inspectButton.accesskey;"
 +                       class="toolbarbutton-text"
 +                       command="Inspector:Inspect"/>
-+        <toolbarbutton id="inspector-previous-toolbutton"
-+                       label="&inspectPreviousButton.label;"
-+                       accesskey="&inspectPreviousButton.accesskey;"
-+                       class="toolbarbutton-text"
-+                       command="Inspector:Previous"/>
-+        <toolbarbutton id="inspector-next-toolbutton"
-+                       label="&inspectNextButton.label;"
-+                       accesskey="&inspectNextButton.accesskey;"
-+                       class="toolbarbutton-text"
-+                       command="Inspector:Next"/>
-+        <toolbarbutton id="inspector-style-toolbutton"
-+                       label="&inspectStyleButton.label;"
-+                       accesskey="&inspectStyleButton.accesskey;"
-+                       class="toolbarbutton-text"
-+                       oncommand="InspectorUI.toggleStylePanel();"/>
-+        <toolbarbutton id="inspector-dom-toolbutton"
-+                       label="&inspectObjectButton.label;"
-+                       accesskey="&inspectObjectButton.accesskey;"
-+                       class="toolbarbutton-text"
-+                       oncommand="InspectorUI.toggleDOMPanel();"/>
 +      </toolbar>
 +      <hbox id="tree-panel-resizer-box" align="end">
 +        <spacer flex="1" />
@@ -303,21 +253,6 @@
 +      </hbox>
 +    </panel>
 +
-+    <panel id="inspector-style-panel"
-+           hidden="true"
-+           orient="vertical"
-+           ignorekeys="true"
-+           noautofocus="true"
-+           noautohide="true"
-+           titlebar="normal"
-+           label="&inspectStylePanelTitle.label;">
-+        <listbox id="inspector-style-listbox" flex="1"/>
-+        <hbox align="end">
-+          <spacer flex="1" />
-+          <resizer dir="bottomend"/>
-+        </hbox>
-+    </panel>
-+
 +    <menupopup id="toolbar-context-menu"
 +               onpopupshowing="onViewToolbarsPopupShowing(event);">
 +      <menuseparator/>
@@ -1094,6 +1029,12 @@
 +#endif
 +
 +</vbox>
++# <iframe id="highlighter-frame"
++#   transparent="true"
++#   type="content"
++#   src="chrome://content/base/highlighter.html"/> is dynamically appended as
++#     the last child of #tab-view-deck, only when it is needed, for minimal
++#     performance impact.
 +# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck.
 +#     Introducing the iframe dynamically, as needed, was found to be better than
 +#     starting with an empty iframe here in browser.xul from a Ts standpoint.
@@ -1103,10 +1044,10 @@
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -21,16 +21,18 @@ browser.jar:
- *       content/browser/aboutHome.css                 (content/aboutHome.css)
-         content/browser/aboutHome-restore-icon.png    (content/aboutHome-restore-icon.png)
+@@ -23,16 +23,18 @@ browser.jar:
          content/browser/aboutHome-restore-icon-small.png    (content/aboutHome-restore-icon-small.png)
+         content/browser/aboutHome-snippet1.png        (content/aboutHome-snippet1.png)
+         content/browser/aboutHome-snippet2.png        (content/aboutHome-snippet2.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)
@@ -1116,12 +1057,12 @@
 +%       override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
  *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
  *       content/browser/fullscreen-video.xhtml        (content/fullscreen-video.xhtml)
+         content/browser/highlighter.xhtml             (content/highlighter.xhtml)
  *       content/browser/inspector.html                (content/inspector.html)
  *       content/browser/scratchpad.xul                (content/scratchpad.xul)
  *       content/browser/scratchpad.js                 (content/scratchpad.js)
  *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
  *       content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
- *       content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
 --- a/browser/components/build/nsModule.cpp
 +++ b/browser/components/build/nsModule.cpp
@@ -1624,7 +1565,7 @@
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -435,16 +435,17 @@
+@@ -440,16 +440,17 @@
  #endif
  #endif
  


++++++ l10n-6.0.2.tar.bz2 -> l10n-7.0.tar.bz2 ++++++
old-versions/11.4/UPDATES/all/MozillaFirefox/l10n-6.0.2.tar.bz2 11.4/MozillaFirefox/l10n-7.0.tar.bz2 differ: char 11, line 1

++++++ mozilla-kde.patch ++++++
--- /var/tmp/diff_new_pack.XS6q5d/_old	2011-09-28 17:26:52.000000000 +0200
+++ /var/tmp/diff_new_pack.XS6q5d/_new	2011-09-28 17:26:52.000000000 +0200
@@ -1,7 +1,7 @@
 diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
 --- a/modules/libpref/src/Makefile.in
 +++ b/modules/libpref/src/Makefile.in
-@@ -87,14 +87,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas
+@@ -77,14 +77,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas
  # Optimizer bug with GCC 3.2.2 on OS/2
  ifeq ($(OS_ARCH), OS2)
  nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp
@@ -39,7 +39,7 @@
  #include "prefapi.h"
  #include "prefread.h"
  #include "prefapi_private_data.h"
-@@ -822,30 +823,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -966,30 +967,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
  }
  
  static nsresult pref_LoadPrefsInDirList(const char *listId)
@@ -89,7 +89,7 @@
  }
  
  static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)
-@@ -938,28 +957,40 @@ static nsresult pref_InitInitialObjects(
+@@ -1082,28 +1101,40 @@ static nsresult pref_InitInitialObjects(
      /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
      static const char* specialFiles[] = {
  #if defined(XP_MACOSX)
@@ -133,15 +133,15 @@
 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in
 --- a/toolkit/components/downloads/Makefile.in
 +++ b/toolkit/components/downloads/Makefile.in
-@@ -79,8 +79,10 @@ endif
+@@ -77,8 +77,10 @@ EXTRA_COMPONENTS = \
+   $(NULL)
+ endif
  
  ifdef ENABLE_TESTS
  DIRS += test
  endif
  
  include $(topsrcdir)/config/rules.mk
- 
- EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 +
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
@@ -168,7 +168,7 @@
  #include "AndroidBridge.h"
  #endif
  
-@@ -2192,16 +2196,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2203,16 +2207,25 @@ nsDownload::SetState(DownloadState aStat
        nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
  
        // Master pref to control this function.
@@ -194,7 +194,7 @@
          PRInt64 goat = PR_Now() - mStartTime;
          showTaskbarAlert = goat > alertIntervalUSec;
  
-@@ -2225,19 +2238,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2236,19 +2249,20 @@ nsDownload::SetState(DownloadState aStat
                // If downloads are automatically removed per the user's
                // retention policy, there's no reason to make the text clickable
                // because if it is, they'll click open the download manager and
@@ -2178,7 +2178,7 @@
 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
 --- a/toolkit/xre/Makefile.in
 +++ b/toolkit/xre/Makefile.in
-@@ -97,17 +97,18 @@ EXPORTS = nsWindowsDllInterceptor.h
+@@ -98,17 +98,18 @@ EXPORTS = nsWindowsDllInterceptor.h
  else
  ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
  CMMSRCS = nsNativeAppSupportCocoa.mm
@@ -3119,7 +3119,7 @@
  #include "nsXPIDLString.h"
  #include "nsIURL.h"
  #include "nsIFileStreams.h"
-@@ -1219,29 +1219,29 @@ nsresult nsOSHelperAppService::OSProtoco
+@@ -1191,29 +1191,29 @@ nsresult nsOSHelperAppService::OSProtoco
      ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':');
  
    if (action.isValid())
@@ -3151,7 +3151,7 @@
  
  nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile)
  {
-@@ -1327,17 +1327,17 @@ nsOSHelperAppService::GetFromExtension(c
+@@ -1299,17 +1299,17 @@ nsOSHelperAppService::GetFromExtension(c
                                           minorType,
                                           mime_types_description,
                                           PR_TRUE);
@@ -3170,7 +3170,7 @@
  
      rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
                                    majorType,
-@@ -1453,17 +1453,17 @@ nsOSHelperAppService::GetFromType(const 
+@@ -1425,17 +1425,17 @@ nsOSHelperAppService::GetFromType(const 
  #ifdef MOZ_WIDGET_GTK2
    nsMIMEInfoBase *gnomeInfo = nsnull;
    if (handler.IsEmpty()) {
@@ -3192,7 +3192,7 @@
 diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
 --- a/widget/src/gtk2/Makefile.in
 +++ b/widget/src/gtk2/Makefile.in
-@@ -158,11 +158,14 @@ endif
+@@ -134,11 +134,14 @@ endif
  
  DEFINES		+= -DCAIRO_GFX
  
@@ -3246,7 +3246,7 @@
  #define MAX_PREVIEW_SIZE 180
  
  nsILocalFile *nsFilePicker::mPrevDisplayDirectory = nsnull;
-@@ -271,17 +273,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
+@@ -282,17 +284,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
    return nsBaseFilePicker::AppendFilters(aFilterMask);
  }
  
@@ -3267,7 +3267,7 @@
  
    mFilters.AppendElement(filter);
    mFilterNames.AppendElement(name);
-@@ -419,16 +423,19 @@ confirm_overwrite_file(GtkWidget *parent
+@@ -430,16 +434,19 @@ confirm_overwrite_file(GtkWidget *parent
    gtk_widget_destroy(dialog);
  
    return result;
@@ -3287,7 +3287,7 @@
    GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget);
  
    GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
-@@ -569,8 +576,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
+@@ -580,8 +587,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
      *aReturn = nsIFilePicker::returnCancel;
      break;
    }
@@ -3690,7 +3690,7 @@
 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
 --- a/xpcom/io/Makefile.in
 +++ b/xpcom/io/Makefile.in
-@@ -192,17 +192,17 @@ include $(topsrcdir)/ipc/chromium/chromi
+@@ -190,17 +190,17 @@ include $(topsrcdir)/ipc/chromium/chromi
  DEFINES		+= -D_IMPL_NS_COM
  
  ifeq ($(OS_ARCH),Linux)

++++++ mozilla-language.patch ++++++
--- /var/tmp/diff_new_pack.XS6q5d/_old	2011-09-28 17:26:52.000000000 +0200
+++ /var/tmp/diff_new_pack.XS6q5d/_new	2011-09-28 17:26:52.000000000 +0200
@@ -1,48 +1,48 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent db620d83124746201970dcf50c661957df979eca
+# Parent 0d6917b8f28f6e0398dbf329dda4932ba4f997c2
 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE
 
 diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp
 --- a/intl/locale/src/nsLocaleService.cpp
 +++ b/intl/locale/src/nsLocaleService.cpp
-@@ -181,16 +181,17 @@ nsLocaleService::nsLocaleService(void)
-         }
- 
+@@ -160,16 +160,17 @@ nsLocaleService::nsLocaleService(void)
+     nsRefPtr<nsLocale> resultLocale(new nsLocale());
+     NS_ENSURE_TRUE(resultLocale, );
  
  #ifdef MOZ_WIDGET_QT
-         const char* lang = QLocale::system().name().toAscii();
+     const char* lang = QLocale::system().name().toAscii();
  #else
-         // Get system configuration
-         const char* lang = getenv("LANG");
-+        const char* language = getenv("LANGUAGE");
+     // Get system configuration
+     const char* lang = getenv("LANG");
++    const char* language = getenv("LANGUAGE");
  #endif
  
-         for( i = 0; i < LocaleListLength; i++ ) {
-             nsresult result;
-             // setlocale( , "") evaluates LC_* and LANG
-             char* lc_temp = setlocale(posix_locale_category[i], "");
-             CopyASCIItoUTF16(LocaleList[i], category);
-             category_platform = category;
-@@ -206,16 +207,21 @@ nsLocaleService::nsLocaleService(void)
-                 else {
-                     CopyASCIItoUTF16(lang, platformLocale);
-                     result = posixConverter->GetXPLocale(lang, xpLocale);
-                 }
-             }
-             if (NS_FAILED(result)) {
-                 return;
+     nsAutoString xpLocale, platformLocale;
+     nsAutoString category, category_platform;
+     int i;
+ 
+     for( i = 0; i < LocaleListLength; i++ ) {
+         nsresult result;
+@@ -188,16 +189,21 @@ nsLocaleService::nsLocaleService(void)
+             } else {
+                 CopyASCIItoUTF16(lang, platformLocale);
+                 result = nsPosixLocale::GetXPLocale(lang, xpLocale);
              }
-+            // LANGUAGE is overriding LC_MESSAGES
-+            if (i == LC_MESSAGES && language && *language) {
-+                CopyASCIItoUTF16(language, platformLocale);
-+                result = posixConverter->GetXPLocale(language, xpLocale);
-+            }
-             resultLocale->AddCategory(category, xpLocale);
-             resultLocale->AddCategory(category_platform, platformLocale);
          }
-         mSystemLocale = do_QueryInterface(resultLocale);
-         mApplicationLocale = do_QueryInterface(resultLocale);
-     }  // if ( NS_SUCCEEDED )...
+         if (NS_FAILED(result)) {
+             return;
+         }
++        // LANGUAGE is overriding LC_MESSAGES
++        if (i == LC_MESSAGES && language && *language) {
++          CopyASCIItoUTF16(language, platformLocale);
++          result = nsPosixLocale::GetXPLocale(language, xpLocale);
++        }
+         resultLocale->AddCategory(category, xpLocale);
+         resultLocale->AddCategory(category_platform, platformLocale);
+     }
+     mSystemLocale = do_QueryInterface(resultLocale);
+     mApplicationLocale = do_QueryInterface(resultLocale);
         
  #endif // XP_UNIX
+ #ifdef XP_OS2

++++++ mozilla-repo.patch ++++++
--- /var/tmp/diff_new_pack.XS6q5d/_old	2011-09-28 17:26:52.000000000 +0200
+++ /var/tmp/diff_new_pack.XS6q5d/_new	2011-09-28 17:26:52.000000000 +0200
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent 1eb30390d6af83e41be9143c5d8c5fedf2ef69ef
+# Parent 732243388ea9cc592d30e1951f29a94a0ce5a035
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
 +++ b/browser/app/Makefile.in
-@@ -67,17 +67,17 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrc
+@@ -68,17 +68,17 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrc
  
  DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID)
  
@@ -48,7 +48,7 @@
 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
 --- a/toolkit/mozapps/installer/package-name.mk
 +++ b/toolkit/mozapps/installer/package-name.mk
-@@ -154,17 +154,17 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
+@@ -154,20 +154,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
  TEST_PACKAGE = $(PKG_BASENAME).tests.zip
  
  ifneq (,$(wildcard $(DIST)/bin/application.ini))
@@ -68,10 +68,13 @@
 +#MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
  
  MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt
+ 
+ # JavaScript Shell
+ PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip
 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
 --- a/toolkit/xre/Makefile.in
 +++ b/toolkit/xre/Makefile.in
-@@ -229,17 +229,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
+@@ -231,17 +231,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
  endif
  endif
  

++++++ mozilla-shared-nss-db.patch ++++++
--- /var/tmp/diff_new_pack.XS6q5d/_old	2011-09-28 17:26:52.000000000 +0200
+++ /var/tmp/diff_new_pack.XS6q5d/_new	2011-09-28 17:26:52.000000000 +0200
@@ -7,7 +7,7 @@
 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 --- a/config/autoconf.mk.in
 +++ b/config/autoconf.mk.in
-@@ -582,16 +582,20 @@ MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS
+@@ -579,16 +579,20 @@ MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS
  
  GLIB_CFLAGS	= @GLIB_CFLAGS@
  GLIB_LIBS	= @GLIB_LIBS@
@@ -31,7 +31,7 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8507,16 +8507,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8625,16 +8625,31 @@ AC_SUBST(QCMS_LIBS)
  
  dnl ========================================================
  dnl HarfBuzz
@@ -66,7 +66,7 @@
 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
 --- a/security/manager/ssl/src/Makefile.in
 +++ b/security/manager/ssl/src/Makefile.in
-@@ -114,19 +114,20 @@ CSRCS += md4.c
+@@ -114,12 +114,14 @@ CSRCS += md4.c
  
  
  EXTRA_DEPS = $(NSS_DEP_LIBS)
@@ -77,14 +77,8 @@
  # so that Mozilla's nss.h is used, not glibc's
 -LOCAL_INCLUDES += $(NSS_CFLAGS)
 +LOCAL_INCLUDES += $(NSS_CFLAGS) $(NSSHELPER_CFLAGS)
- 
- EXTRA_DSO_LDOPTS += \
- 		$(MOZ_UNICHARUTIL_LIBS) \
- 		$(MOZ_COMPONENT_LIBS) \
- 		$(MOZ_JS_LIBS) \
-+		$(NSSHELPER_LIBS) \
- 		$(NSS_LIBS) \
- 		$(NULL)
++
++EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS)
  
  include $(topsrcdir)/config/rules.mk
  
@@ -115,7 +109,7 @@
  
  #include "nsNetUtil.h"
  #include "nsAppDirectoryServiceDefs.h"
-@@ -1733,18 +1740,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
+@@ -1761,18 +1768,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
      ConfigureInternalPKCS11Token();
  
      // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs

++++++ mozilla-sle11.patch ++++++
--- /var/tmp/diff_new_pack.XS6q5d/_old	2011-09-28 17:26:52.000000000 +0200
+++ /var/tmp/diff_new_pack.XS6q5d/_new	2011-09-28 17:26:52.000000000 +0200
@@ -2,30 +2,6 @@
 References:
 https://bugzilla.mozilla.org/show_bug.cgi?id=513422
 
-diff --git a/gfx/cairo/cairo/src/cairo-xlib-surface.c b/gfx/cairo/cairo/src/cairo-xlib-surface.c
---- a/gfx/cairo/cairo/src/cairo-xlib-surface.c
-+++ b/gfx/cairo/cairo/src/cairo-xlib-surface.c
-@@ -4041,17 +4041,19 @@ _cairo_xlib_surface_add_glyph (Display *
- 	    new = malloc (4 * c);
- 	    if (unlikely (new == NULL)) {
- 		status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
- 		goto BAIL;
- 	    }
- 	    n = new;
- 	    d = (uint32_t *) data;
- 	    do {
--		*n++ = bswap_32 (*d++);
-+		*n = bswap_32 (*d);
-+                *n++;
-+                *d++;
- 	    } while (--c);
- 	    data = (uint8_t *) new;
- 	}
- 	break;
-     case CAIRO_FORMAT_RGB24:
-     default:
- 	ASSERT_NOT_REACHED;
- 	break;
 diff --git a/xpcom/glue/SSE.cpp b/xpcom/glue/SSE.cpp
 --- a/xpcom/glue/SSE.cpp
 +++ b/xpcom/glue/SSE.cpp

++++++ mozilla.sh.in ++++++
--- /var/tmp/diff_new_pack.XS6q5d/_old	2011-09-28 17:26:52.000000000 +0200
+++ /var/tmp/diff_new_pack.XS6q5d/_new	2011-09-28 17:26:52.000000000 +0200
@@ -84,9 +84,6 @@
 LD_LIBRARY_PATH=$MOZ_DIST_LIB${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
 
-# ignore composite extension (needed for Flash)
-export XLIB_SKIP_ARGB_VISUALS=1
-
 # needed for SUN Java under Xorg >= 7.2
 export LIBXCB_ALLOW_SLOPPY_LOCK=1
 

++++++ source-stamp.txt ++++++
--- /var/tmp/diff_new_pack.XS6q5d/_old	2011-09-28 17:26:52.000000000 +0200
+++ /var/tmp/diff_new_pack.XS6q5d/_new	2011-09-28 17:26:52.000000000 +0200
@@ -1,2 +1,2 @@
-REV=218ed8178b1e
+REV=273977a2c0ea
 REPO=http://hg.mozilla.org/releases/mozilla-release


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)