From dc6e1506ec7772b5389ed8694df0979cc45524c2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 6 Jun 2014 05:22:23 +0200 Subject: [PATCH] libffi: update to 3.1 (soname bump); revbump pkgs that link against libffi. --- common/shlibs | 2 +- srcpkgs/MesaLib/template | 2 +- srcpkgs/cjs/template | 2 +- srcpkgs/firefox/template | 2 +- srcpkgs/gjs/template | 2 +- srcpkgs/gobject-introspection/template | 2 +- srcpkgs/guile/template | 2 +- srcpkgs/hardinfo/template | 2 +- srcpkgs/lgi/template | 2 +- srcpkgs/libffi/template | 15 +++++++++++---- srcpkgs/llvm/template | 2 +- srcpkgs/newlisp/template | 2 +- srcpkgs/p11-kit/template | 2 +- srcpkgs/pygobject2/template | 2 +- srcpkgs/python/template | 2 +- srcpkgs/python3/template | 2 +- srcpkgs/ruby/template | 2 +- srcpkgs/squeak/template | 2 +- srcpkgs/thunderbird/template | 2 +- srcpkgs/wayland/template | 2 +- 20 files changed, 30 insertions(+), 23 deletions(-) diff --git a/common/shlibs b/common/shlibs index 3e0f8096a3f..21515d6bceb 100644 --- a/common/shlibs +++ b/common/shlibs @@ -186,7 +186,7 @@ libgettextpo.so.0 gettext-libs-0.17_1 libattr.so.1 attr-2.4.43_1 libacl.so.1 acl-2.2.47_1 libpython2.7.so.1.0 python-2.7_1 -libffi.so.5 libffi-3.0.8_1 +libffi.so.6 libffi-3.1_1 libcrack.so.2 libcracklib-2.8.22_2 libpam.so.0 pam-libs-1.1.6_3 libpamc.so.0 pam-libs-1.1.6_3 diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template index 034b8bcf46f..9c2ca4ea72a 100644 --- a/srcpkgs/MesaLib/template +++ b/srcpkgs/MesaLib/template @@ -1,7 +1,7 @@ # Template build file for 'MesaLib'. pkgname=MesaLib version=10.1.4 -revision=4 +revision=5 wrksrc="Mesa-${version}" build_style=gnu-configure configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template index 9aa9f708d75..dae642242c1 100644 --- a/srcpkgs/cjs/template +++ b/srcpkgs/cjs/template @@ -1,7 +1,7 @@ # Template file for 'cjs' pkgname=cjs version=2.0.0 -revision=5 +revision=6 short_desc="Javascript for Cinnamon" build_style=gnu-configure configure_args=" --disable-static" diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 437a1da4481..19956eb7c30 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -1,7 +1,7 @@ # Template build file for 'firefox'. pkgname=firefox version=29.0.1 -revision=1 +revision=2 wrksrc=mozilla-release short_desc="Lightweight gecko-based web browser" maintainer="Juan RP " diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index 06e7f7f9de1..099042a6f8d 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -1,7 +1,7 @@ # Template file for 'gjs' pkgname=gjs version=1.40.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config intltool gobject-introspection>=1.40" makedepends="libffi-devel libgirepository-devel>=1.40 dbus-glib-devel diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template index 34260153cba..dd102dd16f6 100644 --- a/srcpkgs/gobject-introspection/template +++ b/srcpkgs/gobject-introspection/template @@ -1,7 +1,7 @@ # Template file for 'gobject-introspection' pkgname=gobject-introspection version=1.40.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-tests --disable-static" hostmakedepends="pkg-config flex libtool" diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template index e58c46ff60b..83bb957de01 100644 --- a/srcpkgs/guile/template +++ b/srcpkgs/guile/template @@ -1,7 +1,7 @@ # Template build file for 'guile'. pkgname=guile version=2.0.9 -revision=4 +revision=5 build_style=gnu-configure configure_args="--disable-static --disable-error-on-warning" hostmakedepends="pkg-config texinfo" diff --git a/srcpkgs/hardinfo/template b/srcpkgs/hardinfo/template index fe013d4cda3..d2a3b646e8d 100644 --- a/srcpkgs/hardinfo/template +++ b/srcpkgs/hardinfo/template @@ -1,7 +1,7 @@ # Template file for 'hardinfo' pkgname=hardinfo version=0.5.1 -revision=1 +revision=2 hostmakedepends="pkg-config which" makedepends="gtk+-devel libsoup-devel desktop-file-utils" depends="desktop-file-utils" diff --git a/srcpkgs/lgi/template b/srcpkgs/lgi/template index 19b7ae73f78..9f6825bca5b 100644 --- a/srcpkgs/lgi/template +++ b/srcpkgs/lgi/template @@ -1,7 +1,7 @@ # Template file for 'lgi' pkgname=lgi version=0.7.2 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="libglib-devel libffi-devel lua-devel>=5.2 diff --git a/srcpkgs/libffi/template b/srcpkgs/libffi/template index ddea79da093..f561ec93dc7 100644 --- a/srcpkgs/libffi/template +++ b/srcpkgs/libffi/template @@ -1,7 +1,7 @@ # Template file for 'libffi' pkgname=libffi -version=3.0.10 -revision=5 +version=3.1 +revision=1 build_style=gnu-configure configure_args="--includedir=/usr/include --with-pic=yes" short_desc="Library supporting Foreign Function Interfaces" @@ -9,21 +9,28 @@ maintainer="Juan RP " homepage="http://sourceware.org/libffi" license="MIT" distfiles="ftp://sourceware.org/pub/$pkgname/$pkgname-$version.tar.gz" -checksum=f01eb9027e9eb56aeaeef636649877756d475d714ef8b47f627f65bc5f3b492f +checksum=97feeeadca5e21870fa4433bc953d1b3af3f698d5df8a428f68b73cd60aef6eb + +pre_install() { + vmkdir usr/lib + ln -s lib ${DESTDIR}/usr/lib64 +} post_install() { # Fix includedir for pkg-config file. sed -i -e "s|\${libdir}/libffi-${version}|/usr|" \ ${DESTDIR}/usr/lib/pkgconfig/libffi.pc vinstall LICENSE 644 usr/share/licenses/libffi + rm ${DESTDIR}/usr/lib64 } libffi-devel_package() { - depends="libffi>=${version}" + depends="libffi>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig vmove usr/share } diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template index efd38da99b9..afef9e10888 100644 --- a/srcpkgs/llvm/template +++ b/srcpkgs/llvm/template @@ -2,7 +2,7 @@ pkgname=llvm version=3.4.1 wrksrc="llvm-${version}.src" -revision=1 +revision=2 lib32disabled=yes configure_args="--disable-expensive-checks --disable-debug-runtime --enable-bindings=none --enable-optimize --enable-shared --enable-libffi diff --git a/srcpkgs/newlisp/template b/srcpkgs/newlisp/template index f9580693a7a..1068fa73bb0 100644 --- a/srcpkgs/newlisp/template +++ b/srcpkgs/newlisp/template @@ -1,7 +1,7 @@ # Template file for 'newlisp' pkgname=newlisp version=10.5.4 -revision=2 +revision=3 hostmakedepends="which" makedepends="readline-devel>=6.3 libffi-devel" short_desc="Lisp-like, general-purpose scripting language" diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template index b1592eaec43..289f9ce9ec3 100644 --- a/srcpkgs/p11-kit/template +++ b/srcpkgs/p11-kit/template @@ -1,7 +1,7 @@ # Template file for 'p11-kit' pkgname=p11-kit version=0.20.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-module-path=/usr/lib/pkcs11 --without-trust-paths" hostmakedepends="pkg-config" diff --git a/srcpkgs/pygobject2/template b/srcpkgs/pygobject2/template index 2118a43e95e..9451918f7b6 100644 --- a/srcpkgs/pygobject2/template +++ b/srcpkgs/pygobject2/template @@ -1,7 +1,7 @@ # Template file for 'pygobject2' pkgname=pygobject2 version=2.28.6 -revision=9 +revision=10 wrksrc=${pkgname%2}-${version} lib32disabled=yes build_style=gnu-configure diff --git a/srcpkgs/python/template b/srcpkgs/python/template index 6ee54eaa610..f2aefff30b8 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -1,7 +1,7 @@ # Template build file for 'python'. pkgname=python version=2.7.7 -revision=2 +revision=3 wrksrc="Python-${version}" hostmakedepends="pkg-config" makedepends="libffi-devel readline-devel>=6.3 gdbm-devel openssl-devel expat-devel sqlite-devel bzip2-devel zlib-devel" diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index ecc12d32113..01e676f07c2 100644 --- a/srcpkgs/python3/template +++ b/srcpkgs/python3/template @@ -1,7 +1,7 @@ # Template build file for 'python3'. pkgname=python3 version=3.3.5 -revision=1 +revision=2 wrksrc="Python-${version}" short_desc="Interpreted, interactive, object-oriented programming language (3.x series)" maintainer="Juan RP " diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template index 26294adbb8b..c8a1e412826 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -5,7 +5,7 @@ _ruby_distver="${_ruby_ver}-${_ruby_distpatchver}" pkgname=ruby version="${_ruby_ver}${_ruby_distpatchver}" -revision=1 +revision=2 wrksrc="${pkgname}-${_ruby_distver}" build_style=gnu-configure configure_args="--enable-shared --disable-rpath diff --git a/srcpkgs/squeak/template b/srcpkgs/squeak/template index 7bcef6745ab..0e22f95f394 100644 --- a/srcpkgs/squeak/template +++ b/srcpkgs/squeak/template @@ -1,7 +1,7 @@ # Template file for 'squeak' pkgname=squeak version=4.10.2.2614 -revision=1 +revision=2 build_style=gnu-configure wrksrc="Squeak-${version}-src" configure_script="./unix/cmake/configure" diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index b2ff0b7fbdd..3938bb328ec 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -1,7 +1,7 @@ # Template build file for 'thunderbird'. pkgname=thunderbird version=24.5.0 -revision=1 +revision=2 lib32disabled=yes wrksrc="comm-esr24" short_desc="Standalone Mail/News reader" diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template index b660dac7330..1cece6af724 100644 --- a/srcpkgs/wayland/template +++ b/srcpkgs/wayland/template @@ -1,7 +1,7 @@ # Template file for 'wayland'. pkgname=wayland version=1.5.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-documentation --disable-static" hostmakedepends="pkg-config flex"