diff options
| -rw-r--r-- | core/bash/PKGBUILD | 2 | ||||
| -rw-r--r-- | core/binutils/PKGBUILD | 2 | ||||
| -rw-r--r-- | core/coreutils/PKGBUILD | 2 | ||||
| -rw-r--r-- | core/ifenslave/PKGBUILD | 2 | ||||
| -rw-r--r-- | core/util-linux/PKGBUILD | 2 | ||||
| -rw-r--r-- | extra/mesa/PKGBUILD | 8 | ||||
| -rw-r--r-- | extra/pixman/PKGBUILD | 2 | ||||
| -rw-r--r-- | extra/poppler/PKGBUILD | 4 |
8 files changed, 14 insertions, 10 deletions
diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index 03b81ea83..6a5e3d935 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -6,7 +6,7 @@ pkgname=bash _basever=4.2 _patchlevel=010 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=2 +pkgrel=2.1 pkgdesc="The GNU Bourne Again shell" arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index 186070323..f81ad0e10 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -5,7 +5,7 @@ pkgname=binutils pkgver=2.21.1 -pkgrel=2.1 +pkgrel=2.2 _date=20110627 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64' 'mips64el') diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index a7d830e1e..8190cf341 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -4,7 +4,7 @@ pkgname=coreutils pkgver=8.14 -pkgrel=1 +pkgrel=1.1 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') diff --git a/core/ifenslave/PKGBUILD b/core/ifenslave/PKGBUILD index ac25efcb1..b5e4897a9 100644 --- a/core/ifenslave/PKGBUILD +++ b/core/ifenslave/PKGBUILD @@ -27,3 +27,5 @@ package() { install -Dm755 ifenslave "${pkgdir}"/sbin/ifenslave install -Dm644 bonding.conf.d "${pkgdir}"/etc/conf.d/bonding } +sha1sums=('627333f410809971409023fda6a8b1de419146ba' + '6843971c0254768868b556af33289d7d32d6208d') diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 61ef4e610..c732a46ae 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -4,7 +4,7 @@ pkgname=util-linux pkgver=2.20.1 -pkgrel=1 +pkgrel=1.1 pkgdesc="Miscellaneous system utilities for Linux" url="http://userweb.kernel.org/~kzak/util-linux-ng/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index c894476b5..9689c7c03 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -47,7 +47,13 @@ if [ "$CARCH" = "mips64el" ]; then patch -Np1 -i $srcdir/mesa-7.5-mips-wmb.patch patch -Np1 -i $srcdir/mesa-loongson.patch - ./configure --prefix=/usr \ + configure=configure + if [ ! -f configure ]; then + autoreconf -vfi + configure=autogen.sh + fi + + ./${configure} --prefix=/usr \ --enable-glx-tls \ --with-driver=xlib \ --enable-xcb \ diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD index da71f5bfc..5ee65c636 100644 --- a/extra/pixman/PKGBUILD +++ b/extra/pixman/PKGBUILD @@ -13,7 +13,7 @@ depends=('glibc') options=('!libtool') source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2 pixman-loongson2f.patch) -sha1sums=('a3b73c3ea6cada20d705203a394f574aa69e2177') +sha1sums=('a3b73c3ea6cada20d705203a394f574aa69e2177' 'ce4d69ea341f21fdc30f6d401ee479cd3571dab3') build() { diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 234825d30..7c57b8c27 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -20,14 +20,10 @@ md5sums=('d30e883a27423c936ef338ce1d967e2d' build() { cd "${srcdir}/${pkgbase}-${pkgver}" -<<<<<<< HEAD - patch -Np1 -i "${srcdir}/fix_cairo.patch" -======= sed -i -e '/AC_PATH_XTRA/d' configure.ac patch -Np1 -i "${srcdir}/git-fixes.patch" autoreconf -fi ->>>>>>> 3d151dfc8e08b65c2c1d4b5e8081562d56ee7d41 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ |