Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e87f815605faf76812cd5951364dd165119419d6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e87f815605faf76812cd5951364dd165119419d6)
  • Date: Wed, 9 May 2007 09:45:01 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

utils/hal/DETAILS | 2 +-
utils/hal/HISTORY | 5 +++++
utils/hal/PRE_BUILD | 9 +++++----
utils/hal/hal-0.5.8.1-hal-device-dbus-close.patch | 11 +++++++++++
4 files changed, 22 insertions(+), 5 deletions(-)

New commits:
commit e87f815605faf76812cd5951364dd165119419d6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/hal: added another patch to prevent incorrect use of the dbus API

diff --git a/utils/hal/DETAILS b/utils/hal/DETAILS
index 798f0a1..2fd31a2 100755
--- a/utils/hal/DETAILS
+++ b/utils/hal/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
WEB_SITE=http://freedesktop.org/Software/hal
ENTERED=20040904
- PATCHLEVEL=1
+ PATCHLEVEL=2
LICENSE[0]=GPL
KEYWORDS="utils"
SHORT="A hardware abstraction layer library"
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index 7958bce..f224ff3 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,4 +1,9 @@
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
+ * DETAILS: bumped PATCHLEVEL
+
+2007-05-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, hal-0.5.8.1-lshal-dbus-close.patch: added patch to
prevent incorrect use of the dbus API
* DETAILS: added PATCHLEVEL
diff --git a/utils/hal/PRE_BUILD b/utils/hal/PRE_BUILD
index 5a1eff7..a17aa0a 100755
--- a/utils/hal/PRE_BUILD
+++ b/utils/hal/PRE_BUILD
@@ -1,5 +1,6 @@
-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 &&
+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
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
new file mode 100644
index 0000000..57b4bea
--- /dev/null
+++ b/utils/hal/hal-0.5.8.1-hal-device-dbus-close.patch
@@ -0,0 +1,11 @@
+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);
+



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e87f815605faf76812cd5951364dd165119419d6), Florian Franzmann, 05/09/2007

Archive powered by MHonArc 2.6.24.

Top of Page