diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-07 23:00:59 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-07 23:00:59 -0300 |
| commit | 87bd9124ec1abd5c6171af47af93805b975343b6 (patch) | |
| tree | f9732aabf9c46c6391409187f8ddf8cc5b005006 /extra/xulrunner | |
| parent | 96c65d8a0393645808ab5ea31776baa26209fc5f (diff) | |
| parent | 0dee03071a0643c3ee5820afa3c694dcef71d385 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/beye/PKGBUILD
community/xmlrpc-c/PKGBUILD
extra/avidemux/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk2/PKGBUILD
extra/libvpx/PKGBUILD
extra/libxfce4menu/PKGBUILD
extra/libxml2/PKGBUILD
extra/pixman/PKGBUILD
extra/thunar-archive-plugin/PKGBUILD
extra/thunar-volman/PKGBUILD
extra/vdpau-video/PKGBUILD
extra/xfce4-appfinder/PKGBUILD
extra/xfce4-battery-plugin/PKGBUILD
extra/xfce4-cpufreq-plugin/PKGBUILD
extra/xfce4-cpugraph-plugin/PKGBUILD
extra/xfce4-dict/PKGBUILD
extra/xfce4-diskperf-plugin/PKGBUILD
extra/xfce4-eyes-plugin/PKGBUILD
extra/xfce4-fsguard-plugin/PKGBUILD
extra/xfce4-mixer/PKGBUILD
extra/xfce4-mount-plugin/PKGBUILD
extra/xfce4-mpc-plugin/PKGBUILD
extra/xfce4-power-manager/PKGBUILD
extra/xfce4-systemload-plugin/PKGBUILD
extra/xfce4-taskmanager/PKGBUILD
extra/xfce4-time-out-plugin/PKGBUILD
extra/xfce4-timer-plugin/PKGBUILD
extra/xfce4-wavelan-plugin/PKGBUILD
extra/xorg-luit/PKGBUILD
extra/xorg-xfontsel/PKGBUILD
extra/xulrunner/PKGBUILD
kde-unstable/calligra/PKGBUILD
libre/mplayer-vaapi-libre/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'extra/xulrunner')
| -rw-r--r-- | extra/xulrunner/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/xulrunner/libvpx.patch | 12 |
2 files changed, 21 insertions, 5 deletions
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index 93530165b..b14439b7b 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 148986 2012-02-05 11:59:04Z ibiru $ +# $Id: PKGBUILD 149294 2012-02-06 17:34:06Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner pkgver=10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2') -makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa') +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 mips.patch - mozilla-pkgconfig.patch) + mozilla-pkgconfig.patch + mozilla-pkgconfig.patch + libvpx.patch) options=('!emptydirs') replaces=('xulrunner-oss') md5sums=('13c61203ccfa583e5a54b4dc22f41233' '8dfb78c5bd0581c8cf4753813132bf0b' - '27271ce647a83906ef7a24605e840d61') + '27271ce647a83906ef7a24605e840d61' + '5d418ecdbdb9f40597df6b978b0b5ee5') build() { cd "$srcdir/mozilla-release" @@ -31,6 +34,7 @@ build() { #fix libdir/sdkdir - fedora patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" + patch -Np1 -i "$srcdir/libvpx.patch" export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" diff --git a/extra/xulrunner/libvpx.patch b/extra/xulrunner/libvpx.patch new file mode 100644 index 000000000..f883b8e08 --- /dev/null +++ b/extra/xulrunner/libvpx.patch @@ -0,0 +1,12 @@ +diff -Nur mozilla-release.orig/configure.in mozilla-release/configure.in +--- mozilla-release.orig/configure.in 2012-02-05 16:01:35.722024142 +0000 ++++ mozilla-release/configure.in 2012-02-05 16:03:34.871064547 +0000 +@@ -5629,7 +5629,7 @@ + dnl v0.9.6 one to check for. + AC_TRY_COMPILE([ + #include <vpx/vpx_decoder.h> +- #if !defined(VPX_CODEC_USE_INPUT_PARTITION) ++ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) + #error "test failed." + #endif + ], |