SOURCES: hal-link.patch - 0.5.11rc2 - still rc2 but fixes a major ...

patrys patrys at pld-linux.org
Wed Apr 30 20:27:34 CEST 2008


Author: patrys                       Date: Wed Apr 30 18:27:34 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 0.5.11rc2
- still rc2 but fixes a major crasher: https://bugzilla.novell.com/show_bug.cgi?id=334106
- also used by openSUSE
- patch1 & patch3 fixed upstream

---- Files affected:
SOURCES:
   hal-link.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/hal-link.patch
diff -u SOURCES/hal-link.patch:1.3 SOURCES/hal-link.patch:1.4
--- SOURCES/hal-link.patch:1.3	Wed Oct 31 21:03:27 2007
+++ SOURCES/hal-link.patch	Wed Apr 30 20:27:29 2008
@@ -2,21 +2,12 @@
 +++ hal-0.5.10/configure.in	2007-10-31 20:20:27.462450588 +0100
 @@ -242,8 +242,8 @@
  if test "x$use_parted" = "xyes" ; then
-    USE_PARTED=yes
-    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_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, 1.8.7, 1.8.8])
-    LDFLAGS=-lparted
-    AC_RUN_IFELSE([AC_LANG_SOURCE([[
-@@ -386,7 +386,7 @@
- dnl Check libusb
- AC_CHECK_HEADERS([usb.h], [USE_LIBUSB=yes], [USE_LIBUSB=no])
- if test "x$USE_LIBUSB" = "xyes"; then
--	AC_CHECK_LIB([usb], [usb_find_devices], [], [USE_LIBUSB=no])
-+	AC_CHECK_LIB([usb], [usb_find_devices], [:], [USE_LIBUSB=no])
- fi
- AM_CONDITIONAL([HAVE_LIBUSB],[test "x$USE_LIBUSB" = "xyes"])
+   USE_PARTED=yes
+   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_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 or >= 1.8.0])
+   if ! $PKG_CONFIG --atleast-version 1.8.0 libparted; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/hal-link.patch?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list