diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-30 10:55:42 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-30 10:55:42 +0200 |
| commit | d9a9508e07a00015e2a2f278719a9665ff565961 (patch) | |
| tree | 97ddb1c2607a58c2a632da571b281641dfdf9df2 /core | |
| parent | 0a2ba65e7cf7d8d0452654b2f25cbb84a89fe7cf (diff) | |
| parent | b7cd4b184f75d3d2b54b356e08f296df3a9afb38 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/buoh/PKGBUILD
core/openssl/PKGBUILD
extra/llvm/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pygobject/PKGBUILD
extra/pygobject2/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
testing/consolekit/PKGBUILD
testing/gnome-keyring/PKGBUILD
testing/lirc/PKGBUILD
testing/samba/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'core')
| -rw-r--r-- | core/glib2/PKGBUILD | 6 | ||||
| -rw-r--r-- | core/libffi/PKGBUILD | 12 | ||||
| -rw-r--r-- | core/openssl/PKGBUILD | 5 |
3 files changed, 15 insertions, 8 deletions
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 08d6c4710..46603ac2c 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 157012 2012-04-23 09:23:05Z ibiru $ +# $Id: PKGBUILD 157381 2012-04-28 09:25:44Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glib2 pkgver=2.32.1 -pkgrel=2 +pkgrel=3 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64 'mips64el') license=('LGPL') depends=('pcre' 'libffi') -makedepends=('pkgconfig' 'python2') +makedepends=('pkg-config' 'python2') optdepends=('python2: for gdbus-codegen') options=('!libtool' '!docs' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz diff --git a/core/libffi/PKGBUILD b/core/libffi/PKGBUILD index d89596d7d..725290584 100644 --- a/core/libffi/PKGBUILD +++ b/core/libffi/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 139471 2011-10-02 01:24:24Z ibiru $ +# $Id: PKGBUILD 157383 2012-04-28 09:25:57Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libffi -pkgver=3.0.10 +pkgver=3.0.11 pkgrel=1 pkgdesc="A portable, high level programming interface to various calling conventions" arch=('i686' 'x86_64' 'mips64el') url="http://sourceware.org/libffi" license=('MIT') depends=('glibc') +checkdepends=('dejagnu') options=('!libtool') install=libffi.install source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz) -md5sums=('79390673f5d07a8fb342bc09b5055b6f') +md5sums=('f69b9693227d976835b4857b1ba7d0e3') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -20,6 +21,11 @@ build() { make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index 64fc2220d..d34178ed1 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 156488 2012-04-19 14:22:45Z bisson $ +# $Id: PKGBUILD 157379 2012-04-28 09:02:47Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=openssl -_ver=1.0.1a +_ver=1.0.1b # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} #pkgver=$_ver @@ -51,6 +51,7 @@ build() { esac # mark stack as non-executable: http://bugs.archlinux.org/task/12434 + # workaround for PR#2771: OPENSSL_NO_TLS1_2_CLIENT ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ shared zlib enable-md2 ${optflags} \ "${openssltarget}" \ |