From 7b0cdd65ac7bcd3c7597b528a10de58e4e0a430f Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Nov 2011 23:14:53 +0000 Subject: Wed Nov 9 23:14:53 UTC 2011 --- extra/audacious/PKGBUILD | 6 +-- extra/bin86/PKGBUILD | 33 ++++++++++++++++ extra/bin86/bin86-0.16.17-x86_64-1.patch | 44 ++++++++++++++++++++++ extra/git/PKGBUILD | 12 +++--- extra/gnutls/PKGBUILD | 6 +-- extra/irqbalance/PKGBUILD | 28 ++++---------- extra/lirc/PKGBUILD | 15 ++++---- extra/lirc/lirc.install | 4 +- extra/numactl/PKGBUILD | 24 ++++++++++++ extra/ruby/PKGBUILD | 21 ++++++----- extra/telepathy-gabble/PKGBUILD | 6 +-- extra/telepathy-glib/PKGBUILD | 7 ++-- extra/telepathy-mission-control/PKGBUILD | 10 +++-- .../telepathy-mission-control.install | 11 ++++++ extra/vim/PKGBUILD | 16 ++++---- extra/xulrunner/PKGBUILD | 37 +++++++++--------- extra/xulrunner/mozconfig | 37 +++++------------- 17 files changed, 201 insertions(+), 116 deletions(-) create mode 100644 extra/bin86/PKGBUILD create mode 100644 extra/bin86/bin86-0.16.17-x86_64-1.patch create mode 100644 extra/numactl/PKGBUILD create mode 100644 extra/telepathy-mission-control/telepathy-mission-control.install (limited to 'extra') diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index cfda8b416..eb55ca75f 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 141068 2011-10-23 03:27:31Z bisson $ +# $Id: PKGBUILD 142398 2011-11-09 01:26:09Z bisson $ # Contributor: Alexander Fehr # Contributor: Giovanni Scafora # Maintainer: Gaetan Bisson pkgname=audacious -pkgver=3.0.4 +pkgver=3.1 pkgrel=1 pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality' url='http://audacious-media-player.org/' @@ -14,7 +14,7 @@ depends=('gtk3' 'libmcs' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils') optdepends=('unzip: zipped skins support') source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz") -sha1sums=('d4bb828e4ead275bded85cf8b0aa258c347106cb') +sha1sums=('53d89b3e2faf5ca13dca55875dc04efc753328f2') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/bin86/PKGBUILD b/extra/bin86/PKGBUILD new file mode 100644 index 000000000..a5dbd1c25 --- /dev/null +++ b/extra/bin86/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 142339 2011-11-08 16:07:12Z dreisner $ +# Maintainer: Andreas Radke +# Contributor: judd + +pkgname=bin86 +pkgver=0.16.18 +pkgrel=3 +pkgdesc="A complete 8086 assembler and loader" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.debath.co.uk/" +depends=('glibc') +source=("http://www.debath.co.uk/dev86//$pkgname-$pkgver.tar.gz" + bin86-0.16.17-x86_64-1.patch) +md5sums=('914068fb649b93642d1cf21857b75699' + '92bdce7b0655cd2e9f83c83fc56d128e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + if [[ $CARCH = x86_64 ]]; then + patch -Np1 < "$srcdir/bin86-0.16.17-x86_64-1.patch" + fi + + make PREFIX=/usr +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1" + make "PREFIX=$pkgdir/usr" "MANDIR=$pkgdir/usr/share/man/man1" install +} diff --git a/extra/bin86/bin86-0.16.17-x86_64-1.patch b/extra/bin86/bin86-0.16.17-x86_64-1.patch new file mode 100644 index 000000000..152413ee7 --- /dev/null +++ b/extra/bin86/bin86-0.16.17-x86_64-1.patch @@ -0,0 +1,44 @@ +Submitted By: Ken Moffat +Date: 2005-06-28 +Initial Package Version: 0.16.14 +Upstream Status: Submitted Upstream +Origin: from ROCK Linux +Description: Allows bin86 to compile on x86_64, which permits lilo to + be used in a 64-bit system. I'm dubious about ROCK's attempts to + automatically add dual-licensing to all their patches, but bin86 is + already GPL'd. I've heard from the maintainer that this will be + included in the next upload. + + +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/x86/bin86/x86_64.patch +# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +diff -urN bin86-0.16.14-orig/ld/x86_aout.h bin86-0.16.14/ld/x86_aout.h +--- bin86-0.16.14-orig/ld/x86_aout.h 2004-11-07 20:07:31.506442000 +0100 ++++ bin86-0.16.14/ld/x86_aout.h 2004-11-07 20:07:41.106982496 +0100 +@@ -12,6 +12,9 @@ + #if defined(i386) || defined(__BCC__) || defined(MSDOS) + typedef long Long; + #define __OUT_OK 1 ++#elif defined(__x86_64__) ++typedef int Long; ++#define __OUT_OK 1 + #else + typedef char Long[4]; + #endif diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index bae96c4c7..13e190825 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141726 2011-11-02 15:25:43Z dan $ +# $Id: PKGBUILD 142406 2011-11-09 04:33:51Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.7.7.2 +pkgver=1.7.7.3 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -80,11 +80,11 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -md5sums=('400d85fd17bdb7f8923dbf3b3a2ca671' - '24e2d2b6c3f97102f7b79e05c165fd22' +md5sums=('da2b3c226d8e99d8f66e708129f57a0a' + 'f801b4c7b2c9dea7c0ff969f4acaa12c' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('b309c172b63636bb746ded2771536cb5b2efdfa011511d81783e87950c665260' - '8a80657b6095b10d0f9db9707de6d02c38e364a5ccf25ee94edb4daa4c27c755' +sha256sums=('dc9d773004cdae17453e330a02de630a1beeeb404d0601b9e8c1aef0a0efd100' + '62bec01d704d3495fcf66a3b97a8fb7c337a06202784fa7a7fa510360e79671f' '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index de47d7e4a..9eacf86e7 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141300 2011-10-28 13:49:24Z andyrtr $ +# $Id: PKGBUILD 142365 2011-11-08 21:23:02Z andyrtr $ # Maintainer: Jan de Groot pkgname=gnutls -pkgver=3.0.5 +pkgver=3.0.7 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ options=('!libtool' '!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit') makedepends=('valgrind') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz) -md5sums=('c2d4e6344974545c228a1df2147bf334') +md5sums=('840c96c75817c0f800a47805e275db7e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD index e969c5729..fc6512bc9 100644 --- a/extra/irqbalance/PKGBUILD +++ b/extra/irqbalance/PKGBUILD @@ -2,34 +2,24 @@ # Contributor: Martin Striz pkgname=irqbalance -pkgver=0.56 -pkgrel=3 +pkgver=1.0.2 +pkgrel=1 pkgdesc="IRQ balancing daemon for SMP systems" arch=('i686' 'x86_64') -url="http://www.irqbalance.org/" +url="http://code.google.com/p/irqbalance" license=('GPL') -depends=(glib2) +depends=(glib2 numactl libcap-ng) makedepends=(pkgconfig) backup=(etc/conf.d/irqbalance) -source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tbz2 +source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz irqbalance.conf.d - irqbalance.rc.d - current-trunk.patch - Fix-detection-of-CPUs-in-sysfs.patch - Special-interrupt-counts-line-NMI-may-start-with-a-s.patch) -md5sums=('cd0c4d3b2bb84778a04fc594ad83949a' + irqbalance.rc.d) +md5sums=('58e1c9c164b12d797b500634a73938b4' '336c1ee99818f9ecda1687e34c69fd6b' - 'fb82fc5d267d39110baf720d81282a7c' - '64df09f54cf80d9ce5ff2751a882032d' - '00dcb394dac884c116657ade4fe623ee' - 'e774aff57054ce3c8b5adc7c3e5a74c2') + 'fb82fc5d267d39110baf720d81282a7c') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np0 < ../current-trunk.patch - patch -Np1 < ../Fix-detection-of-CPUs-in-sysfs.patch - patch -Np1 < ../Special-interrupt-counts-line-NMI-may-start-with-a-s.patch - ./autogen.sh ./configure --prefix=/usr make } @@ -37,8 +27,6 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make install DESTDIR="$pkgdir" - #install -D -m755 irqbalance $pkgdir/usr/sbin/irqbalance - #install -D -m644 irqbalance.1 $pkgdir/usr/share/man/man1/irqbalance.1 install -D -m644 ../irqbalance.conf.d "$pkgdir"/etc/conf.d/irqbalance install -D -m755 ../irqbalance.rc.d "$pkgdir"/etc/rc.d/irqbalance } diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD index c5525ea12..23c2a1437 100644 --- a/extra/lirc/PKGBUILD +++ b/extra/lirc/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 133620 2011-07-30 06:46:23Z ibiru $ +# $Id: PKGBUILD 142392 2011-11-08 22:38:56Z thomas $ # Maintainer: Paul Mattal pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 -pkgrel=6 +pkgrel=8 epoch=1 -_kernver=3.0-ARCH +_extramodules=extramodules-3.1-ARCH +_kernver="$(cat /lib/modules/${_extramodules}/version)" arch=('i686' 'x86_64') url="http://www.lirc.org/" license=('GPL') -makedepends=('help2man' 'linux-headers>=3.0' 'linux-headers<3.1' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python') +makedepends=('help2man' 'linux-headers>=3.1' 'linux-headers<3.2' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch @@ -60,15 +61,15 @@ build() { package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" - depends=('lirc-utils' 'linux>=3.0' 'linux<3.1') + depends=('lirc-utils' 'linux>=3.1' 'linux<3.2') replaces=('lirc+pctv') install=lirc.install cd "${srcdir}/lirc-${pkgver}/drivers" - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" moduledir="/lib/modules/${_extramodules}" install # set the kernel we've built for inside the install script - sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" "${startdir}/lirc.install" + sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install" # gzip -9 modules find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; } diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install index 0d42e8a5c..1e7c4f4a1 100644 --- a/extra/lirc/lirc.install +++ b/extra/lirc/lirc.install @@ -1,9 +1,9 @@ -KERNEL_VERSION=3.0-ARCH +EXTRAMODULES=extramodules-3.1-ARCH post_install() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod $KERNEL_VERSION > /dev/null 2>&1 + depmod $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1 } post_upgrade() { diff --git a/extra/numactl/PKGBUILD b/extra/numactl/PKGBUILD new file mode 100644 index 000000000..0565cdc08 --- /dev/null +++ b/extra/numactl/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Dan McGee +# Contributor: Florian Zeitz + +pkgname=numactl +pkgver=2.0.7 +pkgrel=2 +pkgdesc="Simple NUMA policy support" +arch=('i686' 'x86_64') +url="http://oss.sgi.com/projects/libnuma/" +license=('LGPL2.1' 'GPL2') +depends=('perl') +source=(ftp://oss.sgi.com/www/projects/libnuma/download/$pkgname-${pkgver/_/-}.tar.gz) +sha1sums=('dfdf539da65d1e880f04202071c139c4d2ba2da9') + +build() { + cd "$srcdir/$pkgname-${pkgver/_/-}" + make +} + +package() { + cd "$srcdir/$pkgname-${pkgver/_/-}" + make prefix="$pkgdir/usr" libdir="$pkgdir/usr/lib" install + rmdir $pkgdir/usr/share/man/man2 +} diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 0cf2bb88d..63b9c7194 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 131846 2011-07-16 03:10:20Z eric $ +# $Id: PKGBUILD 142306 2011-11-08 07:15:40Z angvp $ # Maintainer: # Contributor: Allan McRae # Contributor: John Proctor @@ -6,34 +6,34 @@ pkgbase=ruby pkgname=('ruby' 'ruby-docs') -pkgver=1.9.2_p290 +pkgver=1.9.3_p0 pkgrel=1 pkgdesc="An object-oriented language for quick and easy programming" arch=('i686' 'x86_64') url="http://www.ruby-lang.org/en/" -license=('custom') -makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz') +license=('BSD' 'custom') +makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') options=('!emptydirs' '!makeflags') source=(ftp://ftp.ruby-lang.org/pub/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2) -md5sums=('096758c3e853b839dc980b183227b182') -sha1sums=('8f25a74f50a10fdd9724e3c74ccd7bae596e198b') +sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf') build() { cd "${srcdir}/${pkgbase}-${pkgver//_/-}" - ./configure --prefix=/usr --sysconfdir=/etc \ + DOXYGEN=/usr/bin/doxygen PKG_CONFIG=/usr/bin/pkg-config ./configure --prefix=/usr --sysconfdir=/etc \ --enable-shared --enable-pthread --disable-rpath make } package_ruby() { - depends=('openssl' 'libffi') + depends=('openssl' 'libffi' 'libyaml') provides=('rubygems' 'rake') conflicts=('rake') optdepends=('tk: for Ruby/TK') cd "${srcdir}/${pkgbase}-${pkgver//_/-}" make DESTDIR="${pkgdir}" install-nodoc - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL" } package_ruby-docs() { @@ -41,5 +41,6 @@ package_ruby-docs() { cd "${srcdir}/${pkgbase}-${pkgver//_/-}" make DESTDIR="${pkgdir}" install-doc install-capi - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL" } diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD index 513468475..3ba473cc2 100644 --- a/extra/telepathy-gabble/PKGBUILD +++ b/extra/telepathy-gabble/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139439 2011-10-01 19:01:33Z ibiru $ +# $Id: PKGBUILD 142337 2011-11-08 15:59:23Z ibiru $ # Maintainer : Ionut Biru # Contributor: Daniel Balieiro # Contributor: Rodrigo L. M. Flores pkgname=telepathy-gabble -pkgver=0.12.7 +pkgver=0.14.0 pkgrel=1 pkgdesc="A Jabber/XMPP connection manager for Telepathy" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('libxslt' 'python2') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz) install=telepathy-gabble.install -md5sums=('3518db585403a6cf93ba253200acc5e7') +md5sums=('73afa5533833d176b9b82b96351efe63') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD index cbfc104ad..b3bb3075d 100644 --- a/extra/telepathy-glib/PKGBUILD +++ b/extra/telepathy-glib/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 141174 2011-10-25 11:30:46Z ibiru $ +# $Id: PKGBUILD 142317 2011-11-08 12:30:16Z ibiru $ # Maintainer: Ionut Biru # Contributor: Kessia 'even' Pinheiro pkgname=telepathy-glib -pkgver=0.16.1 +pkgver=0.16.2 pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org" -groups=('telepathy') license=('LGPL2.1') options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('22dd16bdf4f987c602c719a1efc3d268') +md5sums=('c05e48da72f013cec86ca8a05da71ffd') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index 54c820291..be3daa482 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140177 2011-10-08 12:03:11Z ibiru $ +# $Id: PKGBUILD 142335 2011-11-08 15:59:21Z ibiru $ # Maintainer: Ionut Biru # Contributor: Ju Liu # Contributor: Bjorn Lindeijer # Contributor: Andreas Zwinkau pkgname=telepathy-mission-control -pkgver=5.9.3 +pkgver=5.10.1 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64') @@ -12,15 +12,17 @@ url="http://telepathy.freedesktop.org/wiki/Mission Control" license=('LGPL2.1') depends=('telepathy-glib' 'libgnome-keyring') makedepends=('libxslt' 'python2') +install=telepathy-mission-control.install options=('!libtool') source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz) -md5sums=('15fc8e560bc67a86393a3138d7ac38e3') +md5sums=('50594028ebb2dba0181fec99e6f56ff5') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy \ - --enable-gnome-keyring + --enable-gnome-keyring \ + --disable-schemas-compile make } diff --git a/extra/telepathy-mission-control/telepathy-mission-control.install b/extra/telepathy-mission-control/telepathy-mission-control.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/extra/telepathy-mission-control/telepathy-mission-control.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 4de38ffec..f2d9258bc 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140768 2011-10-18 23:20:38Z eric $ +# $Id: PKGBUILD 142404 2011-11-09 04:16:54Z eric $ # Contributor: Jan "heftig" Steffens # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths @@ -6,19 +6,19 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=338 -__hgrev=f530aef0d959 +_patchlevel=353 +__hgrev=379a6398d462 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 arch=('i686' 'x86_64') license=('custom:vim') url="http://www.vim.org" -makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2') +makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872 vimrc archlinux.vim gvim.desktop) -md5sums=('fc83d6580fd8441793fccfd26487aadb' +md5sums=('3a7fb107699b741a7a1a86ff5ec3b83e' '6e7adfbd5d26c1d161030ec203a7f243' 'e57777374891063b9ca48a1fe392ac05' '10353a61aadc3f276692d0e17db1478e' @@ -73,7 +73,7 @@ build() { --with-features=big --enable-gpm --enable-acl --with-x=no \ --disable-gui --enable-multibyte --enable-cscope \ --disable-netbeans --enable-perlinterp --disable-pythoninterp \ - --disable-rubyinterp + --disable-rubyinterp --disable-luainterp make @@ -84,7 +84,7 @@ build() { --with-features=big --enable-gpm --enable-acl --with-x=yes \ --enable-gui=gtk2 --enable-multibyte --enable-cscope \ --enable-netbeans --enable-perlinterp --enable-pythoninterp \ - --enable-python3interp --enable-rubyinterp + --enable-python3interp --enable-rubyinterp --enable-luainterp make } @@ -119,7 +119,7 @@ package_vim() { package_gvim() { pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)' depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt' - 'desktop-file-utils' 'gtk2') + 'desktop-file-utils' 'gtk2' 'lua') provides=("vim=${pkgver}-${pkgrel}") conflicts=('vim') install=gvim.install diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index da74448ea..b148f188f 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,46 +1,45 @@ -# $Id: PKGBUILD 138761 2011-09-27 20:42:01Z ibiru $ +# $Id: PKGBUILD 142354 2011-11-08 18:38:40Z ibiru $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=xulrunner -pkgver=7.0 -_ffoxver=7.0 -pkgrel=1 +pkgver=8.0 +_ffoxver=8.0 +pkgrel=2 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') -depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify') -makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa') +depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa') url="http://wiki.mozilla.org/XUL:Xul_Runner" source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}.source.tar.bz2 mozconfig mozilla-pkgconfig.patch) -options=('!emptydirs' '!buildflags') +options=('!emptydirs') replaces=('xulrunner-oss') -md5sums=('673a015a23e3fefa18d80db68c8b9fc1' - '108a53313284908cc3afe5e29a7557e9' +md5sums=('9395a5be13da119bd8d53c3225e5d17c' + '8dfb78c5bd0581c8cf4753813132bf0b' '639ea80e823543dd415b90c0ee804186') build() { - cd "${srcdir}/mozilla-release" - cp "${srcdir}/mozconfig" .mozconfig + cd "$srcdir/mozilla-release" + cp "$srcdir/mozconfig" .mozconfig #fix libdir/sdkdir - fedora - patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch" + patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" - export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-${pkgver} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" } package() { - cd "${srcdir}/mozilla-release" - make -j1 -f client.mk DESTDIR="${pkgdir}" install + cd "$srcdir/mozilla-release" + make -j1 -f client.mk DESTDIR="$pkgdir" install # 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 + install -d $pkgdir/etc/ld.so.conf.d + echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf - #wtf mozilla! 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.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" } diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig index 96e8a6bd9..82a6ae512 100644 --- a/extra/xulrunner/mozconfig +++ b/extra/xulrunner/mozconfig @@ -2,6 +2,8 @@ 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 @@ -9,47 +11,28 @@ 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 -ac_add_options --enable-default-toolkit=cairo-gtk2 +# Features ac_add_options --enable-safe-browsing -ac_add_options --enable-extensions=default ac_add_options --enable-startup-notification -ac_add_options --enable-pango -ac_add_options --enable-svg -ac_add_options --enable-canvas -ac_add_options --enable-smil -ac_add_options --enable-canvas3d -ac_add_options --enable-places -ac_add_options --enable-shared-js -ac_add_options --enable-url-classifier - -ac_add_options --enable-optimize -ac_add_options --enable-strip -ac_add_options --enable-install-strip -ac_add_options --enable-jemalloc -ac_add_options --enable-xterm-updates -ac_add_options --enable-printing -ac_add_options --enable-xinerama +ac_add_options --enable-gio -ac_add_options --disable-javaxpcom +ac_add_options --disable-gnomevfs ac_add_options --disable-crashreporter ac_add_options --disable-updater ac_add_options --disable-tests -ac_add_options --disable-xprint ac_add_options --disable-mochitest -ac_add_options --disable-debug ac_add_options --disable-installer -ac_add_options --disable-pedantic -ac_add_options --enable-gio -ac_add_options --disable-gnomevfs -ac_add_options --enable-libnotify +# Optimization +ac_add_options --enable-optimize -export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1 -- cgit v1.2.3-54-g00ecf