diff --git a/icecat-60.2.1-gnu1.tar.bz2 b/icecat-60.2.1-gnu1.tar.bz2 new file mode 100644 index 0000000..55447df Binary files /dev/null and b/icecat-60.2.1-gnu1.tar.bz2 differ diff --git a/icecat-fix_installer.patch b/icecat-fix_installer.patch index 3ea7fbd..a56a880 100644 --- a/icecat-fix_installer.patch +++ b/icecat-fix_installer.patch @@ -13,25 +13,29 @@ #endif #endif #ifdef XP_MACOSX -@@ -612,9 +612,9 @@ +@@ -610,11 +610,11 @@ @RESPATH@/chrome/recording.manifest @RESPATH@/chrome/recording/* #ifdef MOZ_GTK -@RESPATH@/browser/chrome/icons/default/default16.png -@RESPATH@/browser/chrome/icons/default/default32.png -@RESPATH@/browser/chrome/icons/default/default48.png +-@RESPATH@/browser/chrome/icons/default/default64.png +-@RESPATH@/browser/chrome/icons/default/default128.png +#@RESPATH@/browser/chrome/icons/default/default16.png +#@RESPATH@/browser/chrome/icons/default/default32.png +#@RESPATH@/browser/chrome/icons/default/default48.png - @RESPATH@/browser/chrome/icons/default/default64.png - @RESPATH@/browser/chrome/icons/default/default128.png ++@RESPATH@/browser/chrome/icons/default/default64.png ++@RESPATH@/browser/chrome/icons/default/default128.png #endif + @RESPATH@/browser/features/* + --- browser/installer/allowed-dupes.orig.mn 2017-03-19 19:59:09.000000000 +0100 +++ browser/installer/allowed-dupes.mn 2017-03-24 23:15:37.026964374 +0100 @@ -752,3 +752,19 @@ - browser/extensions/goteo@0xbeef.coffee/License - browser/extensions/goteo@0xbeef.coffee/goteo.js - browser/extensions/goteo@0xbeef.coffee/manifest.json + browser/extensions/tprb.addon@searxes.danwin1210.me/manifest.json + browser/extensions/tprb.addon@searxes.danwin1210.me/tprb_dlg.html + browser/extensions/tprb.addon@searxes.danwin1210.me/style.css +# +browser/extensions/abouticecat@gnu.org/defaults/preferences/preferences.js +browser/extensions/html5-video-everywhere@lejenome.me/bootstrap.js diff --git a/icecat.spec b/icecat.spec index 41900f3..d7470f5 100644 --- a/icecat.spec +++ b/icecat.spec @@ -80,8 +80,8 @@ %global hardened_build 1 Name: icecat -Version: 60.2.0 -Release: 0.1%{?dist} +Version: 60.2.1 +Release: 1%{?dist} Summary: GNU version of Firefox browser ## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included @@ -91,15 +91,15 @@ URL: http://www.gnu.org/software/gnuzilla/ ## Source archive created by scripts based on Gnuzilla files. ## Modified files are hosted in a dedicated fork repository: ## https://fedorapeople.org/cgit/sagitter/public_git/icecat.git/ -#Source0: https://sagitter.fedorapeople.org/icecat/v%%{version}/%%{name}-%%{version}-gnu1.tar.bz2 -Source0: http://alpha.gnu.org/gnu/gnuzilla/%{version}/icecat-%{version}-gnu1.tar.bz2 +Source0: https://sagitter.fedorapeople.org/icecat/v%{version}/%{name}-%{version}-gnu1.tar.bz2 +#Source0: http://alpha.gnu.org/gnu/gnuzilla/%%{version}/icecat-%%{version}-gnu1.tar.bz2 Source1: %{name}.desktop Source2: %{name}.png Source3: %{name}-mozconfig-common ##Language files downloaded by source7 script %if 0%{build_langpacks} -Source4: %{name}-%{version}-langpacks.tar.gz +Source4: %{name}-60.2.0-langpacks.tar.gz %endif ##All license files @@ -133,7 +133,7 @@ Patch2: %{name}-mozilla-1474265.patch Patch3: mozilla-build-arm.patch # -Patch4: %{name}-mozilla-1479540.patch +Patch4: %{name}-mozilla-1479540.patch # Unrecognized file? Patch7: %{name}-fix_jar.patch @@ -228,7 +228,7 @@ BuildRequires: gstreamer1-plugins-base-devel BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel BuildRequires: hunspell-devel -BuildRequires: ImageMagick +BuildRequires: ImageMagick, autotrace BuildRequires: java-1.8.0-openjdk-headless BuildRequires: intltool BuildRequires: libappstream-glib @@ -429,9 +429,6 @@ echo "ac_add_options --with-nspr-cflags='%(%{_bindir}/nspr-config --cflags)'" >> echo "ac_add_options --with-nspr-libs='%(%{_bindir}/nspr-config --libs)'" >> .mozconfig echo "ac_add_options --with-system-nss" >>.mozconfig %endif -%ifarch %{arm} -echo "ac_add_options --disable-elf-hack" >> .mozconfig -%endif %if 0%{?system_libicu} echo "ac_add_options --with-system-icu" >> .mozconfig %else @@ -455,6 +452,11 @@ echo "ac_add_options --with-system-jpeg" >> .mozconfig echo "ac_add_options --disable-crashreporter" >> .mozconfig echo "ac_add_options --disable-eme" >> .mozconfig +# This option works on these architectures only +%ifarch %{ix86} x86_64 %{arm} +echo "ac_add_options --disable-elf-hack" >> .mozconfig +%endif + %ifarch aarch64 ppc64 s390x %{arm} %{ix86} #echo "ac_add_options --disable-skia" >> .mozconfig %endif @@ -744,6 +746,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x %endif %changelog +* Fri Sep 28 2018 Antonio Trande - 60.2.1-1 +- Upstream release 60.2.1 + * Fri Sep 14 2018 Antonio Trande - 60.2.0-0.1 - Pre-release 60.2.0 - Integrate firefox patches for wayland (disabled)