From 10a2ac59fb31c0f1a59f5c9df3b3b53f6826fff3f340dc9866f22af78646c199 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Mon, 12 Oct 2009 10:23:43 +0000
Subject: [PATCH] checked in

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=122
---
 MozillaFirefox.changes |  5 ---
 MozillaFirefox.spec    |  2 --
 firefox-kde.patch      | 70 ++++++++++--------------------------------
 3 files changed, 16 insertions(+), 61 deletions(-)

diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 77a2d6f..c715f87 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Wed Oct  7 20:11:24 CEST 2009 - llunak@novell.com
-
-- fix KDE button order in one more place (bnc#170055)
-
 -------------------------------------------------------------------
 Fri Oct  2 20:26:49 CEST 2009 - wr@rosenauer.org
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index fd3dec1..ac31563 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -152,8 +152,6 @@ cd $RPM_BUILD_DIR/mozilla
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-# copy current files and patch them later to keep them in sync
-cp browser/base/content/browser.xul browser/base/content/browser-kde.xul
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
diff --git a/firefox-kde.patch b/firefox-kde.patch
index 870fdbc..bbdb738 100644
--- a/firefox-kde.patch
+++ b/firefox-kde.patch
@@ -1,5 +1,5 @@
---- mozilla/browser/app/Makefile.in.sav	2009-10-01 22:03:56.000000000 +0200
-+++ mozilla/browser/app/Makefile.in	2009-10-01 22:04:57.000000000 +0200
+--- mozilla/browser/app/Makefile.in.sav	2009-09-14 10:00:21.000000000 +0200
++++ mozilla/browser/app/Makefile.in	2009-09-14 10:04:14.000000000 +0200
 @@ -49,6 +49,7 @@ DIRS		= profile/extensions
  
  PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
@@ -8,45 +8,8 @@
  		  $(NULL)
  
  ifndef MOZ_BRANDING_DIRECTORY
---- mozilla/browser/base/content/browser-kde.xul.sav	2009-07-31 08:29:32.000000000 +0200
-+++ mozilla/browser/base/content/browser-kde.xul	2009-10-01 22:34:03.000000000 +0200
-@@ -157,7 +157,7 @@
-         <button id="editBookmarkPanelDeleteButton"
-                 label="&editBookmark.cancel.label;"
-                 oncommand="StarUI.cancelButtonOnCommand();"/>
--#else
-+#elif XP_UNIX_GNOME
-         <button id="editBookmarkPanelDeleteButton"
-                 label="&editBookmark.cancel.label;"
-                 oncommand="StarUI.cancelButtonOnCommand();"/>
-@@ -165,6 +165,14 @@
-                 label="&editBookmark.done.label;"
-                 default="true"
-                 oncommand="StarUI.panel.hidePopup();"/>
-+#else
-+        <button id="editBookmarkPanelDoneButton"
-+                label="&editBookmark.done.label;"
-+                default="true"
-+                oncommand="StarUI.panel.hidePopup();"/>
-+        <button id="editBookmarkPanelDeleteButton"
-+                label="&editBookmark.cancel.label;"
-+                oncommand="StarUI.cancelButtonOnCommand();"/>
- #endif
-       </hbox>
-     </panel>
---- mozilla/browser/base/jar.mn.sav	2009-07-31 08:29:32.000000000 +0200
-+++ mozilla/browser/base/jar.mn	2009-10-01 22:24:45.000000000 +0200
-@@ -22,6 +22,8 @@ browser.jar:
- *       content/browser/browser.css                   (content/browser.css)
- *       content/browser/browser.js                    (content/browser.js)
- *       content/browser/browser.xul                   (content/browser.xul)
-+*       content/browser/browser-kde.xul               (content/browser-kde.xul)
-+%       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/credits.xhtml                 (content/credits.xhtml)
- *       content/browser/metaData.js                   (content/metaData.js)
---- mozilla/browser/components/build/nsModule.cpp.sav	2009-10-01 22:03:56.000000000 +0200
-+++ mozilla/browser/components/build/nsModule.cpp	2009-10-01 22:04:57.000000000 +0200
+--- mozilla/browser/components/build/nsModule.cpp.sav	2009-09-14 10:00:21.000000000 +0200
++++ mozilla/browser/components/build/nsModule.cpp	2009-09-14 10:04:14.000000000 +0200
 @@ -46,7 +46,7 @@
  #elif defined(XP_MACOSX)
  #include "nsMacShellService.h"
@@ -75,8 +38,8 @@
  
  #endif
  
---- mozilla/browser/components/shell/src/Makefile.in.sav	2009-10-01 22:03:56.000000000 +0200
-+++ mozilla/browser/components/shell/src/Makefile.in	2009-10-01 22:04:57.000000000 +0200
+--- mozilla/browser/components/shell/src/Makefile.in.sav	2009-09-14 10:00:21.000000000 +0200
++++ mozilla/browser/components/shell/src/Makefile.in	2009-09-14 10:04:14.000000000 +0200
 @@ -75,11 +75,12 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_
  CPPSRCS = nsMacShellService.cpp
  else
@@ -91,8 +54,8 @@
  endif
  endif
  endif
---- mozilla/browser/components/shell/src/nsKDEShellService.cpp.sav	2009-10-01 22:03:56.000000000 +0200
-+++ mozilla/browser/components/shell/src/nsKDEShellService.cpp	2009-10-01 22:04:57.000000000 +0200
+--- mozilla/browser/components/shell/src/nsKDEShellService.cpp.sav	2009-09-14 10:00:21.000000000 +0200
++++ mozilla/browser/components/shell/src/nsKDEShellService.cpp	2009-09-14 10:04:14.000000000 +0200
 @@ -0,0 +1,193 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@@ -287,8 +250,8 @@
 +    NS_ADDREF(*_retval = defaultReader);
 +    return NS_OK;
 +    }
---- mozilla/browser/components/shell/src/nsKDEShellService.h.sav	2009-10-01 22:03:56.000000000 +0200
-+++ mozilla/browser/components/shell/src/nsKDEShellService.h	2009-10-01 22:04:57.000000000 +0200
+--- mozilla/browser/components/shell/src/nsKDEShellService.h.sav	2009-09-14 10:00:21.000000000 +0200
++++ mozilla/browser/components/shell/src/nsKDEShellService.h	2009-09-14 10:04:14.000000000 +0200
 @@ -0,0 +1,59 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@@ -349,8 +312,8 @@
 +};
 +
 +#endif // nskdeshellservice_h____
---- mozilla/browser/components/shell/src/nsUnixShellService.cpp.sav	2009-10-01 22:03:56.000000000 +0200
-+++ mozilla/browser/components/shell/src/nsUnixShellService.cpp	2009-10-01 22:04:57.000000000 +0200
+--- mozilla/browser/components/shell/src/nsUnixShellService.cpp.sav	2009-09-14 10:00:21.000000000 +0200
++++ mozilla/browser/components/shell/src/nsUnixShellService.cpp	2009-09-14 10:04:14.000000000 +0200
 @@ -0,0 +1,52 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@@ -404,8 +367,8 @@
 +        return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
 +    return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
 +}
---- mozilla/browser/components/shell/src/nsUnixShellService.h.sav	2009-10-01 22:03:56.000000000 +0200
-+++ mozilla/browser/components/shell/src/nsUnixShellService.h	2009-10-01 22:04:57.000000000 +0200
+--- mozilla/browser/components/shell/src/nsUnixShellService.h.sav	2009-09-14 10:00:21.000000000 +0200
++++ mozilla/browser/components/shell/src/nsUnixShellService.h	2009-09-14 10:04:14.000000000 +0200
 @@ -0,0 +1,45 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@@ -452,8 +415,8 @@
 +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
 +
 +#endif // nsunixshellservice_h____
---- mozilla/browser/installer/unix/packages-static.sav	2009-10-01 22:03:56.000000000 +0200
-+++ mozilla/browser/installer/unix/packages-static	2009-10-01 22:04:57.000000000 +0200
+--- mozilla/browser/installer/unix/packages-static.sav	2009-09-14 10:00:21.000000000 +0200
++++ mozilla/browser/installer/unix/packages-static	2009-09-14 10:04:14.000000000 +0200
 @@ -291,6 +291,7 @@ bin/icons/*.png
  bin/@PREF_DIR@/firefox.js
  bin/@PREF_DIR@/firefox-branding.js
@@ -462,4 +425,3 @@
  bin/greprefs/all.js
  bin/greprefs/security-prefs.js
  bin/greprefs/xpinstall.js
-