[arch-commits] Commit in hal/repos (3 files)

[Jan de Groot]

    Date: Saturday, November 15, 2008 @ 19:42:22
  Author: jgc
Revision: 19173

Merged revisions 19172 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/hal/trunk

........
  r19172 | jgc | 2008-11-16 01:41:57 +0100 (Sun, 16 Nov 2008) | 2 lines
  
  upgpkg: hal 0.5.11-7
      Add patch to fix libtool/autotools problem. Run the whole auto* thing to get the HAVE_CK_0_3 define correct
........

Added:
  hal/repos/testing-i686/libtool-fix.patch
    (from rev 19172, hal/trunk/libtool-fix.patch)
Modified:
  hal/repos/testing-i686/	(properties)
  hal/repos/testing-i686/PKGBUILD

-------------------+
 PKGBUILD          |   15 +++++++++++----
 libtool-fix.patch |   10 ++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)


Property changes on: hal/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /hal/trunk:1-19170
   + /hal/trunk:1-19172

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-11-16 00:41:57 UTC (rev 19172)
+++ testing-i686/PKGBUILD	2008-11-16 00:42:22 UTC (rev 19173)
@@ -4,7 +4,7 @@
 
 pkgname=hal
 pkgver=0.5.11
-pkgrel=6
+pkgrel=7
 pkgdesc="Hardware Abstraction Layer"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
@@ -20,7 +20,8 @@
 	ntfs3g-valid-options.patch
 	fix-udev-compatibility.patch
 	ntfs-mount-fix.patch
-	consolekit-0.3.patch)
+	consolekit-0.3.patch
+	libtool-fix.patch)
 md5sums=('5e8935ab61bcb14afd2d4548084aace0'
          '277e96ac130d7bfce0b30f0b80db8782'
          'c688a3c6574699365926f4fef7441545'
@@ -28,7 +29,8 @@
          '4242a2c78885e396f639d0cd5e33218c'
          '1a33d73fa422df2f05b7e3483836f778'
          '96cf8835c30dc581c4fcf72b6ad7675e'
-	 'ad73507bbf4a7dd350072ab8ea61bb96')
+	 'ad73507bbf4a7dd350072ab8ea61bb96'
+	 '89b38c39c395d55a9575a76e5c6cd759')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -37,10 +39,15 @@
   patch -Np0 -i ${startdir}/src/ntfs3g-valid-options.patch || return 1
   # Fix compatibility with udev 126 and later
   patch -Np1 -i ${startdir}/src/fix-udev-compatibility.patch || return 1
-  patch -p0 -i ${srcdir}/ntfs-mount-fix.patch || return 1
+  patch -Np0 -i ${srcdir}/ntfs-mount-fix.patch || return 1
   patch -Np1 -i ${srcdir}/consolekit-0.3.patch || return 1
+  patch -Np0 -i ${srcdir}/libtool-fix.patch || return 1
 
+  libtoolize --force || return 1
+  aclocal || return 1
   autoconf || return 1
+  autoheader || return 1
+  automake || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --libexecdir=/usr/lib/hal --enable-static=no \

Copied: hal/repos/testing-i686/libtool-fix.patch (from rev 19172, hal/trunk/libtool-fix.patch)
===================================================================
--- testing-i686/libtool-fix.patch	                        (rev 0)
+++ testing-i686/libtool-fix.patch	2008-11-16 00:42:22 UTC (rev 19173)
@@ -0,0 +1,10 @@
+--- configure.in.orig	2008-11-16 01:36:22.000000000 +0100
++++ configure.in	2008-11-16 01:18:27.000000000 +0100
+@@ -30,6 +30,7 @@
+ AC_ISC_POSIX
+ AC_PROG_CC
+ AM_PROG_CC_C_O
++AC_PROG_CXX
+ AC_HEADER_STDC
+ AC_PROG_LIBTOOL
+ AC_PROG_MAKE_SET