sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (de25ecfc506f9016c8d739886d36e43344bdaba2)

From: Treeve Jelbert <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (de25ecfc506f9016c8d739886d36e43344bdaba2)
Date: Mon, 24 Sep 2007 14:42:47 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

utils/hal/BUILD | 16 ++++--
utils/hal/CONFIGURE | 14 +++++
utils/hal/DEPENDS | 6 ++
utils/hal/DETAILS | 4 -
utils/hal/HISTORY | 17 ++++++
utils/hal/PRE_BUILD | 6 --
utils/hal/hal-0.5.8.1-hal-device-dbus-close.patch | 11 ----
utils/hal/hal-0.5.8.1-lshal-dbus-close.patch | 11 ----
utils/hal/libparted_check.patch | 54
+++++++++++-----------
9 files changed, 77 insertions(+), 62 deletions(-)

New commits:
commit de25ecfc506f9016c8d739886d36e43344bdaba2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

hal-0.5.9.1

diff --git a/utils/hal/BUILD b/utils/hal/BUILD
index cc073b0..830c9b8 100755
--- a/utils/hal/BUILD
+++ b/utils/hal/BUILD
@@ -1,7 +1,11 @@
-LDFLAGS="-lz $LDFLAGS" &&
-if [ "$SELINUX" == "y" ]; then
- OPTS="$OPTS --enable-selinux"
-fi &&
+#LDFLAGS="-lz $LDFLAGS" &&
+#if [ "$SELINUX" == "y" ]; then
+# OPTS="$OPTS --enable-selinux"
+#fi &&
OPTS="$OPTS --with-pid-file=/var/run/hald.pid \
- --enable-sysfs-carrier --enable-hotplug-map --disable-policy-kit"
&&
-PKG_CONFIG="/usr/bin/pkg-config" default_build
+ --with-backend=linux \
+ $HALACPI $HALAPM $HALSONY $HALPMU" &&
+default_build
+# --enable-sysfs-carrier --enable-hotplug-map \
+# --disable-policy-kit" &&
+#PKG_CONFIG="/usr/bin/pkg-config" default_build
diff --git a/utils/hal/CONFIGURE b/utils/hal/CONFIGURE
index b9fa0b0..a413e91 100755
--- a/utils/hal/CONFIGURE
+++ b/utils/hal/CONFIGURE
@@ -1 +1,13 @@
-config_query SELINUX "Enable SELinux support?" n
+#config_query SELINUX "Enable SELinux support?" n
+config_query_option HALSONY "Sony PIC support?" n \
+ "--enable-sonypic" \
+ "--disable-sonypic"
+config_query_option HALACPI "ACPI support?" n \
+ "--enable-acpi" \
+ "--disable-acpi"
+config_query_option HALAPM "APM support?" n \
+ "--enable-apm" \
+ "--disable-apm"
+config_query_option HALPMU "PMU support?" n \
+ "--enable-pmu" \
+ "--disable-pmu"
diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index 59cb7c0..7b55f5d 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -8,11 +8,17 @@ depends python &&
depends udev &&
depends xml-parser-expat &&
depends pkgconfig &&
+depends hal-info &&
depends dbus-python &&

# bug #13500
sub_depends udev VOLUME_ID &&

+#optional_depends consolekit \
+# "--enable-console-kit" \
+# "--disable-console-kit" \
+# "ConsoleKit support" &&
+
#optional_depends polkit \
# "--enable-policy-kit" \
# "--disable-policy-kit" \
diff --git a/utils/hal/DETAILS b/utils/hal/DETAILS
index 2fd31a2..d1f61a9 100755
--- a/utils/hal/DETAILS
+++ b/utils/hal/DETAILS
@@ -1,6 +1,6 @@
SPELL=hal
- VERSION=0.5.8.1
-
SOURCE_HASH=sha512:044677b047517cd641f6b2e9f36cef7dd05ee035b636cd8c1d4900e300aa3b0ab5d979bd87e1bb7c4ba1689dd6546c91cca74400107a14b9a2d5f63278fd01c6
+ VERSION=0.5.9.1
+
SOURCE_HASH=sha512:0705eb15a406090829b4339cc0714acda8ebb11cf840e8c20d7e9a3ff7cca9ed48c55d323b3b14599becf87b079ed3e694cc1b46f1e87ec7237648bc4d456cda
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://freedesktop.org/~david/dist/$SOURCE
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index f224ff3..57d0211 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,20 @@
+2007-08-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * libparted_check.patch: updated for parted-1.8.8
+
+2007-06-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.5.9.1
+ * hal-0.5.8.1*.patch: deleted
+ * PRE_BUILD: don't apply redundant patches
+ remove macbook stuff
+ * DEPENDS: add optional consolekit
+ * CONFIGURE, BUILD:
+ remove obsolete options, add Sony, acpi, apm
+
+2007-05-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.5.9
+ * libparted_check.patch: updated
+ * DEPENDS: add hal-info
+
2007-05-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, hal-0.5.8.1-hal-device-dbus-close.patch: added another
patch to prevent incorrect use of the dbus API
diff --git a/utils/hal/PRE_BUILD b/utils/hal/PRE_BUILD
index a17aa0a..7684fc0 100755
--- a/utils/hal/PRE_BUILD
+++ b/utils/hal/PRE_BUILD
@@ -1,6 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p0 < ${SCRIPT_DIRECTORY}/libparted_check.patch &&
-patch -p1 < ${SCRIPT_DIRECTORY}/hal-0.5.8.1-lshal-dbus-close.patch &&
-patch -p1 < ${SCRIPT_DIRECTORY}/hal-0.5.8.1-hal-device-dbus-close.patch &&
-sed -i 's/use_macbookpro/with_macbookpro/' configure
+patch -p1 < ${SCRIPT_DIRECTORY}/libparted_check.patch
+#sed -i 's/use_macbookpro/with_macbookpro/' configure
diff --git a/utils/hal/hal-0.5.8.1-hal-device-dbus-close.patch
b/utils/hal/hal-0.5.8.1-hal-device-dbus-close.patch
deleted file mode 100644
index 57b4bea..0000000
--- a/utils/hal/hal-0.5.8.1-hal-device-dbus-close.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naupr hal-0.5.8.1.orig/tools/hal-device.c
hal-0.5.8.1/tools/hal-device.c
---- hal-0.5.8.1.orig/tools/hal-device.c 2007-05-09 16:18:19.000000000
+0200
-+++ hal-0.5.8.1/tools/hal-device.c 2007-05-09 16:40:06.000000000 +0200
-@@ -157,7 +157,6 @@ int main(int argc, char **argv)
-
- libhal_ctx_shutdown(hal_ctx, &error);
- libhal_ctx_free(hal_ctx);
-- dbus_connection_close(conn);
- dbus_connection_unref(conn);
- dbus_error_free(&error);
-
diff --git a/utils/hal/hal-0.5.8.1-lshal-dbus-close.patch
b/utils/hal/hal-0.5.8.1-lshal-dbus-close.patch
deleted file mode 100644
index 5c46b6f..0000000
--- a/utils/hal/hal-0.5.8.1-lshal-dbus-close.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naupr hal-0.5.8.1.orig/tools/lshal.c hal-0.5.8.1/tools/lshal.c
---- hal-0.5.8.1.orig/tools/lshal.c 2007-05-09 16:18:19.000000000 +0200
-+++ hal-0.5.8.1/tools/lshal.c 2007-05-09 16:20:44.000000000 +0200
-@@ -722,7 +722,6 @@ main (int argc, char *argv[])
- LIBHAL_FREE_DBUS_ERROR (&error);
- libhal_ctx_free (hal_ctx);
-
-- dbus_connection_close (conn);
- dbus_connection_unref (conn);
-
- if (show_device)
diff --git a/utils/hal/libparted_check.patch b/utils/hal/libparted_check.patch
index b75c1e5..d7d8131 100644
--- a/utils/hal/libparted_check.patch
+++ b/utils/hal/libparted_check.patch
@@ -1,35 +1,35 @@
---- configure.old 2006-09-19 22:24:41.000000000 +0200
-+++ configure 2006-12-02 10:34:32.000000000 +0100
-@@ -21658,9 +21658,9 @@
- echo "$as_me: error: *** dl library (libdl) not found" >&2;}
+diff -uNr hal-0.5.9.1/configure hal-0.5.9.1.cp/configure
+--- hal-0.5.9.1/configure 2007-06-12 20:27:26.000000000 +0200
++++ hal-0.5.9.1.cp/configure 2007-06-21 10:04:22.000000000 +0200
+@@ -22743,8 +22743,8 @@
{ (exit 1); exit 1; }; }
fi
--
-- echo "$as_me:$LINENO: checking for libparted == 1.7.1" >&5
--echo $ECHO_N "checking for libparted == 1.7.1... $ECHO_C" >&6
-+save_LDFLAGS="$LDFLAGS"
-+ echo "$as_me:$LINENO: checking for libparted >= 1.7.1" >&5
-+echo $ECHO_N "checking for libparted >= 1.7.1... $ECHO_C" >&6
+
+- { echo "$as_me:$LINENO: checking for libparted == 1.7.1, 1.8.0, 1.8.1,
1.8.2, 1.8.6" >&5
+-echo $ECHO_N "checking for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2,
1.8.6... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking for libparted == 1.7.1, 1.8.0, 1.8.1,
1.8.2, 1.8.6, 1.8.7" >&5
++echo $ECHO_N "checking for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6,
1.8.8... $ECHO_C" >&6; }
LDFLAGS=-lparted
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross
compiling
-@@ -21686,7 +21686,9 @@
- if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, &micro )
== 3 )
- printf( "Found libparted %s", ped_get_version() ) ;
-
-- return ! ( major == 1 && minor == 7 && micro == 1 ) ;
-+ return ! ((major > 1) ||
-+ ((major == 1) && (minor > 7)) ||
-+ ((major == 1) && (minor == 7) && (micro >= 1))) ;
- }
+@@ -22774,7 +22774,8 @@
+ (major == 1 && minor == 8 && micro == 0) ||
+ (major == 1 && minor == 8 && micro == 1) ||
+ (major == 1 && minor == 8 && micro == 2) ||
+- (major == 1 && minor == 8 && micro == 6))
++ (major == 1 && minor == 8 && micro == 6) ||
++ (major == 1 && minor == 8 && micro == 8))
+ return 0;

- _ACEOF
-@@ -21717,7 +21719,7 @@
- fi
- PARTED_LIBS=-lparted
+ return 1;
+@@ -22809,8 +22810,8 @@
+ sed 's/^/| /' conftest.$ac_ext >&5

-- LDFLAGS=
-+ LDFLAGS="$save_LDFLAGS"
- else
- USE_PARTED=no
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: *** Requires libparted ==
1.7.1/1.8.0/1.8.1/1.8.2 or 1.8.6" >&5
+-echo "$as_me: error: *** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2 or
1.8.6" >&2;}
++{ { echo "$as_me:$LINENO: error: *** Requires libparted ==
1.7.1/1.8.0/1.8.1/1.8.2 or 1.8.6/7" >&5
++echo "$as_me: error: *** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2 or
1.8.6/7/8" >&2;}
+ { (exit 1); exit 1; }; }
fi
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext
conftest.$ac_objext conftest.$ac_ext

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (de25ecfc506f9016c8d739886d36e43344bdaba2), Treeve Jelbert, 09/24/2007
- Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (de25ecfc506f9016c8d739886d36e43344bdaba2), David Brown, 09/24/2007
  - Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (de25ecfc506f9016c8d739886d36e43344bdaba2), Treeve Jelbert, 09/24/2007