rpm/MozillaFirefox
SHA256
1
0
Fork 0
forked from pool/MozillaFirefox
Code Pull Requests Activity

- fixed loading of kde.js under KDE (bnc#718311)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=230
This commit is contained in:
Wolfgang Rosenauer 2011-09-16 12:57:01 +00:00 committed by Git OBS Bridge
parent 6e63619cba
commit 081a75e659
3 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MozillaFirefox.changes
View File

@ -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 Wed Sep 14 07:02:04 UTC 2011 - wr@rosenauer.org

6
MozillaFirefox.spec
View File

@ -213,8 +213,6 @@ cd $RPM_BUILD_DIR/mozilla
%patch32 -p1 %patch32 -p1
%if %suse_version >= 1110 %if %suse_version >= 1110
%patch33 -p1 %patch33 -p1
# install kde.js
install -m 644 %{SOURCE6} browser/app/profile/kde.js
%endif %endif
%if %suse_version >= 1140 %if %suse_version >= 1140
%patch34 -p1 %patch34 -p1
@ -311,6 +309,10 @@ mkdir -p $RPM_BUILD_ROOT/%{progdir}/distribution/extensions
find $RPM_BUILD_ROOT%{progdir} \ find $RPM_BUILD_ROOT%{progdir} \
-name "*.js" -o -name "*.jsm" -o -name "*.rdf" | xargs chmod a-x -name "*.js" -o -name "*.jsm" -o -name "*.rdf" | xargs chmod a-x
mkdir -p $RPM_BUILD_ROOT%{progdir}/searchplugins 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 # install add-plugins.sh
sed "s:%%PROGDIR:%{progdir}:g" \ sed "s:%%PROGDIR:%{progdir}:g" \
%{SOURCE13} > $RPM_BUILD_ROOT%{progdir}/add-plugins.sh %{SOURCE13} > $RPM_BUILD_ROOT%{progdir}/add-plugins.sh

21
firefox-kde.patch
View File

@ -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 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null