From 06d7f89a327286671d53a9be0925563eaadd00ed Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 5 Jan 2024 22:19:11 +0100 Subject: [PATCH] automatic version update by autodist [release 64.0-1mamba;Sun Jan 06 2019] --- firefox.spec | 112 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 80 insertions(+), 32 deletions(-) diff --git a/firefox.spec b/firefox.spec index 6147636..ec4221e 100644 --- a/firefox.spec +++ b/firefox.spec @@ -17,7 +17,7 @@ %define pkgver %(echo %version | tr . _) Name: firefox -Version: 61.0.2 +Version: 64.0 Release: 1mamba Epoch: 1 Summary: The next generation browsing technology from mozilla.org @@ -72,13 +72,11 @@ BuildRequires: libdbus-glib-devel BuildRequires: libffi-devel BuildRequires: libfontconfig-devel BuildRequires: libfreetype-devel -BuildRequires: libfribidi-devel BuildRequires: libgcc BuildRequires: libgdk-pixbuf-devel BuildRequires: libglib-devel BuildRequires: libgtk-devel BuildRequires: libgtk2-devel -BuildRequires: libhunspell-devel BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libnspr-devel @@ -124,6 +122,7 @@ BuildRequires: unzip BuildRequires: bash BuildRequires: yasm BuildRequires: rust-bin +BuildRequires: cbindgen #Requires: xulrunner = %{version} Provides: xulrunner Obsoletes: xulrunner @@ -144,9 +143,8 @@ Mofilla Firefox is the next generation browsing technology from mozilla.org. This package contains static libraries and header files need for development. %prep -%setup -q -n mozilla-release-FIREFOX_%{pkgver}_RELEASE -#-D -T -#:<< ___EOF +%setup -q -n mozilla-release-FIREFOX_%{pkgver}_RELEASE -D -T +:<< ___EOF #cd %{source_dir} # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297 @@ -195,13 +193,14 @@ sed -e 's|__RPM_VERSION_INTERNAL__|%{firefox_internal_version}|' %{PATCH0} | pat #_EOF #chmod +x %{_builddir}/firefox-%{version}/%{source_dir}/find_requires.sh +echo -n "AIzaSyBT3wXwxmFuUQcyeMyp0MbHHhhFwNfWKTc" >google-api-key +#echo -n "$_mozilla_api_key" >mozilla-api-key + #___EOF + %build -mkdir -p build -cd build #:<< ___EOF -ln -sf ../configure configure export LDFLAGS='-lX11 -lXrender' PYTHON=%{__python} export MOZILLA_OFFICIAL=1 @@ -211,18 +210,18 @@ export MOZ_REQUIRE_SIGNING=1 export MOZ_SOURCE_REPO=https://hg.mozilla.org/mozilla-unified export MOZ_SOURCE_CHANGESET=1 -#:<< ___ EOF - -../mach configure \ +./mach configure \ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --enable-release \ - --enable-gold \ - --enable-pie \ + --enable-linker=gold \ + --enable-hardening \ --enable-optimize="-O2" \ --enable-rust-simd \ --enable-official-branding \ --enable-update-channel=release \ + --with-distribution-id=org.openmamba \ + --with-google-api-keyfile=`pwd`/google-api-key \ --with-system-zlib \ --with-system-bz2 \ --with-system-icu \ @@ -230,7 +229,6 @@ export MOZ_SOURCE_CHANGESET=1 --with-system-libvpx \ --with-system-nspr \ --with-system-nss \ - --enable-system-hunspell \ --enable-system-sqlite \ --enable-system-ffi \ --enable-alsa \ @@ -243,11 +241,16 @@ export MOZ_SOURCE_CHANGESET=1 --enable-accessibility \ --enable-extensions=default \ --disable-strip \ +%ifarch %{ix86} + --disable-debug-symbols \ +%endif %if %{testing} --enable-image-decoders=all \ --enable-image-encoders=all \ %endif +# --enable-pie \ + # --disable-necko-wifi # --enable-chrome-format=omni @@ -312,26 +315,26 @@ export MOZ_SOURCE_CHANGESET=1 #%define makeflags %{?_smp_mflags} #%endif -../mach build -../mach buildsymbols +./mach build +./mach buildsymbols #% make %{makeflags} MOZ_SERVICES_SYNC="1" %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -cd build +#cd build -OBJDIR=../obj-%{_target_cpu}-pc-linux-gnu +OBJDIR=obj-%{_target_cpu}-pc-linux-gnu %ifarch %{ix86} -OBJDIR=../obj-i686-pc-linux-gnu +OBJDIR=obj-i686-pc-linux-gnu %endif -cat > ${OBJDIR}/dist/bin/browser/chrome/en-US/locale/branding/browserconfig.properties << EOF -browser.startup.homepage=%{default_browser_homepage} -browser.startup.homepage_reset=%{default_browser_homepage} -EOF +#cat > ${OBJDIR}/dist/bin/browser/chrome/en-US/locale/branding/browserconfig.properties << EOF +#browser.startup.homepage=%{default_browser_homepage} +#browser.startup.homepage_reset=%{default_browser_homepage} +#EOF sed -i -e 's|@BINPATH@/browser/@PREF_DIR@/firefox.js|@BINPATH@/browser/@PREF_DIR@/all-openmamba.js\n&|' \ - ../browser/installer/package-manifest.in + ./browser/installer/package-manifest.in #cp -p %{SOURCE10} ${OBJDIR}/dist/bin/browser/defaults/profile/bookmarks.html @@ -340,11 +343,12 @@ sed -i -e 's|@BINPATH@/browser/@PREF_DIR@/firefox.js|@BINPATH@/browser/@PREF_DIR #_EOF export DESTDIR=%{buildroot} -../mach install +./mach install #% makeinstall libdir=%{_libdir} -cat > %{buildroot}%{firefoxappdir}/defaults/pref/local-prefs.js << _EOF +install -d -m0755 %{buildroot}%{firefoxappdir}/browser/defaults/preferences +cat > %{buildroot}%{firefoxappdir}/browser/defaults/preferences/vendor.js << _EOF // Use LANG environment variable to choose locale pref("intl.locale.requested", ""); @@ -370,6 +374,20 @@ pref("general.useragent.vendor", "openmamba"); pref("general.useragent.vendorSub", "%{version}-%{release}"); _EOF + +install -d -m0755 %{buildroot}%{firefoxappdir}/distribution +cat > %{buildroot}%{firefoxappdir}/distribution/distribution.ini << END +[Global] +id=openmamba +version=1.0 +about=Mozilla Firefox for openmamba GNU/Linux + +[Preferences] +app.distributor=openmamba +app.distributor.channel=firefox +app.partner.openmamba=openmamba +END + mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install --vendor mozilla --dir %{buildroot}%{_datadir}/applications %{SOURCE2} desktop-file-install --vendor mozilla --dir %{buildroot}%{_datadir}/applications %{SOURCE7} @@ -378,7 +396,7 @@ desktop-file-install --vendor mozilla --dir %{buildroot}%{_datadir}/applications for i in 16 22 24 32 48 256; do mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps - convert -geometry ${i}x${i} ../browser/branding/official/default${i}.png %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/firefox.png + convert -geometry ${i}x${i} ./browser/branding/official/default${i}.png %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/firefox.png done #rm -f %{buildroot}%{_bindir}/firefox @@ -388,7 +406,7 @@ done # #chmod 755 %{buildroot}%{_bindir}/firefox -install -pm 644 ../LICENSE %{buildroot}%{firefoxappdir}/ +#install -pm 644 ./LICENSE %{buildroot}%{firefoxappdir}/ rm -rf %{buildroot}%{firefoxappdir}/firefox ln -s firefox-bin %{buildroot}%{firefoxappdir}/firefox @@ -443,11 +461,16 @@ includedir=%{firefoxincludedir} Name: Mozilla Plug-In API Description: Mozilla Plug-In API -Version: 61.0.2 +Version: 64.0 Cflags: -I\${includedir} -DXP_UNIX _EOF +# 64.0: workaround +for f in libnspr4.so libnssutil3.so libplc4.so libplds4.so; do + ln -s ../$f %{buildroot}%{firefoxappdir}/$f +done + %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -509,7 +532,8 @@ fi #%{firefoxappdir}/run-mozilla.sh %{firefoxappdir}/browser/chrome.manifest %{firefoxappdir}/browser/omni.ja -%{firefoxappdir}/LICENSE +%dir %{firefoxappdir}/distribution +%{firefoxappdir}/distribution/distribution.ini %attr(644, root, root) %{firefoxappdir}/browser/blocklist.xml %dir %{firefoxappdir}/browser #%dir %{firefoxappdir}/browser/components @@ -560,7 +584,7 @@ fi #%{_libdir}/firefox-*/components/* %{firefoxappdir}/crashreporter %{firefoxappdir}/defaults/pref/channel-prefs.js -%{firefoxappdir}/defaults/pref/local-prefs.js +%{firefoxappdir}/browser/defaults/preferences/vendor.js %{firefoxappdir}/dependentlibs.list %{firefoxappdir}/dictionaries %{firefoxappdir}/hyphenation @@ -582,9 +606,14 @@ fi %{firefoxappdir}/libxul.so %{firefoxappdir}/omni.ja %{firefoxappdir}/plugin-container +%{_libdir}/firefox/libnspr4.so +%{_libdir}/firefox/libnssutil3.so +%{_libdir}/firefox/libplc4.so +%{_libdir}/firefox/libplds4.so #%{firefoxappdir}/updater #%dir %{_datadir}/idl/firefox-* #%{_datadir}/idl/firefox-*/* +%doc LICENSE %files devel %defattr(-,root,root) @@ -874,6 +903,19 @@ Greek language support for Firefox. %defattr(-,root,root) %{firefoxappdir}/browser/extensions/langpack-el@firefox.mozilla.org.xpi +%package i18n-en-CA +Summary: English (Canada) language support for Firefox +Group: System/Internationalization +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} +#Requires: hunspell-en + +%description i18n-en-CA +English (British) language support for Firefox. + +%files i18n-en-CA +%defattr(-,root,root) +%{firefoxappdir}/browser/extensions/langpack-en-CA@firefox.mozilla.org.xpi + %package i18n-en-GB Summary: English (British) language support for Firefox Group: System/Internationalization @@ -1904,6 +1946,12 @@ Zulu language support for Firefox. #%{firefoxappdir}/browser/extensions/langpack-zu@firefox.mozilla.org.xpi %changelog +* Sun Jan 06 2019 Automatic Build System 64.0-1mamba +- automatic version update by autodist + +* Sun Sep 16 2018 Automatic Build System 62.0-1mamba +- automatic version update by autodist + * Wed Aug 08 2018 Automatic Build System 61.0.2-1mamba - automatic version update by autodist