[arch-commits] Commit in libffi/trunk (PKGBUILD libffi-3.0.13-fix-include-path.patch)

[Stéphane Gaudreault]

    Date: Tuesday, May 28, 2013 @ 13:50:26
  Author: stephane
Revision: 186527

upgpkg: libffi 3.0.13-3

revert last commit as it seems that upstream want header files in /usr/lib ...

Modified:
  libffi/trunk/PKGBUILD
Deleted:
  libffi/trunk/libffi-3.0.13-fix-include-path.patch

--------------------------------------+
 PKGBUILD                             |   13 ++----------
 libffi-3.0.13-fix-include-path.patch |   34 ---------------------------------
 2 files changed, 3 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-28 10:50:24 UTC (rev 186526)
+++ PKGBUILD	2013-05-28 11:50:26 UTC (rev 186527)
@@ -4,7 +4,7 @@
 
 pkgname=libffi
 pkgver=3.0.13
-pkgrel=2
+pkgrel=3
 pkgdesc="A portable, high level programming interface to various calling conventions"
 arch=('i686' 'x86_64')
 url="http://sourceware.org/libffi/"
@@ -13,16 +13,9 @@
 checkdepends=('dejagnu')
 options=('!libtool')
 install=libffi.install
-source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz
-        libffi-3.0.13-fix-include-path.patch)
-sha1sums=('f5230890dc0be42fb5c58fbf793da253155de106'
-          '45652f78dc51f325ed85cd277af051afa419acf2')
+source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
+sha1sums=('f5230890dc0be42fb5c58fbf793da253155de106')
 
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ../libffi-3.0.13-fix-include-path.patch
-}
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --disable-static

Deleted: libffi-3.0.13-fix-include-path.patch
===================================================================
--- libffi-3.0.13-fix-include-path.patch	2013-05-28 10:50:24 UTC (rev 186526)
+++ libffi-3.0.13-fix-include-path.patch	2013-05-28 11:50:26 UTC (rev 186527)
@@ -1,34 +0,0 @@
-diff -up libffi-3.0.13/include/Makefile.am.fixpath libffi-3.0.13/include/Makefile.am
---- libffi-3.0.13/include/Makefile.am.fixpath	2013-05-25 22:11:25.983889342 -0400
-+++ libffi-3.0.13/include/Makefile.am	2013-05-25 22:12:12.337890037 -0400
-@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
- DISTCLEANFILES=ffitarget.h
- EXTRA_DIST=ffi.h.in ffi_common.h
- 
--includesdir = $(libdir)/@PACKAGE_NAME at -@PACKAGE_VERSION@/include
-+includesdir = $(includedir)/
- nodist_includes_HEADERS = ffi.h ffitarget.h
-diff -up libffi-3.0.13/include/Makefile.in.fixpath libffi-3.0.13/include/Makefile.in
---- libffi-3.0.13/include/Makefile.in.fixpath	2013-05-25 22:12:56.259890696 -0400
-+++ libffi-3.0.13/include/Makefile.in	2013-05-25 22:13:12.101890934 -0400
-@@ -250,7 +250,7 @@ top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign
- DISTCLEANFILES = ffitarget.h
- EXTRA_DIST = ffi.h.in ffi_common.h
--includesdir = $(libdir)/@PACKAGE_NAME at -@PACKAGE_VERSION@/include
-+includesdir = $(includedir)/
- nodist_includes_HEADERS = ffi.h ffitarget.h
- all: all-am
- 
-diff -up libffi-3.0.13/libffi.pc.in.fixpath libffi-3.0.13/libffi.pc.in
---- libffi-3.0.13/libffi.pc.in.fixpath	2013-05-25 22:14:21.037891968 -0400
-+++ libffi-3.0.13/libffi.pc.in	2013-05-25 22:14:31.652892128 -0400
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=${libdir}/@PACKAGE_NAME at -@PACKAGE_VERSION@/include
-+includedir=@includedir@
- 
- Name: @PACKAGE_NAME@
- Description: Library supporting Foreign Function Interfaces