Date: Saturday, January 4, 2014 @ 07:48:04 Author: cbehan Revision: 103365
upgpkg: xulrunner 25.0-1 Update to 25.0-1 Added: xulrunner/trunk/freetype-headers.patch Modified: xulrunner/trunk/PKGBUILD xulrunner/trunk/mozconfig ------------------------+ PKGBUILD | 25 +++++++++++------ freetype-headers.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++ mozconfig | 4 +- 3 files changed, 84 insertions(+), 11 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-01-04 05:39:02 UTC (rev 103364) +++ PKGBUILD 2014-01-04 06:48:04 UTC (rev 103365) @@ -1,26 +1,29 @@ # $Id$ -# Maintainer: Jan de Groot <[email protected]> +# Maintainer: Connor Behan <[email protected]> +# Contributor: Jan de Groot <[email protected]> # Contributor: Alexander Baldeck <[email protected]> pkgname=xulrunner -pkgver=23.0.1 +pkgver=25.0 pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') -depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2') -makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13') +depends=('gtk2' 'mozilla-common' 'nss>=3.15' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'libvpx' 'python2') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'gstreamer0.10-base>=0.10.25') url="http://wiki.mozilla.org/XUL:Xul_Runner"; source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2 mozconfig mozilla-pkgconfig.patch - shared-libs.patch) + shared-libs.patch + freetype-headers.patch) options=('!emptydirs' 'staticlibs') replaces=('xulrunner-oss') -sha256sums=('50d70813cee1c966a6037957206626bb62dc047b011d2e4fab11c559008f9336' - '3fba82b327f8825ebe93ceaeaea4968d57cf7d700f40bf4457b06d263bcc2e8f' +sha256sums=('796614f7a7a02ae4bceb5d1f2dce2de5096f9e390e91ec09fa5a40bcdff45cb1' + 'b5e66890e991b194d9a6d2179bccd5ac0015d4aab0a8411c55c6ecfd06576c24' '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269' - 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1') + 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1' + 'b62975b25fa3a0dc3e57e32c2b980daf2ee2497eff1d9661595b8e8bafbaa5f8') prepare() { cd "$srcdir/mozilla-release" @@ -29,6 +32,7 @@ #fix libdir/sdkdir - fedora patch -Np1 -i ../mozilla-pkgconfig.patch patch -Np1 -i ../shared-libs.patch + patch -Np1 -i ../freetype-headers.patch # WebRTC build tries to execute "python" and expects Python 2 # Workaround taken from chromium PKGBUILD @@ -44,7 +48,7 @@ cd "$srcdir/mozilla-release" export PATH="$srcdir/python2-path:$PATH" - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" + export LDFLAGS="$LDFALGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" export PYTHON="/usr/bin/python2" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" @@ -54,6 +58,7 @@ cd "$srcdir/mozilla-release" make -j1 -f client.mk DESTDIR="$pkgdir" install + # Use system-provided dictionaries rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation} ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries" ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation" @@ -63,6 +68,8 @@ echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" + chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpcshell" + ln -s /usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpcshell "${pkgdir}/usr/lib/xulrunner-$pkgver/xpcshell" sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \ "$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin/{xpt,header,typelib,xpidl}.py } Added: freetype-headers.patch =================================================================== --- freetype-headers.patch (rev 0) +++ freetype-headers.patch 2014-01-04 06:48:04 UTC (rev 103365) @@ -0,0 +1,66 @@ +diff -Nur mozilla-release.orig/config/system-headers mozilla-release/config/system-headers +--- mozilla-release.orig/config/system-headers ++++ mozilla-release/config/system-headers +@@ -408,16 +408,29 @@ freetype/ftoutln.h + freetype/ttnameid.h + freetype/tttables.h + freetype/t1tables.h + freetype/ftlcdfil.h + freetype/ftsizes.h + freetype/ftadvanc.h + freetype/ftbitmap.h + freetype/ftxf86.h ++freetype.h ++ftcache.h ++ftglyph.h ++ftsynth.h ++ftoutln.h ++ttnameid.h ++tttables.h ++t1tables.h ++ftlcdfil.h ++ftsizes.h ++ftadvanc.h ++ftbitmap.h ++ftxf86.h + fribidi/fribidi.h + FSp_fopen.h + fstream + fstream.h + ft2build.h + fts.h + gconf/gconf-client.h + Gdiplus.h +diff -Nur mozilla-release.orig/js/src/config/system-headers mozilla-release/js/src/config/system-headers +--- mozilla-release.orig/js/src/config/system-headers ++++ mozilla-release/js/src/config/system-headers +@@ -408,16 +408,29 @@ freetype/ftoutln.h + freetype/ttnameid.h + freetype/tttables.h + freetype/t1tables.h + freetype/ftlcdfil.h + freetype/ftsizes.h + freetype/ftadvanc.h + freetype/ftbitmap.h + freetype/ftxf86.h ++freetype.h ++ftcache.h ++ftglyph.h ++ftsynth.h ++ftoutln.h ++ttnameid.h ++tttables.h ++t1tables.h ++ftlcdfil.h ++ftsizes.h ++ftadvanc.h ++ftbitmap.h ++ftxf86.h + fribidi/fribidi.h + FSp_fopen.h + fstream + fstream.h + ft2build.h + fts.h + gconf/gconf-client.h + Gdiplus.h Modified: mozconfig =================================================================== --- mozconfig 2014-01-04 05:39:02 UTC (rev 103364) +++ mozconfig 2014-01-04 06:48:04 UTC (rev 103365) @@ -15,13 +15,13 @@ ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi -#ac_add_options --enable-system-cairo +ac_add_options --enable-system-cairo ac_add_options --enable-system-pixman ac_add_options --with-pthreads # Features ac_add_options --enable-startup-notification -#ac_add_options --enable-gstreamer +ac_add_options --enable-gstreamer ac_add_options --disable-crashreporter ac_add_options --disable-updater
