update to 43.0.4 [release 43.0.4-1mamba;Wed Jan 20 2016]

This commit is contained in:
Silvan Calarco 2024-01-05 22:19:08 +01:00
parent 6d3a8fd601
commit 1bf1e26842
3 changed files with 72 additions and 18 deletions

View File

@ -0,0 +1,35 @@
From bb146548c7846ba5d14f070f4be985797d83d5ca Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 14 Aug 2015 08:50:38 +0900
Subject: [PATCH] Bug 1194520 - Add a system header wrapper for
<freetype/ftfntfmt.h>
---
config/system-headers | 1 +
1 file changed, 1 insertion(+)
diff --git a/config/system-headers b/config/system-headers
index bee35da..ad1f88d 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -450,16 +450,17 @@ foundation/base64.h
foundation/hexdump.h
#endif
fp.h
fpieee.h
frame/log.h
frame/req.h
freetype/freetype.h
freetype/ftcache.h
+freetype/ftfntfmt.h
freetype/ftglyph.h
freetype/ftsynth.h
freetype/ftoutln.h
freetype/ttnameid.h
freetype/tttables.h
freetype/t1tables.h
freetype/ftlcdfil.h
freetype/ftsizes.h
--
2.5.0.3.ge81d485

View File

@ -0,0 +1,10 @@
--- firefox-43.0.4/dom/media/webm/WebMDemuxer.cpp.orig 2016-01-23 01:35:10.445510475 +0100
+++ firefox-43.0.4/dom/media/webm/WebMDemuxer.cpp 2016-01-23 01:32:15.429882900 +0100
@@ -19,6 +19,7 @@
#include "XiphExtradata.h"
#include <algorithm>
+#include "prprf.h"
#include <stdint.h>
#define VPX_DONT_DEFINE_STDINT_TYPES

View File

@ -12,10 +12,10 @@
%define firefoxincludedir %{_includedir}/firefox-%{version} %define firefoxincludedir %{_includedir}/firefox-%{version}
#%define mozilla_version central #%define mozilla_version central
%define mozilla_version release %define mozilla_version release
%define source_dir mozilla-%{mozilla_version} #% define source_dir mozilla-%{mozilla_version}
Name: firefox Name: firefox
Version: 39.0.3 Version: 43.0.4
Release: 1mamba Release: 1mamba
Epoch: 1 Epoch: 1
Summary: The next generation browsing technology from mozilla.org Summary: The next generation browsing technology from mozilla.org
@ -24,7 +24,7 @@ Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Aleph0 <aleph0@openmamba.org> Packager: Aleph0 <aleph0@openmamba.org>
URL: http://www.mozilla.org/firefox URL: http://www.mozilla.org/firefox
Source0: https://ftp.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2 Source0: https://ftp.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz
# langpack got with # langpack got with
# sh firefox-autoupdate %{version} # sh firefox-autoupdate %{version}
Source1: firefox-%{version}-langpacks.tar.bz2 Source1: firefox-%{version}-langpacks.tar.bz2
@ -45,6 +45,8 @@ Patch5: xulrunner-2.0-os2cc.patch
Patch6: firefox-7.0-cache-build.patch Patch6: firefox-7.0-cache-build.patch
Patch7: firefox-36.0.3-fix-build-upstream.patch Patch7: firefox-36.0.3-fix-build-upstream.patch
Patch8: firefox-39.0-openmamba-prefs.patch Patch8: firefox-39.0-openmamba-prefs.patch
Patch9: firefox-42.0-build-add-freetype-system-wrapper.patch
Patch10: firefox-43.0.4-fix-missing-PR_snprint.patch
License: GPL, LGPL, MPL 1.1 License: GPL, LGPL, MPL 1.1
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -128,10 +130,10 @@ Mofilla Firefox is the next generation browsing technology from mozilla.org.
This package contains static libraries and header files need for development. This package contains static libraries and header files need for development.
%prep %prep
%setup -q -c -n firefox-%{version} %setup -q
#-D -T #-D -T
#:<< ___EOF #:<< ___EOF
cd %{source_dir} #cd %{source_dir}
# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297 # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297
#%if "%{_target_cpu}" != "i586" #%if "%{_target_cpu}" != "i586"
@ -149,7 +151,8 @@ sed -e 's|__RPM_VERSION_INTERNAL__|%{firefox_internal_version}|' %{PATCH0} | pat
#%patch6 -p2 #%patch6 -p2
#%patch7 -p1 #%patch7 -p1
%patch8 -p1 %patch8 -p1
#%patch9 -p1
#%patch10 -p1
#% define _use_internal_dependency_generator 0 #% define _use_internal_dependency_generator 0
#% define __find_provides %{_builddir}/firefox-%{version}/%{source_dir}/find_provides.sh #% define __find_provides %{_builddir}/firefox-%{version}/%{source_dir}/find_provides.sh
# #
@ -176,13 +179,13 @@ sed -e 's|__RPM_VERSION_INTERNAL__|%{firefox_internal_version}|' %{PATCH0} | pat
#:<< ___EOF #:<< ___EOF
mkdir -p build mkdir -p build
cd build cd build
ln -sf ../%{source_dir}/configure configure ln -sf ../configure configure
export LDFLAGS='-lX11 -lXrender' PYTHON=%{__python} export LDFLAGS='-lX11 -lXrender' PYTHON=%{__python}
export MOZ_PHOENIX="1" export MOZ_PHOENIX="1"
export BUILD_OFFICIAL="1" export BUILD_OFFICIAL="1"
export MOZILLA_OFFICIAL="1" export MOZILLA_OFFICIAL="1"
../%{source_dir}/configure \ ../configure \
--build=%{_build} \ --build=%{_build} \
--host=%{_host} \ --host=%{_host} \
--target=%{_target_platform} \ --target=%{_target_platform} \
@ -235,7 +238,6 @@ export MOZILLA_OFFICIAL="1"
--disable-pedantic \ --disable-pedantic \
--enable-jsd \ --enable-jsd \
--enable-necko-protocols=all \ --enable-necko-protocols=all \
--disable-logging \
%if %{testing} %if %{testing}
--enable-image-decoders=all \ --enable-image-decoders=all \
--enable-image-encoders=all \ --enable-image-encoders=all \
@ -249,7 +251,7 @@ export MOZILLA_OFFICIAL="1"
--enable-gio \ --enable-gio \
--disable-gnomevfs --disable-gnomevfs
# --with-libxul-sdk=%{xul_sdk_dir} \ # --disable-logging \
# --with-system-mozldap \ --program-suffix=4 # --with-system-mozldap \ --program-suffix=4
#___EOF #___EOF
@ -272,7 +274,7 @@ browser.startup.homepage=%{default_browser_homepage}
browser.startup.homepage_reset=%{default_browser_homepage} browser.startup.homepage_reset=%{default_browser_homepage}
EOF EOF
cat > ../mozilla-release/modules/libpref/init/all-openmamba.js << _EOF cat > ../modules/libpref/init/all-openmamba.js << _EOF
pref("app.update.auto", false); pref("app.update.auto", false);
pref("app.update.enabled", false); pref("app.update.enabled", false);
pref("app.update.autoInstallEnabled", false); pref("app.update.autoInstallEnabled", false);
@ -288,7 +290,7 @@ pref("intl.locale.matchOS", true);
_EOF _EOF
sed -i -e 's|@BINPATH@/browser/@PREF_DIR@/firefox.js|@BINPATH@/browser/@PREF_DIR@/all-openmamba.js\n&|' \ sed -i -e 's|@BINPATH@/browser/@PREF_DIR@/firefox.js|@BINPATH@/browser/@PREF_DIR@/all-openmamba.js\n&|' \
../mozilla-release/browser/installer/package-manifest.in ../browser/installer/package-manifest.in
cp -p %{SOURCE10} dist/bin/browser/defaults/profile/bookmarks.html cp -p %{SOURCE10} dist/bin/browser/defaults/profile/bookmarks.html
@ -306,7 +308,7 @@ desktop-file-install --vendor mozilla --dir %{buildroot}%{_datadir}/applications
for i in 16 22 24 32 48 256; do for i in 16 22 24 32 48 256; do
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
convert -geometry ${i}x${i} ../mozilla-release/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 done
#rm -f %{buildroot}%{_bindir}/firefox #rm -f %{buildroot}%{_bindir}/firefox
@ -316,7 +318,7 @@ done
# #
#chmod 755 %{buildroot}%{_bindir}/firefox #chmod 755 %{buildroot}%{_bindir}/firefox
install -pm 644 ../mozilla-release/LICENSE %{buildroot}%{firefoxappdir}/ install -pm 644 ../LICENSE %{buildroot}%{firefoxappdir}/
rm -rf %{buildroot}%{firefoxappdir}/firefox rm -rf %{buildroot}%{firefoxappdir}/firefox
ln -s firefox-bin %{buildroot}%{firefoxappdir}/firefox ln -s firefox-bin %{buildroot}%{firefoxappdir}/firefox
@ -365,7 +367,7 @@ includedir=%{firefoxincludedir}
Name: Mozilla Plug-In API Name: Mozilla Plug-In API
Description: Mozilla Plug-In API Description: Mozilla Plug-In API
Version: 39.0.3 Version: 43.0.4
Cflags: -I\${includedir} -DXP_UNIX Cflags: -I\${includedir} -DXP_UNIX
_EOF _EOF
@ -445,8 +447,8 @@ fi
%exclude %{firefoxappdir}/browser/extensions/langpack-* %exclude %{firefoxappdir}/browser/extensions/langpack-*
%dir %{firefoxappdir}/browser/icons %dir %{firefoxappdir}/browser/icons
%{firefoxappdir}/browser/icons/*.png %{firefoxappdir}/browser/icons/*.png
%dir %{firefoxappdir}/browser/searchplugins #%dir %{firefoxappdir}/browser/searchplugins
%{firefoxappdir}/browser/searchplugins/* #%{firefoxappdir}/browser/searchplugins/*
%{firefoxappdir}/firefox-bin %{firefoxappdir}/firefox-bin
%{firefoxappdir}/webapprt-stub %{firefoxappdir}/webapprt-stub
%dir %{firefoxappdir}/webapprt %dir %{firefoxappdir}/webapprt
@ -480,7 +482,8 @@ fi
%{_libdir}/firefox-*/gmp-clearkey/0.1/* %{_libdir}/firefox-*/gmp-clearkey/0.1/*
%{_libdir}/firefox-*/Throbber-small.gif %{_libdir}/firefox-*/Throbber-small.gif
%{_libdir}/firefox-*/icons/updater.png %{_libdir}/firefox-*/icons/updater.png
%{_libdir}/firefox-*/libmozalloc.so #%{_libdir}/firefox-*/libmozalloc.so
%{_libdir}/firefox-*/liblgpllibs.so
%{_libdir}/firefox-*/libmozsqlite3.so %{_libdir}/firefox-*/libmozsqlite3.so
%{_libdir}/firefox-*/libxul.so %{_libdir}/firefox-*/libxul.so
%{_libdir}/firefox-*/omni.ja %{_libdir}/firefox-*/omni.ja
@ -1722,6 +1725,12 @@ Zulu language support for Firefox.
#%{firefoxappdir}/browser/extensions/langpack-zu@firefox.mozilla.org/ #%{firefoxappdir}/browser/extensions/langpack-zu@firefox.mozilla.org/
%changelog %changelog
* Wed Jan 20 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 43.0.4-1mamba
- update to 43.0.4
* Sat Oct 10 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 41.0.1-1mamba
- update to 41.0.1
* Fri Aug 07 2015 Automatic Build System <autodist@mambasoft.it> 39.0.3-1mamba * Fri Aug 07 2015 Automatic Build System <autodist@mambasoft.it> 39.0.3-1mamba
- automatic version update by autodist - automatic version update by autodist