The package rpms/icecat.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/icecat.git/commit/?id=365f306ca5cec7... https://src.fedoraproject.org/cgit/rpms/icecat.git/commit/?id=2a63573f46c9d8....
Change: +%ifarch %{arm} %{ix86} +%ifarch %{arm}
Thanks.
Full change: ============
commit a0ff91c47931399cef1d40064611cf824f1b67cf Author: sagitter sagitter@fedoraproject.org Date: Tue Mar 19 15:55:11 2019 +0100
Mozilla release 60.6.0
diff --git a/.gitignore b/.gitignore index 0b2d2f9..42e32d5 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,5 @@ /icecat-60.5.0-gnu1.tar.bz2 /icecat-60.5.1-gnu1.tar.bz2 /icecat-60.5.2-gnu1.tar.bz2 +/icecat-60.6.0-gnu1.tar.bz2 +/icecat-60.6.0-langpacks.tar.gz diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh index 6319089..1d3aa9d 100755 --- a/icecat-lang_download.sh +++ b/icecat-lang_download.sh @@ -1,18 +1,22 @@ #!/bin/bash
-VERSION=60.2.0 -URL=http://alpha.gnu.org/gnu/gnuzilla/$VERSION/langpacks/ +VERSION=60.6.0 +URL=https://ftp.mozilla.org/pub/firefox/releases/$%7BVERSION%7Desr/linux-x86_64/...
for u in $URL; do -mkdir -p langpacks && cd langpacks -wget -erobots=off -c -r -l1 -nd -nc -A.xpi -U langpacks $u -rm -f icecat-$VERSION.ja-JP-mac.langpack.xpi icecat-$VERSION.compare-locales.langpack.xpi + mkdir -p langpacks && pushd langpacks + wget -erobots=off -c -r -l1 -nd -nc -A.xpi -U langpacks $u +popd +done +pushd langpacks +for u in `ls *.xpi`; do + mv $u icecat-${VERSION}.$u done find . -type f -name '*.xpi' | while read FILE ; do - newfile="$(echo ${FILE} |sed -e 's/60.2.0.//g' -e 's/icecat-//g')" ; + newfile="$(echo ${FILE} |sed -e 's/.xpi/.langpack.xpi/g')" ; mv "${FILE}" "${newfile}" ; done -cd .. -tar -zcvf icecat-$VERSION-langpacks.tar.gz langpacks +popd +tar -zcvf icecat-${VERSION}-langpacks.tar.gz langpacks rm -rf langpacks exit 0 diff --git a/icecat.spec b/icecat.spec index c7ad70d..e35f010 100644 --- a/icecat.spec +++ b/icecat.spec @@ -11,7 +11,7 @@ #
##Active/Deactive language files handling -%global build_langpacks 0 +%global build_langpacks 1
%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
@@ -80,7 +80,7 @@ %global hardened_build 1
Name: icecat -Version: 60.5.2 +Version: 60.6.0 Release: 1%{?dist} Summary: GNU version of Firefox browser
@@ -92,7 +92,6 @@ URL: http://www.gnu.org/software/gnuzilla/ ## 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%%7Bversion%7D/%%7Bname%7D-%%7Bver... -#Source0: http://alpha.gnu.org/gnu/gnuzilla/%%%7Bversion%7D/icecat-%%%7Bversion%7D-gnu...
Source2: %{name}.png Source3: %{name}-mozconfig-common @@ -738,6 +737,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x %endif
%changelog +* Tue Mar 19 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.6.0-1 +- Mozilla release 60.6.0 +- Enable languages + * Sun Mar 03 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.5.2-1 - Mozilla release 60.5.2 - Disable Werror-format-security flags diff --git a/sources b/sources index dec668d..95e7be1 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -SHA512 (icecat-60.5.2-gnu1.tar.bz2) = c4c12506f2f270d9e3bcc2007870583cac9e23219c7e0524e90aafde414ec7d4b61fe397d268d35ad480f9217316cae0e83e8c1a8179dbb8184da4131700594a +SHA512 (icecat-60.6.0-gnu1.tar.bz2) = a31ee52e0f8c69542a141fa432411f23225d40226f9e976b074cdf9f36b57c48984dfc7cf177d1f12de40c4250161232768e5b673be348623a8b7f5b33819dd3 +SHA512 (icecat-60.6.0-langpacks.tar.gz) = c8949951e3333110c1a0762bd6e9accb15111bb4d7c454d842d99416789e2d74e904f08bcc5a0bd6f255875fe78d80b7d2ab284ea267041edee5d83337af121f SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
commit 2a63573f46c9d8d085cc37721c826a9e308893a0 Author: sagitter sagitter@fedoraproject.org Date: Mon Mar 4 18:07:47 2019 +0100
Fix gold linker flag on ARM
diff --git a/icecat.spec b/icecat.spec index be17988..c7ad70d 100644 --- a/icecat.spec +++ b/icecat.spec @@ -520,23 +520,17 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/' -e 's/-O2/-O1/') # (OOM when linking, rhbz#1238225) export MOZ_DEBUG_FLAGS=" " %endif -%ifarch s390x %{arm} %{power64} aarch64 %{ix86} +%ifarch s390x %{power64} aarch64 %{ix86} MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif +%ifarch %{arm} +MOZ_LINK_FLAGS="-Wl,--no-keep-memory" +%endif %ifarch %{arm} %{ix86} export RUSTFLAGS="-Cdebuginfo=0" %endif export CFLAGS=$MOZ_OPT_FLAGS - -# Add -fpermissive for building on f31: -# In file included from /builddir/build/BUILD/icecat-60.5.2/tools/profiler/core/shared-libraries-linux.cc:17: -# /icecat-60.5.2/tools/profiler/core/platform.h:50:21: error: 'pid_t gettid()' was declared 'extern' and later 'static' [-fpermissive] -%if 0%{?fedora} > 30 -export CXXFLAGS="$MOZ_OPT_FLAGS -fpermissive" -%else export CXXFLAGS="$MOZ_OPT_FLAGS" -%endif - export LDFLAGS=$MOZ_LINK_FLAGS
export PREFIX='%{_prefix}'
commit 39f7d271b43d5b5b5e2e4467648c6e70902e068b Author: sagitter sagitter@fedoraproject.org Date: Mon Mar 4 12:20:35 2019 +0100
Add libevent link patch
diff --git a/icecat-libevent_linkflag.patch b/icecat-libevent_linkflag.patch new file mode 100644 index 0000000..918c7e4 --- /dev/null +++ b/icecat-libevent_linkflag.patch @@ -0,0 +1,20 @@ +--- old-configure.orig.in 2019-03-02 21:49:16.000000000 +0100 ++++ old-configure.in 2019-03-04 12:14:23.842685662 +0100 +@@ -1715,7 +1715,7 @@ + MOZ_SYSTEM_LIBEVENT= + elif test -z "$MOZ_SYSTEM_LIBEVENT"; then + CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS" +- LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS" ++ LDFLAGS="-L${LIBDIR} $LDFLAGS" + MOZ_CHECK_HEADER(event.h, + [if test ! -f "${LIBEVENT_DIR}/include/event.h"; then + AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include]) +@@ -1724,7 +1724,7 @@ + AC_CHECK_LIB(event, event_init, + [MOZ_SYSTEM_LIBEVENT=1 + MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" +- MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], ++ MOZ_LIBEVENT_LIBS="-L${LIBDIR} -levent"], + [MOZ_SYSTEM_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) + fi + CFLAGS=$_SAVE_CFLAGS
commit 1eff813f6802426ae002e8af521dd3d7119f892a Author: sagitter sagitter@fedoraproject.org Date: Mon Mar 4 12:19:30 2019 +0100
Set CXXFLAGS
diff --git a/icecat.spec b/icecat.spec index 681d51a..be17988 100644 --- a/icecat.spec +++ b/icecat.spec @@ -128,6 +128,7 @@ Source15: %{name}-x11.sh.in Source16: %{name}-x11.desktop
# Build patches +Patch2: %{name}-libevent_linkflag.patch Patch3: mozilla-build-arm.patch
# Unrecognized file? @@ -322,6 +323,7 @@ tar -xf %{SOURCE5} ##Prevent HTTPS-everywhere addon's installation sed '/https-everywhere/d' -i ./browser/installer/package-manifest.in
+%patch2 -p0 -b .libevent_linkflag %patch3 -p1 -b .arm %patch7 -p0 %patch8 -p0 @@ -405,7 +407,7 @@ echo "ac_add_options --disable-system-sqlite" >> .mozconfig %endif echo "ac_add_options --with-system-zlib" >> .mozconfig echo "ac_add_options --with-system-bz2" >> .mozconfig -echo "ac_add_options --with-system-libevent=%{_prefix}/../%{_lib}" >> .mozconfig +echo "ac_add_options --with-system-libevent=%{_prefix}" >> .mozconfig echo "ac_add_options --enable-llvm-hacks" >> .mozconfig %if %{?with_vpx} echo "ac_add_options --with-system-libvpx" >> .mozconfig @@ -505,12 +507,6 @@ MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security # Workaround for mozbz#1531309 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//') %endif -# Add -fpermissive for building on f31: -# In file included from /builddir/build/BUILD/icecat-60.5.2/tools/profiler/core/shared-libraries-linux.cc:17: -# /icecat-60.5.2/tools/profiler/core/platform.h:50:21: error: 'pid_t gettid()' was declared 'extern' and later 'static' [-fpermissive] -%if 0%{?fedora} > 30 -MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fpermissive" -%endif # Use hardened build? MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
@@ -531,7 +527,16 @@ MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" export RUSTFLAGS="-Cdebuginfo=0" %endif export CFLAGS=$MOZ_OPT_FLAGS -export CXXFLAGS=$MOZ_OPT_FLAGS + +# Add -fpermissive for building on f31: +# In file included from /builddir/build/BUILD/icecat-60.5.2/tools/profiler/core/shared-libraries-linux.cc:17: +# /icecat-60.5.2/tools/profiler/core/platform.h:50:21: error: 'pid_t gettid()' was declared 'extern' and later 'static' [-fpermissive] +%if 0%{?fedora} > 30 +export CXXFLAGS="$MOZ_OPT_FLAGS -fpermissive" +%else +export CXXFLAGS="$MOZ_OPT_FLAGS" +%endif + export LDFLAGS=$MOZ_LINK_FLAGS
export PREFIX='%{_prefix}'
commit 365f306ca5cec7df3e10292e560d8d81ebf1edc4 Author: sagitter sagitter@fedoraproject.org Date: Mon Mar 4 11:45:38 2019 +0100
Try to fix libevent LD path
diff --git a/icecat.spec b/icecat.spec index d335604..681d51a 100644 --- a/icecat.spec +++ b/icecat.spec @@ -405,7 +405,7 @@ echo "ac_add_options --disable-system-sqlite" >> .mozconfig %endif echo "ac_add_options --with-system-zlib" >> .mozconfig echo "ac_add_options --with-system-bz2" >> .mozconfig -echo "ac_add_options --with-system-libevent=%{_prefix}" >> .mozconfig +echo "ac_add_options --with-system-libevent=%{_prefix}/../%{_lib}" >> .mozconfig echo "ac_add_options --enable-llvm-hacks" >> .mozconfig %if %{?with_vpx} echo "ac_add_options --with-system-libvpx" >> .mozconfig @@ -450,6 +450,9 @@ echo 'ac_add_options --enable-optimize' >> .mozconfig %endif echo "ac_add_options --disable-debug" >> .mozconfig %endif +%ifarch %{arm} +echo "ac_add_options --enable-linker=gold" >> .mozconfig +%endif
echo "ac_add_options --disable-strip" >> .mozconfig echo "ac_add_options --disable-install-strip" >> .mozconfig @@ -521,10 +524,10 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/' -e 's/-O2/-O1/') # (OOM when linking, rhbz#1238225) export MOZ_DEBUG_FLAGS=" " %endif -%ifarch s390x %{arm} %{power64} aarch64 %{arm} %{ix86} +%ifarch s390x %{arm} %{power64} aarch64 %{ix86} MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif -%ifarch %{arm} +%ifarch %{arm} %{ix86} export RUSTFLAGS="-Cdebuginfo=0" %endif export CFLAGS=$MOZ_OPT_FLAGS @@ -739,6 +742,8 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x * Sun Mar 03 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.5.2-1 - Mozilla release 60.5.2 - Disable Werror-format-security flags +- Enable linker=gold on ARM +- Try to fix libevent LD path
* Thu Feb 14 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.5.1-1 - Mozilla release 60.5.1
commit d13ed8c5d3d34ed28e2e497d6663fd87736d5358 Author: sagitter sagitter@fedoraproject.org Date: Sun Mar 3 17:40:46 2019 +0100
Add -fpermissive for building on f31
diff --git a/icecat.spec b/icecat.spec index 4170ec7..d335604 100644 --- a/icecat.spec +++ b/icecat.spec @@ -490,13 +490,6 @@ echo "Generate big endian version of config/external/icu/data/icud58l.dat" # Update the various config.guess to upstream release for aarch64 support find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
-# -fpermissive is needed to build with gcc 4.6+ which has become stricter -# -# Mozilla builds with -Wall with exception of a few warnings which show up -# everywhere in the code; so, don't override that. -# -# Disable C++ exceptions since Mozilla code is not exception-safe -# MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//') #rhbz#1037063 # -Werror=format-security causes build failures when -Wno-format is explicitly given @@ -509,8 +502,12 @@ MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security # Workaround for mozbz#1531309 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//') %endif -# Disable null pointer gcc6 optimization in gcc6 (rhbz#1328045) -MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fno-delete-null-pointer-checks" +# Add -fpermissive for building on f31: +# In file included from /builddir/build/BUILD/icecat-60.5.2/tools/profiler/core/shared-libraries-linux.cc:17: +# /icecat-60.5.2/tools/profiler/core/platform.h:50:21: error: 'pid_t gettid()' was declared 'extern' and later 'static' [-fpermissive] +%if 0%{?fedora} > 30 +MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fpermissive" +%endif # Use hardened build? MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"