[icecat] Update to 31.2.0
Antonio Trande
sagitter at fedoraproject.org
Tue Oct 21 23:39:56 UTC 2014
commit f6527eaa1ecf17944635b234e380f5da5ddfe3d5
Author: sagitter <anto.trande at gmail.com>
Date: Wed Oct 22 01:39:31 2014 +0200
Update to 31.2.0
.gitignore | 2 +
icecat-browser_mozconfig | 92 -------------------------
icecat-mozconfig-common | 56 ++++++++++++++++
icecat-xulrunner_mozconfig | 92 -------------------------
icecat.1 | 6 +-
icecat.spec | 158 ++++++++++++++++++++++----------------------
sources | 4 +-
7 files changed, 142 insertions(+), 268 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a9312ba..de126f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
/icecat-langpacks.tar.gz
/icecat-31.1.1.tar.xz
/icecat31-langpacks.tar.gz
+/icecat-31.2.0-langpacks.tar.gz
+/icecat-31.2.0.tar.xz
diff --git a/icecat-mozconfig-common b/icecat-mozconfig-common
new file mode 100644
index 0000000..2d04f8a
--- /dev/null
+++ b/icecat-mozconfig-common
@@ -0,0 +1,56 @@
+ac_add_options --enable-application=xulrunner
+ac_add_options --enable-application=browser
+
+ac_add_options --disable-necko-wifi
+ac_add_options --disable-webspeech
+ac_add_options --disable-webrtc
+ac_add_options --disable-debug-symbols
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-nss-prefix=/usr/bin
+ac_add_options --with-system-nss-exec-prefix=/usr/bin
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-libevent
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-ffi
+ac_add_options --disable-jsd
+ac_add_options --disable-gczeal
+ac_add_options --disable-js-diagnostics
+ac_add_options --with-system-icu
+ac_add_options --without-intl-api
+ac_add_options --disable-ipdl-tests
+ac_add_options --disable-accessibility
+ac_add_options --disable-crashreporter
+ac_add_options --disable-debug
+ac_add_options --disable-elf-hack
+ac_add_options --disable-official-branding
+ac_add_options --enable-system-cairo
+ac_add_options --disable-tests
+ac_add_options --enable-skia
+ac_add_options --disable-updater
+ac_add_options --disable-websms-backend
+ac_add_options --enable-webm
+ac_add_options --enable-ogg
+ac_add_options --enable-opus
+ac_add_options --disable-ffmpeg
+ac_add_options --enable-media-plugins
+ac_add_options --enable-png-arm-neon-support=check
+ac_add_options --disable-compile-environment
+ac_add_options --enable-libjpeg-turbo
+ac_add_options --enable-shared-js
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-extensions=default
+ac_add_options --enable-strip
+ac_add_options --enable-install-strip
+ac_add_options --enable-toolkit-cairo-gtk2
+ac_add_options --enable-printing
+ac_add_options --enable-gstreamer
+ac_add_options --enable-pulseaudio
+ac_add_options --with-pthreads
+ac_add_options --with-distribution-id=org.gnu.gnuzilla
+ac_add_options --with-user-appdir=.mozilla
+ac_add_options --with-app-basename=icecat
diff --git a/icecat.1 b/icecat.1
index 910ac7b..4f41fa1 100644
--- a/icecat.1
+++ b/icecat.1
@@ -92,16 +92,16 @@ Record drawing for a given URL.
.HP
\fB\-setDefaultBrowser\fR Set this app as the default browser.
.PP
-Mozilla IceCat 31.1.1
+Mozilla IceCat 31.2.0
.SH FILES
/usr/bin/icecat - icecat executable
-/usr/lib/icecat-31.1.1/icecat-bin - icecat executable
+/usr/lib/icecat-31.2.0/icecat-bin - icecat executable
.SH BUGS
To report a bug, please mail to bug-gnuzilla at gnu.org
.SH VERSION
-31.1.1
+31.2.0
.SH AUTHORS
For a full list of the people who are credited with making a contribution to Mozilla, see http://www.mozilla.org/credits/ .
.SH "SEE ALSO"
diff --git a/icecat.spec b/icecat.spec
index 4521ab6..5eef46c 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -10,7 +10,7 @@
%global langpackdir %{icecatappdir}/langpacks
Name: icecat
-Version: 31.1.1
+Version: 31.2.0
Release: 1%{?dist}
Summary: GNU version of Firefox browser
Group: Applications/Internet
@@ -18,25 +18,25 @@ Group: Applications/Internet
## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
License: (MPLv1.1 or GPLv2+ or LGPLv2+) and GPLv3+ and GPLv2+ and Public Domain and MIT and BSD and ISC and ASL 2.0
URL: http://www.gnu.org/software/gnuzilla/
-Source0: http://gnuzilla.gnu.org/releases/%{version}/%{name}-%{version}.tar.xz
+Source0: http://ftp.gnu.org/gnu/gnuzilla/%{version}/%{name}-%{version}.tar.xz
Source1: %{name}.desktop
Source2: %{name}.png
-Source3: %{name}-browser_mozconfig
-Source4: %{name}-xulrunner_mozconfig
+Source3: %{name}-mozconfig-common
##Language files downloaded from http://gnuzilla.gnu.org/releases/31.1.1/langpacks/
-Source5: %{name}31-langpacks.tar.gz
+Source4: %{name}-%{version}-langpacks.tar.gz
##All license files
##Download from http://www.gnu.org/licenses
##Download from http://www.mozilla.org/MPL/1.1/index.txt
-Source6: %{name}-COPYING-licensefiles.tar.gz
+Source5: %{name}-COPYING-licensefiles.tar.gz
##manpage file
-Source7: %{name}.1
+Source6: %{name}.1
##Fix freetype2 reference in gfx/thebes and config/system-headers
Patch0: %{name}-freetype-reference.patch
+Patch3: %{name}-freetype2-headers.patch
##Using system Python Virtualenv
Patch1: %{name}-virtualenv.patch
@@ -44,14 +44,12 @@ Patch1: %{name}-virtualenv.patch
##Prevent HTTPS-everywhere's installation
Patch2: %{name}-noHTTP-RP.patch
-Patch3: %{name}-freetype2-headers.patch
-
##Bug https://bugzilla.mozilla.org/show_bug.cgi?id=999496
Patch4: %{name}-AudioQueueMemoryFunctor_for_GCC49.patch
BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
-#BuildRequires: cairo-devel
+BuildRequires: cairo-devel
BuildRequires: dbus-devel
BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
@@ -68,7 +66,7 @@ BuildRequires: ImageMagick
BuildRequires: java-1.8.0-openjdk-headless
BuildRequires: intltool
BuildRequires: libevent-devel
-#BuildRequires: libicu-devel
+BuildRequires: libicu-devel
BuildRequires: libIDL-devel
BuildRequires: libX11-devel
BuildRequires: libXt-devel
@@ -79,10 +77,10 @@ BuildRequires: libffi-devel
BuildRequires: libnotify-devel
BuildRequires: libpng-devel
BuildRequires: libzip-devel
-#BuildRequires: nspr-devel
-#BuildRequires: nss-devel
-#BuildRequires: nss-util-devel, nss-tools
-#BuildRequires: openjpeg-devel, libjpeg-turbo-devel
+BuildRequires: nspr-devel
+BuildRequires: nss-devel, nss-static
+BuildRequires: nss-util-devel, nss-tools
+BuildRequires: openjpeg-devel, libjpeg-turbo-devel
BuildRequires: pango-devel
BuildRequires: python2-devel
BuildRequires: python-blessings
@@ -99,8 +97,10 @@ BuildRequires: yasm-devel
Requires: fedora-bookmarks
Requires: mozilla-filesystem
-#Requires: nspr
-#Requires: nss
+Requires: nspr
+Requires: nss
+Requires: sqlite
+
Provides: webclient
## FPC ticket https://fedorahosted.org/fpc/ticket/391
@@ -108,17 +108,12 @@ Provides: webclient
Provides: bundled(libtheora) = 1.2.0
Provides: bundled(libvorbis) = 1.3.4
Provides: bundled(libogg) = 1.3.0
-Provides: bundled(libjpeg) = 1.3.1
Provides: bundled(opus) = 1.1
-Provides: bundled(xulrunner) = 31.1
+Provides: bundled(xulrunner) = 31.0
Provides: bundled(ots) = 0.5.0
Provides: bundled(snappy) = 1.0.4
-Provides: bundled(libicu) = 52.1
-Provides: bundled(nss) = 3.16.2
-Provides: bundled(nspr) = 4.10.6
Provides: bundled(graphite2) = 1.2.4
Provides: bundled(harfbuzz) = 0.9.2
-Provides: bundled(cairo) = 1.9.5
Provides: bundled(libmkv) = 1.3.0
Provides: bundled(double-conversion) = 2.0.0
@@ -165,7 +160,7 @@ chmod a-x $i
done
##Copy license files
-tar -xf %{SOURCE6}
+tar -xf %{SOURCE5}
%patch0 -p0
%patch1 -p0
@@ -177,69 +172,56 @@ tar -xf %{SOURCE6}
%endif
##Remove default configuration and copy the customized one
-rm -f browser/config/mozconfig
-cp -p %{SOURCE3} browser/config/mozconfig
-
-rm -f xulrunner/config/mozconfig
-cp -p %{SOURCE4} xulrunner/config/mozconfig
+cp -p %{SOURCE3} mozconfig-common
##Options for ARM
%ifarch armv7hl
-echo "ac_add_options --with-arch=armv7-a" >> xulrunner/config/mozconfig
-echo "ac_add_options --with-float-abi=hard" >> xulrunner/config/mozconfig
-echo "ac_add_options --with-fpu=vfpv3-d16" >> xulrunner/config/mozconfig
-echo "ac_add_options --disable-elf-hack" >> xulrunner/config/mozconfig
-echo "ac_add_options --disable-debug-symbols" >> xulrunner/config/mozconfig
-echo "ac_add_options --with-arch=armv7-a" >> browser/config/mozconfig
-echo "ac_add_options --with-float-abi=hard" >> browser/config/mozconfig
-echo "ac_add_options --with-fpu=vfpv3-d16" >> browser/config/mozconfig
-echo "ac_add_options --disable-elf-hack" >> browser/config/mozconfig
-echo "ac_add_options --disable-debug-symbols" >> browser/config/mozconfig
+echo "ac_add_options --with-arch=armv7-a" >> mozconfig-common
+echo "ac_add_options --with-float-abi=hard" >> mozconfig-common
+echo "ac_add_options --with-fpu=vfpv3-d16" >> mozconfig-common
+echo "ac_add_options --disable-elf-hack" >> mozconfig-common
+echo "ac_add_options --disable-debug-symbols" >> mozconfig-common
%endif
%ifarch armv7hnl
-echo "ac_add_options --with-arch=armv7-a" >> xulrunner/config/mozconfig
-echo "ac_add_options --with-float-abi=hard" >> xulrunner/config/mozconfig
-echo "ac_add_options --with-fpu=neon" >> xulrunner/config/mozconfig
-echo "ac_add_options --disable-elf-hack" >> xulrunner/config/mozconfig
-echo "ac_add_options --disable-debug-symbols" >> xulrunner/config/mozconfig
-echo "ac_add_options --with-arch=armv7-a" >> browser/config/mozconfig
-echo "ac_add_options --with-float-abi=hard" >> browser/config/mozconfig
-echo "ac_add_options --with-fpu=neon" >> browser/config/mozconfig
-echo "ac_add_options --disable-elf-hack" >> browser/config/mozconfig
-echo "ac_add_options --disable-debug-symbols" >> browser/config/mozconfig
+echo "ac_add_options --with-arch=armv7-a" >> mozconfig-common
+echo "ac_add_options --with-float-abi=hard" >> mozconfig-common
+echo "ac_add_options --with-fpu=neon" >> mozconfig-common
+echo "ac_add_options --disable-elf-hack" >> mozconfig-common
+echo "ac_add_options --disable-debug-symbols" >> mozconfig-common
%endif
%ifarch armv5tel
-echo "ac_add_options --with-arch=armv5te" >> xulrunner/config/mozconfig
-echo "ac_add_options --with-float-abi=soft" >> xulrunner/config/mozconfig
-echo "ac_add_options --disable-elf-hack" >> xulrunner/config/mozconfig
-echo "ac_add_options --disable-debug-symbols" >> xulrunner/config/mozconfig
-echo "ac_add_options --with-arch=armv5te" >> browser/config/mozconfig
-echo "ac_add_options --with-float-abi=soft" >> browser/config/mozconfig
-echo "ac_add_options --disable-elf-hack" >> browser/config/mozconfig
-echo "ac_add_options --disable-debug-symbols" >> browser/config/mozconfig
+echo "ac_add_options --with-arch=armv5te" >> mozconfig-common
+echo "ac_add_options --with-float-abi=soft" >> mozconfig-common
+echo "ac_add_options --disable-elf-hack" >> mozconfig-common
+echo "ac_add_options --disable-debug-symbols" >> mozconfig-common
%endif
%ifnarch %{ix86} x86_64 armv7hl armv7hnl
-echo "ac_add_options --disable-methodjit" >> xulrunner/config/mozconfig
-echo "ac_add_options --disable-monoic" >> xulrunner/config/mozconfig
-echo "ac_add_options --disable-polyic" >> xulrunner/config/mozconfig
-echo "ac_add_options --disable-tracejit" >> xulrunner/config/mozconfig
-echo "ac_add_options --disable-methodjit" >> browser/config/mozconfig
-echo "ac_add_options --disable-monoic" >> browser/config/mozconfig
-echo "ac_add_options --disable-polyic" >> browser/config/mozconfig
-echo "ac_add_options --disable-tracejit" >> browser/config/mozconfig
+echo "ac_add_options --disable-methodjit" >> mozconfig-common
+echo "ac_add_options --disable-monoic" >> mozconfig-common
+echo "ac_add_options --disable-polyic" >> mozconfig-common
+echo "ac_add_options --disable-tracejit" >> mozconfig-common
%endif
%ifarch %{arm}
-echo "ac_add_options --enable-png-arm-neon-support=check" >> xulrunner/config/mozconfig
-echo "ac_add_options --enable-png-arm-neon-support=check" >> browser/config/mozconfig
+echo "ac_add_options --enable-png-arm-neon-support=check" >> mozconfig-common
%endif
%build
##
-##Required by compilation "error STL code can only be used with -fno-exceptions"
-MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-fexceptions/-fno-exceptions/')
+MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | sed -e 's/-Wall//')
+#rhbz#1037063
+# -Werror=format-security causes build failures when -Wno-format is explicitly given
+# for some sources
+MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security"
+
+%ifarch aarch64
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+%endif
+export CFLAGS=$MOZ_OPT_FLAGS
+export CXXFLAGS=$MOZ_OPT_FLAGS
+export LDFLAGS=$MOZ_LINK_FLAGS
mkdir -p %{name}-objdir && cd %{name}-objdir
../configure --prefix=%{_prefix} \
@@ -247,7 +229,25 @@ mkdir -p %{name}-objdir && cd %{name}-objdir
--includedir=%{_includedir} \
--datadir=%{_datadir} \
--mandir=%{_mandir} \
- --enable-optimize="$MOZ_OPT_FLAGS -fPIC"
+ --enable-optimize="$MOZ_OPT_FLAGS -fPIC"\
+ --with-system-nspr \
+ --with-system-nss \
+ --with-system-nspr-prefix=%{_bindir} \
+ --with-system-nspr-exec-prefix=%{_bindir} \
+ --with-system-nss-prefix=%{_bindir} \
+ --with-system-nss-exec-prefix=%{_bindir} \
+ --with-system-icu \
+ --enable-system-ffi \
+ --enable-system-cairo \
+ --with-system-libvpx \
+ --enable-system-hunspell \
+ --enable-system-pixman \
+ --enable-system-sqlite \
+ --with-system-jpeg \
+ --with-system-zlib \
+ --with-system-bz2 \
+ --with-system-libevent \
+ --disable-tests
MOZ_SMP_FLAGS=-j1
# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
@@ -260,7 +260,7 @@ MOZ_SMP_FLAGS=-j1
[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
%endif
-export LDFLAGS="%{__global_ldflags}"
+export MOZCONFIG=mozconfig-common
make MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
%install
@@ -278,14 +278,14 @@ install -p -D %{SOURCE1} \
##Install man page
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1
# Extract langpacks, make any mods needed, repack the langpack, and install it.
%if %{build_langpacks}
echo > %{name}.lang
mkdir -p $RPM_BUILD_ROOT%{langpackdir}
-tar xf %{SOURCE5}
- for langpack in `ls gnuzilla.gnu.org/releases/%{version}/langpacks/*.xpi`; do
+tar xf %{SOURCE4}
+ for langpack in `ls ftp.gnu.org/gnu/gnuzilla/%{version}/langpacks/*.xpi`; do
language=`basename $langpack .xpi`
extensionID=langpack-$language at icecat.gnuzilla.org
mkdir -p $extensionID
@@ -314,11 +314,6 @@ echo "%%lang($language_short) %{langpackdir}/langpack-$language_short at icecat.gnu
%endif # build_langpacks
##Same files symlinked
-ln -sf %{_libdir}/%{icecat_ver}/libsmime3.so $RPM_BUILD_ROOT%{_libdir}/%{icecat_devel}/sdk/lib/libsmime3.so
-ln -sf %{_libdir}/%{icecat_ver}/libnssutil3.so $RPM_BUILD_ROOT%{_libdir}/%{icecat_devel}/sdk/lib/libnssutil3.so
-ln -sf %{_libdir}/%{icecat_ver}/libplc4.so $RPM_BUILD_ROOT%{_libdir}/%{icecat_devel}/sdk/lib/libplc4.so
-ln -sf %{_libdir}/%{icecat_ver}/libplds4.so $RPM_BUILD_ROOT%{_libdir}/%{icecat_devel}/sdk/lib/libplds4.so
-ln -sf %{_libdir}/%{icecat_ver}/libssl3.so $RPM_BUILD_ROOT%{_libdir}/%{icecat_devel}/sdk/lib/libssl3.so
ln -sf %{_libdir}/%{icecat_ver}/libmozalloc.so $RPM_BUILD_ROOT%{_libdir}/%{icecat_devel}/sdk/lib/libmozalloc.so
ln -sf %{_libdir}/%{icecat_ver}/libxul.so $RPM_BUILD_ROOT%{_libdir}/%{icecat_devel}/sdk/lib/libxul.so
@@ -359,6 +354,11 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{icecat_ver}.desk
%{_includedir}/%{icecat_ver}/
%changelog
+* Tue Oct 21 2014 Antonio Trande <sagitterATfedoraproject.org> - 31.2.0-1
+- Update to 31.2.0
+- Added 'configure' options
+- Built against system NSS/NSPR
+
* Thu Oct 16 2014 Antonio Trande <sagitterATfedoraproject.org> - 31.1.1-1
- Update to 31.1.1
- New bundled files (bz#1153135)
diff --git a/sources b/sources
index c731143..f14aa31 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-d41fbcd830e8193aa90a5505387b3aeb icecat-31.1.1.tar.xz
+dc15506a8d3d4e3eabfde10cba21f94b icecat-31.2.0-langpacks.tar.gz
+52f310b515cf185636e889d55f9d615d icecat-31.2.0.tar.xz
cb202776a8a7be4689dda99a101503e2 icecat-COPYING-licensefiles.tar.gz
-6c14420c12a07183ad1420b760c29f24 icecat31-langpacks.tar.gz
More information about the scm-commits
mailing list