pool/MozillaFirefox
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

copy kde.js into builddir

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=114
This commit is contained in:
Wolfgang Rosenauer 2009-09-14 08:17:25 +00:00 committed by Git OBS Bridge
parent aa4c941101
commit 5d3f00ed4e
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MozillaFirefox.spec
View File

@ -152,6 +152,8 @@ cd $RPM_BUILD_DIR/mozilla
%patch7 -p1
%patch14
%patch17
# install kde.js
install -m 644 %{SOURCE6} browser/defaults/preferences/kde.js
%build
export MOZ_BUILD_DATE=%{releasedate}
@ -253,8 +255,6 @@ rm suse-default-prefs
cat > $RPM_BUILD_ROOT%{progdir}/defaults/preferences/firefox-l10n.js << EOF
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
EOF
# install kde.js
install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/defaults/preferences/kde.js
##########
# ADDONS
#

44
firefox-kde.patch
View File

@ -1,5 +1,15 @@
--- mozilla/browser/components/build/nsModule.cpp.sav 2009-09-11 14:42:26.000000000 +0200
+++ mozilla/browser/components/build/nsModule.cpp 2009-09-11 14:42:35.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 \
$(srcdir)/profile/channel-prefs.js \
+ $(srcdir)/profile/kde.js \
$(NULL)
ifndef MOZ_BRANDING_DIRECTORY
--- 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"
@ -28,8 +38,8 @@
#endif
--- mozilla/browser/components/shell/src/Makefile.in.sav 2009-09-11 14:42:26.000000000 +0200
+++ mozilla/browser/components/shell/src/Makefile.in 2009-09-11 14:42:35.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
@ -44,8 +54,8 @@
endif
endif
endif
--- mozilla/browser/components/shell/src/nsKDEShellService.cpp.sav 2009-09-11 14:42:26.000000000 +0200
+++ mozilla/browser/components/shell/src/nsKDEShellService.cpp 2009-09-11 14:42:35.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 *****
@ -240,8 +250,8 @@
+ NS_ADDREF(*_retval = defaultReader);
+ return NS_OK;
+ }
--- mozilla/browser/components/shell/src/nsKDEShellService.h.sav 2009-09-11 14:42:26.000000000 +0200
+++ mozilla/browser/components/shell/src/nsKDEShellService.h 2009-09-11 14:42:35.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 *****
@ -302,8 +312,8 @@
+};
+
+#endif // nskdeshellservice_h____
--- mozilla/browser/components/shell/src/nsUnixShellService.cpp.sav 2009-09-11 14:42:26.000000000 +0200
+++ mozilla/browser/components/shell/src/nsUnixShellService.cpp 2009-09-11 14:42:35.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 *****
@ -357,8 +367,8 @@
+ return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
+ return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
+}
--- mozilla/browser/components/shell/src/nsUnixShellService.h.sav 2009-09-11 14:42:26.000000000 +0200
+++ mozilla/browser/components/shell/src/nsUnixShellService.h 2009-09-11 14:42:35.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 *****
@ -405,3 +415,13 @@
+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+#endif // nsunixshellservice_h____
--- 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
bin/@PREF_DIR@/channel-prefs.js
+bin/@PREF_DIR@/kde.js
bin/greprefs/all.js
bin/greprefs/security-prefs.js
bin/greprefs/xpinstall.js