diff options
| -rw-r--r-- | firefox-duckduckgo.patch | 36 | ||||
| -rw-r--r-- | firefox-mozconfig | 1 | ||||
| -rw-r--r-- | firefox.1 | 198 | ||||
| -rw-r--r-- | firefox.desktop | 1 | ||||
| -rw-r--r-- | firefox.sh.in | 6 | ||||
| -rw-r--r-- | firefox.spec | 63 |
6 files changed, 201 insertions, 104 deletions
diff --git a/firefox-duckduckgo.patch b/firefox-duckduckgo.patch new file mode 100644 index 0000000..e747013 --- /dev/null +++ b/firefox-duckduckgo.patch @@ -0,0 +1,36 @@ +diff -up mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties.duckduckgo mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties +--- mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties.duckduckgo 2012-10-24 16:32:26.000000000 +0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-07 16:27:04.278857840 +0100 +@@ -9,6 +9,7 @@ browser.search.defaultenginename=Google + browser.search.order.1=Google + browser.search.order.2=Yahoo + browser.search.order.3=Bing ++browser.search.order.4=DuckDuckGo + + # This is the default set of web based feed handlers shown in the reader + # selection UI +diff -up mozilla-release/browser/locales/en-US/searchplugins/duckduckgo.xml.duckduckgo mozilla-release/browser/locales/en-US/searchplugins/duckduckgo.xml +--- mozilla-release/browser/locales/en-US/searchplugins/duckduckgo.xml.duckduckgo 2012-11-07 16:27:04.278857840 +0100 ++++ mozilla-release/browser/locales/en-US/searchplugins/duckduckgo.xml 2012-11-07 16:27:04.278857840 +0100 +@@ -0,0 +1,11 @@ ++<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> ++ <ShortName>DuckDuckGo</ShortName> ++ <Description>We believe you can get better search and privacy at the same time.</Description> ++ <InputEncoding>UTF-8</InputEncoding> ++ <Image height="16" width="16" type="image/x-icon">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</Image> ++ <Url type="text/html" method="GET" template="https://duckduckgo.com/"> ++ <Param name="q" value="{searchTerms}"/> ++ <Param name="t" value="fedora"/> ++ </Url> ++ <SearchForm>https://duckduckgo.com/</SearchForm> ++</SearchPlugin> +diff -up mozilla-release/browser/locales/en-US/searchplugins/list.txt.duckduckgo mozilla-release/browser/locales/en-US/searchplugins/list.txt +--- mozilla-release/browser/locales/en-US/searchplugins/list.txt.duckduckgo 2012-10-24 16:32:26.000000000 +0200 ++++ mozilla-release/browser/locales/en-US/searchplugins/list.txt 2012-11-07 16:27:04.279857842 +0100 +@@ -1,5 +1,6 @@ + amazondotcom + bing ++duckduckgo + eBay + google + twitter diff --git a/firefox-mozconfig b/firefox-mozconfig index 0dfe92c..d7757e1 100644 --- a/firefox-mozconfig +++ b/firefox-mozconfig @@ -29,6 +29,7 @@ ac_add_options --enable-url-classifier ac_add_options --enable-gio ac_add_options --disable-gnomevfs ac_add_options --enable-chrome-format=omni +ac_add_options --with-system-libxul export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 @@ -1,79 +1,125 @@ -.TH "FIREFOX" "1" "October 2012" "http://www.mozilla.org" "User Commands" -.SH "NAME" -Firefox \- a Web browser for X11 from the Mozilla Foundation. -.SH "SYNOPSIS" +.TH FIREFOX 1 "August 07, 2001" firefox "Linux User's Manual" +.SH NAME +firefox \- a Web browser for X11 derived from the Mozilla browser + +.SH SYNOPSIS .B firefox [\fIOPTIONS\fR] [\fIURL\fR] -.SH "OPTIONS" -Summary of command\-line options: -.PP -\fBX11 options\fR -.TP -\fB\-\-display\fR=\fIDISPLAY\fR -X display to use. -.TP -\fB\-\-sync\fR -Make X calls synchronous. -.TP -\fB\-\-g\-fatal\-warnings\fR -Make all warnings fatal. -.PP -\fBFirefox options\fR -.TP -\fB\-h\fR or \fB\-help\fR -Print all command-line options. -.TP -\fB\-v\fR or \fB\-version\fR -Print Firefox version. -.TP -\fB\-P\fR <profile> -Start with <profile>. -.TP -\fB\-migration\fR -Start with migration wizard. -.TP -\fB\-ProfileManager\fR -Start with ProfileManager. -.TP -\fB\-no\-remote\fR -Do not accept or send remote commands; implies \fB\-new\-instance\fR. -.TP -\fB\-new\-instance\fR -Open new instance, not a new window in running instance. -.TP -\fB\-UILocale\fR <locale> -Start with <locale> resources as UI Locale. -.TP -\fB\-safe\-mode\fR -Disables extensions and themes for this session. -.TP -\fB\-jsconsole\fR -Open the Error console. -.TP -\fB\-browser\fR -Open a browser window. -.TP -\fB\-new\-window\fR <url> -Open <url> in a new window. -.TP -\fB\-new\-tab\fR <url> -Open <url> in a new tab. -.TP -\fB\-preferences\fR -Open Preferences dialog. -.TP -\fB\-search\fR <term> -Search <term> with your default search engine. -.TP -\fB\-private\fR -Enable private browsing mode. -.TP -\fB\-private\-toggle\fR -Toggle private browsing mode. -.TP -\fB\-setDefaultBrowser\fR -Set this app as the default browser. -.SH "BUGS" -For packaging related bug reports (including this man page): https://bugzilla.redhat.com/ -For application bug reports: https://bugzilla.mozilla.org/ +.B firefox-bin +[\fIOPTIONS\fR] [\fIURL\fR] + +.SH DESCRIPTION +\fBMozilla Firefox\fR is an open-source web browser, designed for +standards compliance, performance and portability. + +.SH USAGE +\fBfirefox\fR is a simple shell script that will set up the +environment for the actual executable, \fBfirefox-bin\fR. + +.SH OPTIONS +A summary of the options supported by \fBfirefox\fR is included below. + +.SS "GTK options" +\fB\-\-gdk-debug=\fR\fIFLAGS\fR +Gdk debugging flags to set +.TP +\fB\-\-gdk-no-debug=\fR\fIFLAGS\fR +Gdk debugging flags to unset +.TP +\fB\-\-gtk-debug=\fR\fIFLAGS\fR +Gtk+ debugging flags to set +.TP +\fB\-\-gtk-no-debug=\fR\fIFLAGS\fR +Gtk+ debugging flags to unset +.TP +\fB\-\-gtk-module=\fR\fIMODULE\fR +Load an additional Gtk module + +.SS "X11 options" +.TP +.BI \-\-display= DISPLAY +X display to use +.TP +.B \--sync +Make X calls synchronous +.TP +.B \-\-no-xshm +Don't use X shared memory extension +.TP +.BI \-\-xim-preedit= STYLE +.TP +.BI \-\-xim-status= STYLE +.TP +.B \-\-g-fatal-warnings +Make all warnings fatal + +.SS "Firefox options" +.TP +\fB\-height\fR \fIvalue\fR +Set height of startup window to \fIvalue\fR. +.TP +.B \-h, \-help +Show summary of options. +.TP +.B \-installer +Start with 4.x migration window. +.TP +\fB\-width\fR \fIvalue\fR +Set width of startup window to \fIvalue\fR. +.TP +.B \-v, \-version +Print \fB/usr/bin/firefox-bin\fR version. +.TP +\fB\-CreateProfile\fR \fIprofile\fR +Create \fIprofile\fR. +.TP +\fB\-P\fR \fIprofile\fR +Start with \fIprofile\fR. +.TP +.B \-ProfileWizard +Start with profile wizard. +.TP +.B \-ProfileManager +Start with profile manager. +.TP +.B \-SelectProfile +Start with profile selection dialog. +.TP +\fB\-lang\fR \fIlang-region\fR +Start with \fIlang-region\fR resources. +.TP +\fB\-remote\fR \fIcommand\fR +Execute \fIcommand\fR in an already running Firefox process. For more info, +see: \fIhttp://www.mozilla.org/unix/remote.html\fR +.TP +.B \-splash +Enable splash screen. +.TP +.B \-jsconsole +Start with Javascript Console +.TP +\fB\-chrome\fR \fIurl\fR +Load the specified chrome. +.TP + +.SH FILES +\fI/usr/bin/firefox\fR - shell script wrapping +\fBfirefox\fR +.br +\fI/usr/lib/mozilla/firefox-bin\fR - \fBfirefox\fR +executable + +.SH VERSION +1.0 + +.SH BUGS +To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR + +.SH "SEE ALSO" +.BR mozilla(1) + +.SH AUTHORS +.TP +.B The Mozilla Organization +.I http://www.mozilla.org/about.html diff --git a/firefox.desktop b/firefox.desktop index b874ed1..27c40bc 100644 --- a/firefox.desktop +++ b/firefox.desktop @@ -49,3 +49,4 @@ Type=Application MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; StartupNotify=true Categories=Network;WebBrowser; +Keywords=web;browser;internet; diff --git a/firefox.sh.in b/firefox.sh.in index 2d8890c..863f334 100644 --- a/firefox.sh.in +++ b/firefox.sh.in @@ -135,9 +135,11 @@ GNOME_DISABLE_CRASH_DIALOG=1 export GNOME_DISABLE_CRASH_DIALOG ## -## Use /var/tmp instead of /tmp because of 1GB /tmp limit in Fedora 18 and later +## Use $MOZ_TMPDIR if set. Otherwise use /var/tmp instead of /tmp +## because of 1GB /tmp limit in Fedora 18 and later. +## See: https://bugzilla.redhat.com/show_bug.cgi?id=867073 ## -TMPDIR="/var/tmp" +TMPDIR="${MOZ_TMPDIR:-/var/tmp}" export TMPDIR # OK, here's where all the real work gets done diff --git a/firefox.spec b/firefox.spec index fa3ecd4..c36248d 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,4 +1,4 @@ -# Use system nspr/nss? +# Use system nss/nspr? %if 0%{?fedora} < 16 && 0%{?rhel} < 7 %define system_nss 0 %else @@ -26,19 +26,19 @@ %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} -%global xulrunner_version 16.0.2 -%global xulrunner_version_max 16.1 -%global xulrunner_release 1 +%global xulrunner_version 17.0 +%global xulrunner_version_max 17.1 +%global xulrunner_release 0.1 %global alpha_version 0 -%global beta_version 0 +%global beta_version 6 %global rc_version 0 -%global datelang 20121026 +%global datelang 20121115 %global mozappdir %{_libdir}/firefox %global langpackdir %{mozappdir}/langpacks %global tarballdir mozilla-release -%define official_branding 1 +%define official_branding 0 %define build_langpacks 1 %define include_debuginfo 0 @@ -51,6 +51,7 @@ %global pre_version b%{beta_version} %global pre_name beta%{beta_version} %global tarballdir mozilla-beta +%global mycomment Beta %{beta_version} %endif %if %{rc_version} > 0 %global pre_version rc%{rc_version} @@ -66,8 +67,8 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 16.0.2 -Release: 2%{?dist} +Version: 17.0 +Release: 0.1%{?pre_tag}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -89,6 +90,7 @@ Patch0: firefox-install-dir.patch # Fedora patches Patch14: firefox-5.0-asciidel.patch Patch15: firefox-15.0-enable-addons.patch +Patch16: firefox-duckduckgo.patch # Upstream patches @@ -141,6 +143,7 @@ cd %{tarballdir} # Fedora patches %patch14 -p1 -b .asciidel %patch15 -p2 -b .addons +%patch16 -p1 -b .duckduckgo # Upstream patches @@ -154,15 +157,9 @@ cd %{tarballdir} %{__rm} -f .mozconfig %{__cat} %{SOURCE10} \ -%ifarch %{ix86} x86_64 - | grep -v disable-necko-wifi \ -%endif %if ! %{system_vpx} | grep -v with-system-libvpx \ %endif -%ifarch %{ix86} x86_64 - | grep -v disable-necko-wifi \ -%endif | tee .mozconfig %if %{official_branding} @@ -172,16 +169,6 @@ cd %{tarballdir} %{__cat} %{SOURCE13} >> .mozconfig %endif -echo "ac_add_options --enable-system-lcms" >> .mozconfig - -%if %{?system_nss} -echo "ac_add_options --with-system-nspr" >> .mozconfig -echo "ac_add_options --with-system-nss" >> .mozconfig -%else -echo "ac_add_options --without-system-nspr" >> .mozconfig -echo "ac_add_options --without-system-nss" >> .mozconfig -%endif - %if %{?system_cairo} echo "ac_add_options --enable-system-cairo" >> .mozconfig %else @@ -212,6 +199,14 @@ echo "ac_add_options --disable-debug" >> .mozconfig echo "ac_add_options --enable-optimize" >> .mozconfig %endif +%if %{?system_nss} +echo "ac_add_options --with-system-nspr" >> .mozconfig +echo "ac_add_options --with-system-nss" >> .mozconfig +%else +echo "ac_add_options --without-system-nspr" >> .mozconfig +echo "ac_add_options --without-system-nss" >> .mozconfig +%endif + #--------------------------------------------------------------------- %build @@ -223,7 +218,7 @@ cd %{tarballdir} # Disable C++ exceptions since Mozilla code is not exception-safe # MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | \ - %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g') + %{__sed} -e 's/-Wall//') %if %{?debug_build} MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//') %endif @@ -374,6 +369,9 @@ create_default_langpack "zh-TW" "zh" # Copy over the LICENSE %{__install} -p -c -m 644 LICENSE $RPM_BUILD_ROOT/%{mozappdir} +# Remove tmp files +find $RPM_BUILD_ROOT/%{mozappdir}/modules -name '.mkdir.done' -exec rm -rf {} \; + # Enable crash reporter for Firefox application %if %{include_debuginfo} sed -i -e "s/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/" $RPM_BUILD_ROOT/%{mozappdir}/application.ini @@ -451,6 +449,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/48x48/apps/firefox.png %{mozappdir}/xulrunner %{mozappdir}/webapprt-stub +%{mozappdir}/modules/* %dir %{mozappdir}/webapprt %{mozappdir}/webapprt/omni.ja %{mozappdir}/webapprt/webapprt.ini @@ -464,6 +463,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Sun Nov 18 2012 Remi Collet <RPMS@FamilleCollet.com> - 17.0-0.1.b6 +- Update to 17.0 Beta 6, sync with rawhide + +* Thu Nov 15 2012 Martin Stransky <stransky@redhat.com> - 17.0-0.1b6 +- Update to 17.0 Beta 6 + +* Wed Nov 7 2012 Jan Horak <jhorak@redhat.com> - 16.0.2-4 +- Added duckduckgo.com search engine + +* Thu Nov 1 2012 Jan Horak <jhorak@redhat.com> - 16.0.2-3 +- Added keywords to desktop file (871900) + * Thu Nov 1 2012 Remi Collet <RPMS@FamilleCollet.com> - 16.0.2-2 - Sync with rawhide - build using xulrunner-last |