summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/hal/ChangeLog6
-rw-r--r--sys-apps/hal/files/0.5.9/24_libparted_1_8_7.patch17
2 files changed, 14 insertions, 9 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index d4bb664c2111..eaa9cad3c6e4 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/hal
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.200 2007/08/01 13:51:20 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.201 2007/08/01 21:42:41 cardoe Exp $
+
+ 01 Aug 2007; Doug Goldstein <cardoe@gentoo.org>
+ files/0.5.9/24_libparted_1_8_7.patch:
+ refresh 24_libparted_1_8_7.patch
01 Aug 2007; Doug Goldstein <cardoe@gentoo.org>
+files/0.5.9/24_libparted_1_8_7.patch, files/0.5.9/series,
diff --git a/sys-apps/hal/files/0.5.9/24_libparted_1_8_7.patch b/sys-apps/hal/files/0.5.9/24_libparted_1_8_7.patch
index 7d4051b8faca..60493361520a 100644
--- a/sys-apps/hal/files/0.5.9/24_libparted_1_8_7.patch
+++ b/sys-apps/hal/files/0.5.9/24_libparted_1_8_7.patch
@@ -8,18 +8,20 @@ updated allowed libparted versions
Updated again the list of allowed liparted version by add v1.8.7
---
---- a/configure.in
-+++ b/configure.in
-@@ -244,7 +244,7 @@ if test "x$use_parted" = "xyes" ; then
+Index: b/configure.in
+===================================================================
+--- a/configure.in 2007-04-30 14:58:50.000000000 -0400
++++ b/configure.in 2007-08-01 17:38:20.000000000 -0400
+@@ -193,7 +193,7 @@
AC_DEFINE(USE_PARTED,1,[Whether libparted is to be used])
AC_CHECK_LIB(uuid, uuid_generate, [], AC_MSG_ERROR([*** uuid library (libuuid) not found]))
AC_CHECK_LIB(dl, dlopen, [], AC_MSG_ERROR([*** dl library (libdl) not found]))
- AC_MSG_CHECKING([for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6])
+ AC_MSG_CHECKING([for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6, 1.8.7])
LDFLAGS=-lparted
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ AC_TRY_RUN(
#include <stdio.h>
-@@ -262,13 +262,14 @@ if test "x$use_parted" = "xyes" ; then
+@@ -211,12 +211,13 @@
(major == 1 && minor == 8 && micro == 0) ||
(major == 1 && minor == 8 && micro == 1) ||
(major == 1 && minor == 8 && micro == 2) ||
@@ -30,9 +32,8 @@ Updated again the list of allowed liparted version by add v1.8.7
return 1;
}
- ]])], AC_MSG_RESULT([]),
-- AC_MSG_ERROR([*** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2 or 1.8.6]))
-+ AC_MSG_ERROR([*** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2/1.8.6 or 1.8.7]))
+- ,AC_MSG_RESULT( ),AC_MSG_ERROR([*** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2 or 1.8.6]) )
++ ,AC_MSG_RESULT( ),AC_MSG_ERROR([*** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2/1.8.6 or 1.8.7]) )
PARTED_LIBS=-lparted
AC_SUBST(PARTED_LIBS)
LDFLAGS=