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

add another polishing fix

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=116
This commit is contained in:
Wolfgang Rosenauer 2009-09-16 13:47:32 +00:00 committed by Git OBS Bridge
parent e3c55337c6
commit 3a58ed634c
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MozillaFirefox.changes
View File

@ -4,7 +4,8 @@ Mon Sep 14 00:07:55 CEST 2009 - wr@rosenauer.org
- added KDE integration patch from llunak@novell.com
(firefox-kde.patch)
* support for knotify, making -kde4-addon obsolete
* KDE-specific support functional (bnc#170055) -
* KDE-specific support functional (bnc#170055)
- do not build libnkgnomevfs (bmo#512671) (firefox-no-gnomevfs)
-------------------------------------------------------------------
Thu Sep 10 09:34:26 CEST 2009 - wr@rosenauer.org

3
MozillaFirefox.spec
View File

@ -52,6 +52,7 @@ Patch4: mozilla-linkorder.patch
Patch5: firefox-bug506901.patch
Patch6: firefox-cross-desktop.patch
Patch7: firefox-kde.patch
Patch8: firefox-no-gnomevfs.patch
Patch14: credits.patch
Patch17: firefox-appname.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -150,6 +151,7 @@ cd $RPM_BUILD_DIR/mozilla
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch14
%patch17
# install kde.js
@ -347,7 +349,6 @@ fi
%{progdir}/%{progname}
%{progdir}/application.ini
%{progdir}/blocklist.xml
%exclude %{progdir}/components/libnkgnomevfs.so
%{_datadir}/applications/%{name}.desktop
%{_datadir}/mime/packages/%{progname}.xml
%{_datadir}/pixmaps/firefox*

25
firefox-no-gnomevfs.patch Normal file
View File

@ -0,0 +1,25 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -5632,16 +5632,21 @@ done],
if test -z "$MOZ_ENABLE_GNOMEVFS" && test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then
# Suppress warning on non-X11 platforms
if test -n "$MOZ_X11"; then
AC_MSG_WARN([Cannot build gnomevfs without required libraries. Removing gnomevfs from MOZ_EXTENSIONS.])
fi
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'`
fi
+dnl Do not build gnomevfs with libxul based apps
+if test -n "$LIBXUL_SDK_DIR" && test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then
+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'`
+fi
+
if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then
AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.])
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
fi
dnl This might be temporary: build tridentprofile only on Windows
if test `echo "$MOZ_EXTENSIONS" | grep -c tridentprofile` -ne 0 && test "$OS_ARCH" != "WINNT"; then
AC_MSG_WARN([tridentprofile extension works only on Windows at this time. Removing tridentprofile from MOZ_EXTENSIONS.])