From e98022bbcf8856c2515023dd1c10cb018022e37b725118da1613c0f40449803c Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Fri, 16 Sep 2011 12:57:01 +0000
Subject: [PATCH] - fixed loading of kde.js under KDE (bnc#718311)

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=230
---
 MozillaFirefox.changes |  5 +++++
 MozillaFirefox.spec    |  6 ++++--
 firefox-kde.patch      | 21 ---------------------
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 195f0d9c..b2ca5e56 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+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
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 7b4ba113..c68c8fa0 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -213,8 +213,6 @@ cd $RPM_BUILD_DIR/mozilla
 %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 +309,10 @@ mkdir -p $RPM_BUILD_ROOT/%{progdir}/distribution/extensions
 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
diff --git a/firefox-kde.patch b/firefox-kde.patch
index ceba606a..767823a9 100644
--- a/firefox-kde.patch
+++ b/firefox-kde.patch
@@ -1,24 +1,3 @@
-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