Date: Monday, October 29, 2012 @ 17:12:03
Author: ibiru
Revision: 169809
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xulrunner/repos/extra-i686/PKGBUILD
(from rev 169808, xulrunner/trunk/PKGBUILD)
xulrunner/repos/extra-i686/mozconfig
(from rev 169808, xulrunner/trunk/mozconfig)
xulrunner/repos/extra-i686/mozilla-pkgconfig.patch
(from rev 169808, xulrunner/trunk/mozilla-pkgconfig.patch)
xulrunner/repos/extra-i686/shared-libs.patch
(from rev 169808, xulrunner/trunk/shared-libs.patch)
xulrunner/repos/extra-x86_64/PKGBUILD
(from rev 169808, xulrunner/trunk/PKGBUILD)
xulrunner/repos/extra-x86_64/mozconfig
(from rev 169808, xulrunner/trunk/mozconfig)
xulrunner/repos/extra-x86_64/mozilla-pkgconfig.patch
(from rev 169808, xulrunner/trunk/mozilla-pkgconfig.patch)
xulrunner/repos/extra-x86_64/shared-libs.patch
(from rev 169808, xulrunner/trunk/shared-libs.patch)
Deleted:
xulrunner/repos/extra-i686/PKGBUILD
xulrunner/repos/extra-i686/mozconfig
xulrunner/repos/extra-i686/mozilla-pkgconfig.patch
xulrunner/repos/extra-i686/shared-libs.patch
xulrunner/repos/extra-x86_64/PKGBUILD
xulrunner/repos/extra-x86_64/mozconfig
xulrunner/repos/extra-x86_64/mozilla-pkgconfig.patch
xulrunner/repos/extra-x86_64/shared-libs.patch
--------------------------------------+
extra-i686/PKGBUILD | 106 ++++++++++++++++-----------------
extra-i686/mozconfig | 76 +++++++++++------------
extra-i686/mozilla-pkgconfig.patch | 80 ++++++++++++------------
extra-i686/shared-libs.patch | 24 +++----
extra-x86_64/PKGBUILD | 106 ++++++++++++++++-----------------
extra-x86_64/mozconfig | 76 +++++++++++------------
extra-x86_64/mozilla-pkgconfig.patch | 80 ++++++++++++------------
extra-x86_64/shared-libs.patch | 24 +++----
8 files changed, 286 insertions(+), 286 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-10-29 21:10:09 UTC (rev 169808)
+++ extra-i686/PKGBUILD 2012-10-29 21:12:03 UTC (rev 169809)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <j...@archlinux.org>
-# Contributor: Alexander Baldeck <alexan...@archlinux.org>
-pkgname=xulrunner
-pkgver=16.0.1
-pkgrel=1
-pkgdesc="Mozilla Runtime Environment"
-arch=('i686' 'x86_64')
-license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell'
'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent'
'sqlite>=3.7.4' 'libnotify' 'libvpx' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm'
'mesa' 'autoconf2.13')
-url="http://wiki.mozilla.org/XUL:Xul_Runner";
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
- mozconfig
- mozilla-pkgconfig.patch
- shared-libs.patch)
-options=('!emptydirs')
-replaces=('xulrunner-oss')
-md5sums=('78e641c67dc4a40cb3f48fce3e782d41'
- '4afe63440e2f1935ff90de15db3b70f0'
- '27271ce647a83906ef7a24605e840d61'
- '52e52f840a49eb1d14be1c0065b03a93')
-
-build() {
- cd "$srcdir/mozilla-release"
- cp "$srcdir/mozconfig" .mozconfig
-
- #fix libdir/sdkdir - fedora
- patch -Np1 -i ../mozilla-pkgconfig.patch
- patch -Np1 -i ../shared-libs.patch
-
- 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/extra-i686/PKGBUILD (from rev 169808,
xulrunner/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-29 21:12:03 UTC (rev 169809)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+# Contributor: Alexander Baldeck <alexan...@archlinux.org>
+pkgname=xulrunner
+pkgver=16.0.2
+pkgrel=1
+pkgdesc="Mozilla Runtime Environment"
+arch=('i686' 'x86_64')
+license=('MPL' 'GPL' 'LGPL')
+depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell'
'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent'
'sqlite>=3.7.4' 'libnotify' 'libvpx' 'python2')
+makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm'
'mesa' 'autoconf2.13')
+url="http://wiki.mozilla.org/XUL:Xul_Runner";
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
+ mozconfig
+ mozilla-pkgconfig.patch
+ shared-libs.patch)
+options=('!emptydirs')
+replaces=('xulrunner-oss')
+md5sums=('1b360968ab05b2a59757d33514897915'
+ '4afe63440e2f1935ff90de15db3b70f0'
+ '27271ce647a83906ef7a24605e840d61'
+ '52e52f840a49eb1d14be1c0065b03a93')
+
+build() {
+ cd "$srcdir/mozilla-release"
+ cp "$srcdir/mozconfig" .mozconfig
+
+ #fix libdir/sdkdir - fedora
+ patch -Np1 -i ../mozilla-pkgconfig.patch
+ patch -Np1 -i ../shared-libs.patch
+
+ 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
+}
Deleted: extra-i686/mozconfig
===================================================================
--- extra-i686/mozconfig 2012-10-29 21:10:09 UTC (rev 169808)
+++ extra-i686/mozconfig 2012-10-29 21:12:03 UTC (rev 169809)
@@ -1,38 +0,0 @@
-. $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-safe-browsing
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
Copied: xulrunner/repos/extra-i686/mozconfig (from rev 169808,
xulrunner/trunk/mozconfig)
===================================================================
--- extra-i686/mozconfig (rev 0)
+++ extra-i686/mozconfig 2012-10-29 21:12:03 UTC (rev 169809)
@@ -0,0 +1,38 @@
+. $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-safe-browsing
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+# Optimization
+ac_add_options --enable-optimize
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
Deleted: extra-i686/mozilla-pkgconfig.patch
===================================================================
--- extra-i686/mozilla-pkgconfig.patch 2012-10-29 21:10:09 UTC (rev 169808)
+++ extra-i686/mozilla-pkgconfig.patch 2012-10-29 21:12:03 UTC (rev 169809)
@@ -1,40 +0,0 @@
-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/extra-i686/mozilla-pkgconfig.patch (from rev 169808,
xulrunner/trunk/mozilla-pkgconfig.patch)
===================================================================
--- extra-i686/mozilla-pkgconfig.patch (rev 0)
+++ extra-i686/mozilla-pkgconfig.patch 2012-10-29 21:12:03 UTC (rev 169809)
@@ -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
Deleted: extra-i686/shared-libs.patch
===================================================================
--- extra-i686/shared-libs.patch 2012-10-29 21:10:09 UTC (rev 169808)
+++ extra-i686/shared-libs.patch 2012-10-29 21:12:03 UTC (rev 169809)
@@ -1,12 +0,0 @@
-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/extra-i686/shared-libs.patch (from rev 169808,
xulrunner/trunk/shared-libs.patch)
===================================================================
--- extra-i686/shared-libs.patch (rev 0)
+++ extra-i686/shared-libs.patch 2012-10-29 21:12:03 UTC (rev 169809)
@@ -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 = \
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-10-29 21:10:09 UTC (rev 169808)
+++ extra-x86_64/PKGBUILD 2012-10-29 21:12:03 UTC (rev 169809)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <j...@archlinux.org>
-# Contributor: Alexander Baldeck <alexan...@archlinux.org>
-pkgname=xulrunner
-pkgver=16.0.1
-pkgrel=1
-pkgdesc="Mozilla Runtime Environment"
-arch=('i686' 'x86_64')
-license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell'
'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent'
'sqlite>=3.7.4' 'libnotify' 'libvpx' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm'
'mesa' 'autoconf2.13')
-url="http://wiki.mozilla.org/XUL:Xul_Runner";
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
- mozconfig
- mozilla-pkgconfig.patch
- shared-libs.patch)
-options=('!emptydirs')
-replaces=('xulrunner-oss')
-md5sums=('78e641c67dc4a40cb3f48fce3e782d41'
- '4afe63440e2f1935ff90de15db3b70f0'
- '27271ce647a83906ef7a24605e840d61'
- '52e52f840a49eb1d14be1c0065b03a93')
-
-build() {
- cd "$srcdir/mozilla-release"
- cp "$srcdir/mozconfig" .mozconfig
-
- #fix libdir/sdkdir - fedora
- patch -Np1 -i ../mozilla-pkgconfig.patch
- patch -Np1 -i ../shared-libs.patch
-
- 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/extra-x86_64/PKGBUILD (from rev 169808,
xulrunner/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-10-29 21:12:03 UTC (rev 169809)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+# Contributor: Alexander Baldeck <alexan...@archlinux.org>
+pkgname=xulrunner
+pkgver=16.0.2
+pkgrel=1
+pkgdesc="Mozilla Runtime Environment"
+arch=('i686' 'x86_64')
+license=('MPL' 'GPL' 'LGPL')
+depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell'
'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent'
'sqlite>=3.7.4' 'libnotify' 'libvpx' 'python2')
+makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm'
'mesa' 'autoconf2.13')
+url="http://wiki.mozilla.org/XUL:Xul_Runner";
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
+ mozconfig
+ mozilla-pkgconfig.patch
+ shared-libs.patch)
+options=('!emptydirs')
+replaces=('xulrunner-oss')
+md5sums=('1b360968ab05b2a59757d33514897915'
+ '4afe63440e2f1935ff90de15db3b70f0'
+ '27271ce647a83906ef7a24605e840d61'
+ '52e52f840a49eb1d14be1c0065b03a93')
+
+build() {
+ cd "$srcdir/mozilla-release"
+ cp "$srcdir/mozconfig" .mozconfig
+
+ #fix libdir/sdkdir - fedora
+ patch -Np1 -i ../mozilla-pkgconfig.patch
+ patch -Np1 -i ../shared-libs.patch
+
+ 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
+}
Deleted: extra-x86_64/mozconfig
===================================================================
--- extra-x86_64/mozconfig 2012-10-29 21:10:09 UTC (rev 169808)
+++ extra-x86_64/mozconfig 2012-10-29 21:12:03 UTC (rev 169809)
@@ -1,38 +0,0 @@
-. $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-safe-browsing
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
Copied: xulrunner/repos/extra-x86_64/mozconfig (from rev 169808,
xulrunner/trunk/mozconfig)
===================================================================
--- extra-x86_64/mozconfig (rev 0)
+++ extra-x86_64/mozconfig 2012-10-29 21:12:03 UTC (rev 169809)
@@ -0,0 +1,38 @@
+. $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-safe-browsing
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+# Optimization
+ac_add_options --enable-optimize
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
Deleted: extra-x86_64/mozilla-pkgconfig.patch
===================================================================
--- extra-x86_64/mozilla-pkgconfig.patch 2012-10-29 21:10:09 UTC (rev
169808)
+++ extra-x86_64/mozilla-pkgconfig.patch 2012-10-29 21:12:03 UTC (rev
169809)
@@ -1,40 +0,0 @@
-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/extra-x86_64/mozilla-pkgconfig.patch (from rev 169808,
xulrunner/trunk/mozilla-pkgconfig.patch)
===================================================================
--- extra-x86_64/mozilla-pkgconfig.patch (rev 0)
+++ extra-x86_64/mozilla-pkgconfig.patch 2012-10-29 21:12:03 UTC (rev
169809)
@@ -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
Deleted: extra-x86_64/shared-libs.patch
===================================================================
--- extra-x86_64/shared-libs.patch 2012-10-29 21:10:09 UTC (rev 169808)
+++ extra-x86_64/shared-libs.patch 2012-10-29 21:12:03 UTC (rev 169809)
@@ -1,12 +0,0 @@
-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/extra-x86_64/shared-libs.patch (from rev 169808,
xulrunner/trunk/shared-libs.patch)
===================================================================
--- extra-x86_64/shared-libs.patch (rev 0)
+++ extra-x86_64/shared-libs.patch 2012-10-29 21:12:03 UTC (rev 169809)
@@ -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 = \
