Date: Sunday, April 28, 2013 @ 03:59:13
Author: foutrelis
Revision: 183807
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
xulrunner/repos/staging-i686/
xulrunner/repos/staging-i686/PKGBUILD
(from rev 183806, xulrunner/trunk/PKGBUILD)
xulrunner/repos/staging-i686/mozconfig
(from rev 183806, xulrunner/trunk/mozconfig)
xulrunner/repos/staging-i686/mozilla-pkgconfig.patch
(from rev 183806, xulrunner/trunk/mozilla-pkgconfig.patch)
xulrunner/repos/staging-i686/shared-libs.patch
(from rev 183806, xulrunner/trunk/shared-libs.patch)
xulrunner/repos/staging-x86_64/
xulrunner/repos/staging-x86_64/PKGBUILD
(from rev 183806, xulrunner/trunk/PKGBUILD)
xulrunner/repos/staging-x86_64/mozconfig
(from rev 183806, xulrunner/trunk/mozconfig)
xulrunner/repos/staging-x86_64/mozilla-pkgconfig.patch
(from rev 183806, xulrunner/trunk/mozilla-pkgconfig.patch)
xulrunner/repos/staging-x86_64/shared-libs.patch
(from rev 183806, xulrunner/trunk/shared-libs.patch)
----------------------------------------+
staging-i686/PKGBUILD | 67 +++++++++++++++++++++++++++++++
staging-i686/mozconfig | 29 +++++++++++++
staging-i686/mozilla-pkgconfig.patch | 40 ++++++++++++++++++
staging-i686/shared-libs.patch | 12 +++++
staging-x86_64/PKGBUILD | 67 +++++++++++++++++++++++++++++++
staging-x86_64/mozconfig | 29 +++++++++++++
staging-x86_64/mozilla-pkgconfig.patch | 40 ++++++++++++++++++
staging-x86_64/shared-libs.patch | 12 +++++
8 files changed, 296 insertions(+)
Copied: xulrunner/repos/staging-i686/PKGBUILD (from rev 183806,
xulrunner/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-04-28 01:59:13 UTC (rev 183807)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+# Contributor: Alexander Baldeck <alexan...@archlinux.org>
+pkgname=xulrunner
+pkgver=20.0
+pkgrel=2
+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')
+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)
+options=('!emptydirs')
+replaces=('xulrunner-oss')
+md5sums=('1b8a1907919eb805f390a05216f2d8d0'
+ 'f26710bcf3e65699a0646c47155cb147'
+ '27271ce647a83906ef7a24605e840d61'
+ '52e52f840a49eb1d14be1c0065b03a93')
+
+prepare() {
+ cd "$srcdir/mozilla-release"
+ cp "$srcdir/mozconfig" .mozconfig
+
+ #fix libdir/sdkdir - fedora
+ patch -Np1 -i ../mozilla-pkgconfig.patch
+ patch -Np1 -i ../shared-libs.patch
+
+ # WebRTC build tries to execute "python" and expects Python 2
+ # Workaround taken from chromium PKGBUILD
+ mkdir "$srcdir/python2-path"
+ ln -s /usr/bin/python2 "$srcdir/python2-path/python"
+
+ # configure script misdetects the preprocessor without an optimization level
+ # https://bugs.archlinux.org/task/34644
+ sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+}
+
+build() {
+ cd "$srcdir/mozilla-release"
+
+ export PATH="$srcdir/python2-path:$PATH"
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver"
+ export PYTHON="/usr/bin/python2"
+
+ make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+}
+
+package() {
+ cd "$srcdir/mozilla-release"
+ make -j1 -f client.mk DESTDIR="$pkgdir" install
+
+ 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"
+
+ # add xulrunner library path to ld.so.conf
+ install -d $pkgdir/etc/ld.so.conf.d
+ 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"
+ sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \
+
"$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin/{xpt,header,typelib,xpidl}.py
+}
Copied: xulrunner/repos/staging-i686/mozconfig (from rev 183806,
xulrunner/trunk/mozconfig)
===================================================================
--- staging-i686/mozconfig (rev 0)
+++ staging-i686/mozconfig 2013-04-28 01:59:13 UTC (rev 183807)
@@ -0,0 +1,29 @@
+. $topsrcdir/xulrunner/config/mozconfig
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+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-pixman
+ac_add_options --with-pthreads
+
+# Features
+ac_add_options --enable-startup-notification
+#ac_add_options --enable-gstreamer
+
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-installer
Copied: xulrunner/repos/staging-i686/mozilla-pkgconfig.patch (from rev 183806,
xulrunner/trunk/mozilla-pkgconfig.patch)
===================================================================
--- staging-i686/mozilla-pkgconfig.patch (rev 0)
+++ staging-i686/mozilla-pkgconfig.patch 2013-04-28 01:59:13 UTC (rev
183807)
@@ -0,0 +1,40 @@
+diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in
mozilla-release/xulrunner/installer/libxul-embedding.pc.in
+--- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in
2011-12-19 22:11:38.100005674 +0000
++++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19
22:14:35.095147521 +0000
+@@ -6,5 +6,6 @@
+ Name: libxul-embedding
+ Description: Static library for version-independent embedding of the Mozilla
runtime
+ Version: %MOZILLA_VERSION%
++Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib -lxpcomglue -ldl
+ Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
+diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in
mozilla-release/xulrunner/installer/libxul.pc.in
+--- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19
22:11:38.126672110 +0000
++++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19
22:14:04.375412141 +0000
+@@ -1,5 +1,6 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
++libdir=%libdir%
+ includedir=%includedir%
+ idldir=%idldir%
+
+diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in
mozilla-release/xulrunner/installer/Makefile.in
+--- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19
22:11:38.126672110 +0000
++++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19
22:18:28.743135321 +0000
+@@ -108,6 +108,7 @@
+ -e "s|%includedir%|$(includedir)|" \
+ -e "s|%idldir%|$(idldir)|" \
+ -e "s|%sdkdir%|$(sdkdir)|" \
++ -e "s|%libdir%|$(installdir)|" \
+ -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
+ -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
+ -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
+diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in
mozilla-release/xulrunner/installer/mozilla-js.pc.in
+--- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19
22:11:38.126672110 +0000
++++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19
22:18:55.569571004 +0000
+@@ -7,4 +7,4 @@
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
+-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
Copied: xulrunner/repos/staging-i686/shared-libs.patch (from rev 183806,
xulrunner/trunk/shared-libs.patch)
===================================================================
--- staging-i686/shared-libs.patch (rev 0)
+++ staging-i686/shared-libs.patch 2013-04-28 01:59:13 UTC (rev 183807)
@@ -0,0 +1,12 @@
+diff -Nur mozilla-release.orig/browser/installer/Makefile.in
mozilla-release/browser/installer/Makefile.in
+--- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17
16:19:29.480356991 +0000
++++ mozilla-release/browser/installer/Makefile.in 2012-07-17
17:32:41.250937293 +0000
+@@ -50,7 +50,7 @@
+ MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
+ # Some files have been already bundled with xulrunner
+ ifndef SYSTEM_LIBXUL
+-MOZ_PKG_FATAL_WARNINGS = 1
++MOZ_PKG_FATAL_WARNINGS = 0
+ endif
+
+ MOZ_NONLOCALIZED_PKG_LIST = \
Copied: xulrunner/repos/staging-x86_64/PKGBUILD (from rev 183806,
xulrunner/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-04-28 01:59:13 UTC (rev 183807)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+# Contributor: Alexander Baldeck <alexan...@archlinux.org>
+pkgname=xulrunner
+pkgver=20.0
+pkgrel=2
+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')
+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)
+options=('!emptydirs')
+replaces=('xulrunner-oss')
+md5sums=('1b8a1907919eb805f390a05216f2d8d0'
+ 'f26710bcf3e65699a0646c47155cb147'
+ '27271ce647a83906ef7a24605e840d61'
+ '52e52f840a49eb1d14be1c0065b03a93')
+
+prepare() {
+ cd "$srcdir/mozilla-release"
+ cp "$srcdir/mozconfig" .mozconfig
+
+ #fix libdir/sdkdir - fedora
+ patch -Np1 -i ../mozilla-pkgconfig.patch
+ patch -Np1 -i ../shared-libs.patch
+
+ # WebRTC build tries to execute "python" and expects Python 2
+ # Workaround taken from chromium PKGBUILD
+ mkdir "$srcdir/python2-path"
+ ln -s /usr/bin/python2 "$srcdir/python2-path/python"
+
+ # configure script misdetects the preprocessor without an optimization level
+ # https://bugs.archlinux.org/task/34644
+ sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+}
+
+build() {
+ cd "$srcdir/mozilla-release"
+
+ export PATH="$srcdir/python2-path:$PATH"
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver"
+ export PYTHON="/usr/bin/python2"
+
+ make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+}
+
+package() {
+ cd "$srcdir/mozilla-release"
+ make -j1 -f client.mk DESTDIR="$pkgdir" install
+
+ 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"
+
+ # add xulrunner library path to ld.so.conf
+ install -d $pkgdir/etc/ld.so.conf.d
+ 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"
+ sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \
+
"$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin/{xpt,header,typelib,xpidl}.py
+}
Copied: xulrunner/repos/staging-x86_64/mozconfig (from rev 183806,
xulrunner/trunk/mozconfig)
===================================================================
--- staging-x86_64/mozconfig (rev 0)
+++ staging-x86_64/mozconfig 2013-04-28 01:59:13 UTC (rev 183807)
@@ -0,0 +1,29 @@
+. $topsrcdir/xulrunner/config/mozconfig
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+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-pixman
+ac_add_options --with-pthreads
+
+# Features
+ac_add_options --enable-startup-notification
+#ac_add_options --enable-gstreamer
+
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-installer
Copied: xulrunner/repos/staging-x86_64/mozilla-pkgconfig.patch (from rev
183806, xulrunner/trunk/mozilla-pkgconfig.patch)
===================================================================
--- staging-x86_64/mozilla-pkgconfig.patch (rev 0)
+++ staging-x86_64/mozilla-pkgconfig.patch 2013-04-28 01:59:13 UTC (rev
183807)
@@ -0,0 +1,40 @@
+diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in
mozilla-release/xulrunner/installer/libxul-embedding.pc.in
+--- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in
2011-12-19 22:11:38.100005674 +0000
++++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19
22:14:35.095147521 +0000
+@@ -6,5 +6,6 @@
+ Name: libxul-embedding
+ Description: Static library for version-independent embedding of the Mozilla
runtime
+ Version: %MOZILLA_VERSION%
++Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib -lxpcomglue -ldl
+ Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
+diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in
mozilla-release/xulrunner/installer/libxul.pc.in
+--- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19
22:11:38.126672110 +0000
++++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19
22:14:04.375412141 +0000
+@@ -1,5 +1,6 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
++libdir=%libdir%
+ includedir=%includedir%
+ idldir=%idldir%
+
+diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in
mozilla-release/xulrunner/installer/Makefile.in
+--- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19
22:11:38.126672110 +0000
++++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19
22:18:28.743135321 +0000
+@@ -108,6 +108,7 @@
+ -e "s|%includedir%|$(includedir)|" \
+ -e "s|%idldir%|$(idldir)|" \
+ -e "s|%sdkdir%|$(sdkdir)|" \
++ -e "s|%libdir%|$(installdir)|" \
+ -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
+ -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
+ -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
+diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in
mozilla-release/xulrunner/installer/mozilla-js.pc.in
+--- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19
22:11:38.126672110 +0000
++++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19
22:18:55.569571004 +0000
+@@ -7,4 +7,4 @@
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
+-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
Copied: xulrunner/repos/staging-x86_64/shared-libs.patch (from rev 183806,
xulrunner/trunk/shared-libs.patch)
===================================================================
--- staging-x86_64/shared-libs.patch (rev 0)
+++ staging-x86_64/shared-libs.patch 2013-04-28 01:59:13 UTC (rev 183807)
@@ -0,0 +1,12 @@
+diff -Nur mozilla-release.orig/browser/installer/Makefile.in
mozilla-release/browser/installer/Makefile.in
+--- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17
16:19:29.480356991 +0000
++++ mozilla-release/browser/installer/Makefile.in 2012-07-17
17:32:41.250937293 +0000
+@@ -50,7 +50,7 @@
+ MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
+ # Some files have been already bundled with xulrunner
+ ifndef SYSTEM_LIBXUL
+-MOZ_PKG_FATAL_WARNINGS = 1
++MOZ_PKG_FATAL_WARNINGS = 0
+ endif
+
+ MOZ_NONLOCALIZED_PKG_LIST = \
