[packages/xulrunner] - up to 41.0.2 (the last standalone release)
qboosh
qboosh at pld-linux.org
Fri Apr 29 22:11:16 CEST 2016
commit cea7c13a8a46c373d7923e3108a4c19db9e4a68b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Apr 29 22:11:53 2016 +0200
- up to 41.0.2 (the last standalone release)
system-virtualenv.patch | 2 +-
xulrunner-freetype.patch | 10 ++++++++++
xulrunner.spec | 25 ++++++++++++++++---------
3 files changed, 27 insertions(+), 10 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 606babb..73991b5 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -20,15 +20,15 @@
Summary: XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
Summary(pl.UTF-8): XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
Name: xulrunner
-Version: 39.0.3
+Version: 41.0.2
Release: 1
Epoch: 2
License: MPL v2.0
Group: X11/Applications
# Source tarball for xulrunner is in fact firefox tarball (checked on 1.9), so lets use it
# instead of waiting for mozilla to copy file on ftp.
-Source0: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5: 6ef31cbd34d9905a0648104d916269cb
+Source0: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz
+# Source0-md5: d71f0f761c51aeae03e367001afc9f8d
Patch0: %{name}-new-libxul.patch
Patch1: %{name}-rpath.patch
Patch2: %{name}-paths.patch
@@ -36,6 +36,7 @@ Patch3: %{name}-pc.patch
Patch4: %{name}-prefs.patch
Patch6: idl-parser.patch
Patch7: system-virtualenv.patch
+Patch8: %{name}-freetype.patch
URL: https://developer.mozilla.org/en/XULRunner
BuildRequires: alsa-lib-devel
BuildRequires: automake
@@ -72,7 +73,7 @@ BuildRequires: pkgconfig(libffi) >= 3.0.9
BuildRequires: pulseaudio-devel
BuildRequires: python-modules >= 1:2.5
BuildRequires: python-simplejson
-BuildRequires: python-virtualenv >= 1.9.1-4
+BuildRequires: python-virtualenv >= 15
BuildRequires: readline-devel
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.601
@@ -105,7 +106,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# no Provides from private modules (don't use %{name} here, it expands to each subpackage name...)
%define _noautoprovfiles %{_libdir}/xulrunner/components %{_libdir}/xulrunner/plugins
# no need to require them (we have strict deps for these)
-%define _noautoreq libmozjs.so libxul.so libmozalloc.so
+%define _noautoreq libmozjs.so libxul.so
%description
XULRunner is a Mozilla runtime package that can be used to bootstrap
@@ -179,7 +180,7 @@ DBus i GIO.
%prep
%setup -qc
-mv -f mozilla-release mozilla
+%{__mv} mozilla-release mozilla
cd mozilla
# avoid using included headers (-I. is before HUNSPELL_CFLAGS)
@@ -194,6 +195,7 @@ echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Mak
%patch4 -p1
%patch6 -p2
%patch7 -p2
+%patch8 -p2
%build
if [ "$(grep -E '^[0-9]+\.' mozilla/config/milestone.txt)" != "%{version}" ]; then
@@ -236,7 +238,6 @@ ac_add_options --enable-crash-on-assert
%else
ac_add_options --disable-debug
ac_add_options --disable-debug-modules
-ac_add_options --disable-logging
ac_add_options --enable-optimize="%{rpmcflags} -Os"
%endif
ac_add_options --disable-strip
@@ -252,6 +253,7 @@ ac_add_options --disable-mochitest
ac_add_options --disable-cpp-exceptions
ac_add_options --disable-crashreporter
ac_add_options --disable-elf-dynstr-gc
+ac_add_options --disable-elf-hack
ac_add_options --disable-gconf
ac_add_options --disable-gnomeui
ac_add_options --disable-gnomevfs
@@ -338,7 +340,6 @@ ln -s %{_libdir}/%{name}-devel/sdk/lib $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/l
# replace copies with symlinks
%{?with_shared_js:ln -sf %{_libdir}/%{name}/libmozjs.so $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/lib/libmozjs.so}
ln -sf %{_libdir}/%{name}/libxul.so $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/lib/libxul.so
-ln -sf %{_libdir}/%{name}/libmozalloc.so $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/lib/libmozalloc.so
# temp fix for https://bugzilla.mozilla.org/show_bug.cgi?id=63955
chmod a+rx $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/bin/xpt.py
@@ -405,8 +406,15 @@ fi
%dir %{_libdir}/%{name}/gmp-fake
%dir %{_libdir}/%{name}/gmp-fake/1.0
%{_libdir}/%{name}/gmp-fake/1.0/fake.info
+%{_libdir}/%{name}/gmp-fake/1.0/fake.voucher
%attr(755,root,root) %{_libdir}/%{name}/gmp-fake/1.0/libfake.so
+%dir %{_libdir}/%{name}/gmp-fakeopenh264
+%dir %{_libdir}/%{name}/gmp-fakeopenh264/1.0
+%{_libdir}/%{name}/gmp-fakeopenh264/1.0/fakeopenh264.info
+%{_libdir}/%{name}/gmp-fakeopenh264/1.0/fakeopenh264.voucher
+%attr(755,root,root) %{_libdir}/%{name}/gmp-fakeopenh264/1.0/libfakeopenh264.so
+
%attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so
%{_libdir}/%{name}/components/components.manifest
@@ -422,7 +430,6 @@ fi
%defattr(644,root,root,755)
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/platform.ini
-%attr(755,root,root) %{_libdir}/%{name}/libmozalloc.so
%{?with_shared_js:%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so}
%attr(755,root,root) %{_libdir}/%{name}/libxul.so
%{_libdir}/%{name}/dependentlibs.list
diff --git a/system-virtualenv.patch b/system-virtualenv.patch
index 3650d56..c97400c 100644
--- a/system-virtualenv.patch
+++ b/system-virtualenv.patch
@@ -6,7 +6,7 @@
"""Path to virtualenv's own populator script."""
- return os.path.join(self.topsrcdir, 'python', 'virtualenv',
- 'virtualenv.py')
-+ return '/usr/bin/virtualenv'
++ return '/usr/bin/virtualenv-2'
@property
def python_path(self):
diff --git a/xulrunner-freetype.patch b/xulrunner-freetype.patch
new file mode 100644
index 0000000..b68208e
--- /dev/null
+++ b/xulrunner-freetype.patch
@@ -0,0 +1,10 @@
+--- iceweasel-41.0.1/mozilla/config/system-headers~ 2015-09-29 23:44:56.000000000 +0200
++++ iceweasel-41.0.1/mozilla/config/system-headers 2015-10-13 22:19:29.758370730 +0200
+@@ -454,6 +454,7 @@
+ frame/log.h
+ frame/req.h
+ freetype/freetype.h
++freetype/ftfntfmt.h
+ freetype/ftcache.h
+ freetype/ftglyph.h
+ freetype/ftsynth.h
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xulrunner.git/commitdiff/cea7c13a8a46c373d7923e3108a4c19db9e4a68b
More information about the pld-cvs-commit
mailing list