# HG changeset patch # User Wolfgang Rosenauer # Date 1414529520 -3600 # Node ID 449ace3f3f72c7068d024eb3e35e0cecca0ecdd8 # Parent 7c9b67ad12bb5338cb694a675dafcf869b7cdda5# Parent 4ee017942f283948420ea5c153381906d1434842 merge from firefox33 diff -r 7c9b67ad12bb -r 449ace3f3f72 MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Tue Oct 28 21:48:57 2014 +0100 +++ b/MozillaFirefox/MozillaFirefox.changes Tue Oct 28 21:52:00 2014 +0100 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Sat Oct 25 08:45:43 UTC 2014 - wr@rosenauer.org + +- define /usr/share/myspell as additional dictionary location + and remove add-plugins.sh finally (bnc#900639) + +------------------------------------------------------------------- +Sun Oct 19 12:59:28 UTC 2014 - vindex17@outlook.it + +- use Firefox default optimization flags instead of -Os +- specfile cleanup + +------------------------------------------------------------------- Wed Oct 15 08:05:33 UTC 2014 - wr@rosenauer.org - fix build for all ppc by not enabling elf-hack diff -r 7c9b67ad12bb -r 449ace3f3f72 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Tue Oct 28 21:48:57 2014 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Tue Oct 28 21:52:00 2014 +0100 @@ -17,12 +17,49 @@ # +# changed with every update %define major 33 %define mainver %major.99 %define update_channel beta +%define mainver %major.0 +%define update_channel release +%define releasedate 2014101000 -%if %suse_version > 1210 -%if %suse_version > 1310 +# general build definitions +%define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} +%define _use_internal_dependency_generator 0 +%define __find_requires sh %{SOURCE4} +%global provfind sh -c "grep -v '.so' | %__find_provides" +%global __find_provides %provfind +%define progname firefox +%define progdir %{_prefix}/%_lib/%{progname} +%define gnome_dir %{_prefix} +%if 0%{?suse_version} > 1130 +%define desktop_file_name firefox +%else +%define desktop_file_name %{name} +%endif +%if 0%{?suse_version} > 1210 +%if 0%{?suse_version} > 1310 +%define gstreamer_ver 1.0 +%define gstreamer 1 +%else +%define gstreamer_ver 0.10 +%endif +%endif +# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys +# Note: these are for the openSUSE Firefox builds ONLY. For your own distribution, +# please get your own set of keys. +%define _google_api_key AIzaSyD1hTe85_a14kr1Ks8T3Ce75rvbR1_Dx7Q +%define branding 1 +%define localize 1 +%ifarch aarch64 ppc ppc64 ppc64le s390 s390x ia64 %arm +%define crashreporter 0 +%else +%define crashreporter 1 +%endif +%if 0%{?suse_version} > 1210 +%if 0%{?suse_version} > 1310 %define gstreamer_ver 1.0 %define gstreamer 1 %else @@ -48,7 +85,7 @@ BuildRequires: xorg-x11-libXt-devel BuildRequires: yasm BuildRequires: zip -%if %suse_version > 1110 +%if 0%{?suse_version} > 1110 BuildRequires: libiw-devel BuildRequires: libproxy-devel %else @@ -58,7 +95,7 @@ BuildRequires: mozilla-nss-devel >= 3.17.2 BuildRequires: nss-shared-helper-devel BuildRequires: pkgconfig(libpulse) -%if %suse_version > 1210 +%if 0%{?suse_version} > 1210 BuildRequires: pkgconfig(gstreamer-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-app-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver) @@ -74,7 +111,6 @@ %endif Version: %{mainver} Release: 0 -%define releasedate 2014101500 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -100,7 +136,7 @@ Source10: compare-locales.tar.xz Source11: firefox.1 Source12: mozilla-get-app-id -Source13: add-plugins.sh.in +Source13: spellcheck.js Source14: create-tar.sh Source15: firefox-appdata.xml # Gecko/Toolkit @@ -131,35 +167,9 @@ Recommends: libcanberra0 Recommends: libpulse0 # libproxy's mozjs pacrunner crashes FF (bnc#759123) -%if %suse_version < 1220 +%if 0%{?suse_version} < 1220 Obsoletes: libproxy1-pacrunner-mozjs <= 0.4.7 %endif -%define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} -%define _use_internal_dependency_generator 0 -%define __find_requires sh %{SOURCE4} -%global provfind sh -c "grep -v '.so' | %__find_provides" -%global __find_provides %provfind -%define progname firefox -%define progdir %{_prefix}/%_lib/%{progname} -%define gnome_dir %{_prefix} -%if %suse_version > 1130 -%define desktop_file_name firefox -%else -%define desktop_file_name %{name} -%endif -### build options -# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys -# Note: these are for the openSUSE Firefox builds ONLY. For your own distribution, -# please get your own set of keys. -%define _google_api_key AIzaSyD1hTe85_a14kr1Ks8T3Ce75rvbR1_Dx7Q -%define branding 1 -%define localize 1 -%ifarch aarch64 ppc ppc64 ppc64le s390 s390x ia64 %arm -%define crashreporter 0 -%else -%define crashreporter 1 -%endif -### build options end %description Mozilla Firefox is a standalone web browser, designed for standards @@ -248,14 +258,14 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 -%if %suse_version < 1120 +%if 0%{?suse_version} < 1120 %patch10 -p1 %endif %patch11 -p1 %patch12 -p1 # Firefox %patch101 -p1 -%if %suse_version >= 1140 +%if 0%{?suse_version} >= 1140 %patch102 -p1 %endif %patch103 -p1 @@ -284,7 +294,10 @@ export BUILD_OFFICIAL=1 export MOZ_TELEMETRY_REPORTING=1 export MOZ_GOOGLE_API_KEY=%{_google_api_key} -export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing" +%ifarch %ix86 +export CFLAGS="${CFLAGS} -Os" +%endif %ifarch %arm export CFLAGS="${CFLAGS/-g / }" %endif @@ -307,7 +320,7 @@ ac_add_options --enable-release ac_add_options --enable-stdcxx-compat %ifarch %ix86 -%if %suse_version > 1230 +%if 0%{?suse_version} > 1230 ac_add_options --disable-optimize %endif %endif @@ -332,17 +345,17 @@ %if 0%{?gstreamer} == 1 ac_add_options --enable-gstreamer=1.0 %endif -%if %suse_version > 1130 +%if 0%{?suse_version} > 1130 ac_add_options --disable-gnomevfs ac_add_options --enable-gio %endif -%if %suse_version < 1220 +%if 0%{?suse_version} < 1220 ac_add_options --disable-gstreamer %endif %if %branding ac_add_options --enable-official-branding %endif -%if %suse_version > 1110 +%if 0%{?suse_version} > 1110 ac_add_options --enable-libproxy %endif %if ! %crashreporter @@ -375,18 +388,16 @@ #DEBUG (break the build if searchplugins are missing / temporary) grep amazondotcom dist/firefox/browser/omni.ja # copy tree into RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{progdir} -cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* $RPM_BUILD_ROOT%{progdir} -mkdir -p $RPM_BUILD_ROOT%{progdir}/distribution/extensions -mkdir -p $RPM_BUILD_ROOT%{progdir}/browser/searchplugins -mkdir -p $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/ -# install kde.js -install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/kde.js -install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/firefox.js -# install add-plugins.sh -sed "s:%%PROGDIR:%{progdir}:g" \ - %{SOURCE13} > $RPM_BUILD_ROOT%{progdir}/add-plugins.sh -chmod 755 $RPM_BUILD_ROOT%{progdir}/add-plugins.sh +mkdir -p %{buildroot}%{progdir} +cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* %{buildroot}%{progdir} +mkdir -p %{buildroot}%{progdir}/distribution/extensions +mkdir -p %{buildroot}%{progdir}/browser/searchplugins +mkdir -p %{buildroot}%{progdir}/browser/defaults/preferences/ +# install gre prefs +install -m 644 %{SOURCE13} %{buildroot}%{progdir}/defaults/pref/ +# install browser prefs +install -m 644 %{SOURCE6} %{buildroot}%{progdir}/browser/defaults/preferences/kde.js +install -m 644 %{SOURCE9} %{buildroot}%{progdir}/browser/defaults/preferences/firefox.js # install additional locales %if %localize rm -f %{_tmppath}/translations.* @@ -404,10 +415,10 @@ LOCALE_MERGEDIR=$RPM_BUILD_DIR/l10n-merged/$locale \ make -C browser/locales langpack-$locale cp -rL dist/xpi-stage/locale-$locale \ - $RPM_BUILD_ROOT%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org + %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org # remove prefs, profile defaults, and hyphenation from langpack - rm -rf $RPM_BUILD_ROOT%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/defaults - rm -rf $RPM_BUILD_ROOT%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/hyphenation + rm -rf %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/defaults + rm -rf %{buildroot}%{progdir}/browser/extensions/langpack-$locale@firefox.mozilla.org/hyphenation # check against the fixed common list and sort into the right filelist _matched=0 for _match in ar ca cs da de en-GB el es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do @@ -420,7 +431,7 @@ done %endif # remove some executable permissions -find $RPM_BUILD_ROOT%{progdir} \ +find %{buildroot}%{progdir} \ -name "*.js" -o \ -name "*.jsm" -o \ -name "*.rdf" -o \ @@ -430,63 +441,63 @@ -name "*.xml" -o \ -name "*.css" | xargs chmod a-x # remove mkdir.done files from installed base -find $RPM_BUILD_ROOT%{progdir} -name ".mkdir.done" | xargs rm +find %{buildroot}%{progdir} -name ".mkdir.done" | xargs rm # overwrite the mozilla start-script and link it to /usr/bin -mkdir --parents $RPM_BUILD_ROOT/usr/bin +mkdir --parents %{buildroot}/usr/bin sed "s:%%PREFIX:%{_prefix}:g s:%%PROGDIR:%{progdir}:g s:%%APPNAME:firefox:g s:%%PROFILE:.mozilla/firefox:g" \ - %{SOURCE3} > $RPM_BUILD_ROOT%{progdir}/%{progname}.sh -chmod 755 $RPM_BUILD_ROOT%{progdir}/%{progname}.sh -ln -sf ../..%{progdir}/%{progname}.sh $RPM_BUILD_ROOT%{_bindir}/%{progname} + %{SOURCE3} > %{buildroot}%{progdir}/%{progname}.sh +chmod 755 %{buildroot}%{progdir}/%{progname}.sh +ln -sf ../..%{progdir}/%{progname}.sh %{buildroot}%{_bindir}/%{progname} # desktop definition -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +mkdir -p %{buildroot}%{_datadir}/applications install -m 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{desktop_file_name}.desktop + %{buildroot}%{_datadir}/applications/%{desktop_file_name}.desktop # additional mime-types -mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages -cp %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mime/packages/%{progname}.xml +mkdir -p %{buildroot}%{_datadir}/mime/packages +cp %{SOURCE8} %{buildroot}%{_datadir}/mime/packages/%{progname}.xml # appdata -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cp %{SOURCE15} $RPM_BUILD_ROOT%{_datadir}/appdata/%{desktop_file_name}.appdata.xml +mkdir -p %{buildroot}%{_datadir}/appdata +cp %{SOURCE15} %{buildroot}%{_datadir}/appdata/%{desktop_file_name}.appdata.xml # install man-page -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/ -cp %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man1/%{progname}.1 +mkdir -p %{buildroot}%{_mandir}/man1/ +cp %{SOURCE11} %{buildroot}%{_mandir}/man1/%{progname}.1 ########## # ADDONS # -mkdir -p $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/%{firefox_appid} -mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_appid} -mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ -ln -sf %{progdir}/browser/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.png -ln -sf %{progdir}/browser/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}-gnome.png +mkdir -p %{buildroot}%{_datadir}/mozilla/extensions/%{firefox_appid} +mkdir -p %{buildroot}%{_libdir}/mozilla/extensions/%{firefox_appid} +mkdir -p %{buildroot}/usr/share/pixmaps/ +ln -sf %{progdir}/browser/icons/mozicon128.png %{buildroot}/usr/share/pixmaps/%{progname}.png +ln -sf %{progdir}/browser/icons/mozicon128.png %{buildroot}/usr/share/pixmaps/%{progname}-gnome.png %if %branding for size in 16 22 24 32 48 256; do %else for size in 16 32 48; do %endif - mkdir -p $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/ + mkdir -p %{buildroot}%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/ ln -sf %{progdir}/browser/chrome/icons/default/default$size.png \ - $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/%{progname}.png + %{buildroot}%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/%{progname}.png done %suse_update_desktop_file %{desktop_file_name} Network WebBrowser GTK # excludes -rm -f $RPM_BUILD_ROOT%{progdir}/updater.ini -rm -f $RPM_BUILD_ROOT%{progdir}/removed-files -rm -f $RPM_BUILD_ROOT%{progdir}/README.txt -rm -f $RPM_BUILD_ROOT%{progdir}/old-homepage-default.properties -rm -f $RPM_BUILD_ROOT%{progdir}/run-mozilla.sh -rm -f $RPM_BUILD_ROOT%{progdir}/LICENSE -rm -f $RPM_BUILD_ROOT%{progdir}/precomplete -rm -f $RPM_BUILD_ROOT%{progdir}/dictionaries/en-US* -rm -f $RPM_BUILD_ROOT%{progdir}/update-settings.ini +rm -f %{buildroot}%{progdir}/updater.ini +rm -f %{buildroot}%{progdir}/removed-files +rm -f %{buildroot}%{progdir}/README.txt +rm -f %{buildroot}%{progdir}/old-homepage-default.properties +rm -f %{buildroot}%{progdir}/run-mozilla.sh +rm -f %{buildroot}%{progdir}/LICENSE +rm -f %{buildroot}%{progdir}/precomplete +rm -f %{buildroot}%{progdir}/dictionaries/en-US* +rm -f %{buildroot}%{progdir}/update-settings.ini # devel mkdir -p %{buildroot}%{_bindir} install -m 755 %SOURCE12 %{buildroot}%{_bindir} # inspired by mandriva -mkdir -p %{buildroot}/etc/rpm -cat <<'FIN' >%{buildroot}/etc/rpm/macros.%{progname} +mkdir -p %{buildroot}%{_sysconfdir}/rpm +cat <<'FIN' >%{buildroot}%{_sysconfdir}/rpm/macros.%{progname} # Macros from %{name} package %%firefox_major %{major} %%firefox_version %{version} @@ -509,8 +520,8 @@ # cp "%%1" "$extdir" \ # %%{nil} # fdupes -%fdupes $RPM_BUILD_ROOT%{progdir} -%fdupes $RPM_BUILD_ROOT%{_datadir} +%fdupes %{buildroot}%{progdir} +%fdupes %{buildroot}%{_datadir} # create breakpad debugsymbols %if %crashreporter SYMBOLS_NAME="firefox-%{version}-%{release}.%{_arch}-%{suse_version}-symbols" @@ -519,20 +530,20 @@ SYMBOL_FULL_ARCHIVE_BASENAME="$SYMBOLS_NAME-full" \ SYMBOL_ARCHIVE_BASENAME="$SYMBOLS_NAME" if [ -e dist/*symbols.zip ]; then - mkdir -p $RPM_BUILD_ROOT%{_datadir}/mozilla/ - cp dist/*symbols.zip $RPM_BUILD_ROOT%{_datadir}/mozilla/ + mkdir -p %{buildroot}%{_datadir}/mozilla/ + cp dist/*symbols.zip %{buildroot}%{_datadir}/mozilla/ fi %endif %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %if %localize rm -rf %{_tmppath}/translations.* %endif %post # update mime and desktop database -%if %suse_version > 1130 +%if 0%{?suse_version} > 1130 %mime_database_post %desktop_database_post %icon_theme_cache_post @@ -544,11 +555,10 @@ usr/bin/update-desktop-database > /dev/null || : fi %endif -%{progdir}/add-plugins.sh > /dev/null 2>&1 exit 0 %postun -%if %suse_version > 1130 +%if 0%{?suse_version} > 1130 %icon_theme_cache_postun %desktop_database_postun %mime_database_postun @@ -562,15 +572,6 @@ %endif exit 0 -%posttrans -[ -e %{progdir}/add-plugins.sh ] && \ - %{progdir}/add-plugins.sh > /dev/null 2>&1 -exit 0 - -%preun -rm -f %{progdir}/dictionaries/* -exit 0 - %files %defattr(-,root,root) %dir %{progdir} @@ -595,7 +596,6 @@ %attr(755,root,root) %{progdir}/%{progname}.sh %{progdir}/firefox %{progdir}/firefox-bin -%{progdir}/add-plugins.sh %{progdir}/application.ini %{progdir}/dependentlibs.list %{progdir}/*.so @@ -628,7 +628,7 @@ %files devel %defattr(-,root,root) %{_bindir}/mozilla-get-app-id -%config /etc/rpm/macros.%{progname} +%config %{_sysconfdir}/rpm/macros.%{progname} %if %localize diff -r 7c9b67ad12bb -r 449ace3f3f72 MozillaFirefox/add-plugins.sh.in --- a/MozillaFirefox/add-plugins.sh.in Tue Oct 28 21:48:57 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -#! /bin/sh -# Copyright (c) 2008 Wolfgang Rosenauer. All rights reserved. -# - -# check if we are started as root -# only one of UID and USER must be set correctly -if test "$UID" != 0 -a "$USER" != root; then - echo "You must be root to start $0." - exit 1 -fi - -PREFIX="%PROGDIR" - -# dictionaries -MYSPELL=/usr/share/myspell -MOZ_SPELL=$PREFIX/dictionaries -if [ -d $MOZ_SPELL ] ; then - if [ -d $MYSPELL ] ; then - for dict in $MYSPELL/??[-_]??.aff ; do - - # check is it is really the file or it is a string which contain '??_??' - if ! [ -e $dict ] ; then - continue - fi - - # the dict file name - dict_file=`echo ${dict##*/}` - - # the dict file has a valid name - lang=`echo ${dict_file:0:2}` - country=`echo ${dict_file:3:2}` - - # check for .dic file - if [ ! -r $MYSPELL/${lang}[-_]${country}.dic ] ; then - continue - fi - - # create links - if [ ! -r $MOZ_SPELL/${lang}[-_]${country}.aff ] ; then - ln -sf $MYSPELL/${lang}[-_]${country}.aff \ - $MOZ_SPELL/${lang}-${country}.aff - fi - if [ ! -r $MOZ_SPELL/${lang}[-_]${country}.dic ] ; then - ln -sf $MYSPELL/${lang}[-_]${country}.dic \ - $MOZ_SPELL/${lang}-${country}.dic - fi - done - echo "-> added myspell dictionaries" - fi - - # remove broken links - for dict in $MOZ_SPELL/*.{aff,dic} ; do - if ! [ -r $dict ] ; then - rm -f $dict - fi - done -fi diff -r 7c9b67ad12bb -r 449ace3f3f72 MozillaFirefox/spellcheck.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MozillaFirefox/spellcheck.js Tue Oct 28 21:52:00 2014 +0100 @@ -0,0 +1,1 @@ +pref("spellchecker.dictionary_path", "/usr/share/myspell");