Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (5ec88c10b9030395503b32ffc1f707df1deeaa61)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (5ec88c10b9030395503b32ffc1f707df1deeaa61)
  • Date: Tue, 25 Jul 2006 02:21:41 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

printer/cups/DEPENDS | 5 ++++-
printer/cups/HISTORY | 3 +++
utils/dbus/HISTORY | 3 +++
utils/dbus/UP_TRIGGERS | 2 +-
utils/hal/DEPENDS | 3 +--
utils/hal/DETAILS | 2 +-
utils/hal/HISTORY | 7 +++++++
utils/hal/PRE_BUILD | 3 +++
utils/hal/dbus.patch | 24 ++++++++++++++++++++++++
9 files changed, 47 insertions(+), 5 deletions(-)

New commits:
commit 8b5f2088c799524c9f222daa0f2ea08aeca1e286
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

hal - fix for dbus changes

commit 4404751d664262ec57a32d711da18181c69d758d
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

cups - add dependency on dbus

commit d30c12eec2a63e2b086996a1256b8ada39fa9cb0
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

dbus - fix UP_TRIGGERS

diff --git a/printer/cups/DEPENDS b/printer/cups/DEPENDS
index 16f62eb..51129f4 100755
--- a/printer/cups/DEPENDS
+++ b/printer/cups/DEPENDS
@@ -3,7 +3,10 @@ depends jpeg
depends tiff &&
depends libpng &&
depends g++ &&
-
+optional_depends "dbus" \
+ "--enable-dbus" \
+ "--disable-dbus" \
+ "hardware notifications" &&
optional_depends "linux-pam" \
"--enable-pam" \
"--disable-pam" \
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index 54a7b4f..fa92f94 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,6 @@
+2006-07-25 Treeve Jelbert <treeve01 AT pi.be>
+ * DEPENDS: add optional dbus
+
2006-07-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: added g++ #12871

diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index edc2d5e..da2e219 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2006-07-25 Treeve Jelbert <treeve01 AT pi.be>
+ * UP_TRIGGERS: adjust to new libdbus.so.3
+
2006-07-24 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 0.91
* DEPENDS: add X11-LIBS
diff --git a/utils/dbus/UP_TRIGGERS b/utils/dbus/UP_TRIGGERS
index 2b54d06..abc755c 100755
--- a/utils/dbus/UP_TRIGGERS
+++ b/utils/dbus/UP_TRIGGERS
@@ -8,7 +8,7 @@ if spell_ok $SPELL; then
message "Figuring out what spells need to be recast, this may take a
while."
for each in $(show_up_depends $SPELL); do
if gaze install $each | xargs readelf -d 2> /dev/null |
- grep -q "NEEDED.*libdbus\(\|_cxx\)-1.so.1"; then
+ grep -q "NEEDED.*libdbus\(\|_cxx\)-1.so.2"; then
up_trigger $each cast_self
fi
done
diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index 8f6243c..876dede 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -1,7 +1,6 @@
-depends dbus &&
+depends dbus-glib &&
depends gawk &&
depends glib2 &&
-#depends hotplug &&
depends intltool &&
depends libcap &&
depends libtool &&
diff --git a/utils/hal/DETAILS b/utils/hal/DETAILS
index 717b692..e7bfbec 100755
--- a/utils/hal/DETAILS
+++ b/utils/hal/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
WEB_SITE=http://freedesktop.org/Software/hal
ENTERED=20040904
- UPDATED=20051202
+ PATCHLEVEL=1
LICENSE[0]=GPL
KEYWORDS="utils"
SHORT="A hardware abstraction layer library"
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index 4bf7df6..1187812 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,10 @@
+2006-07-25 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: PATCHLEVEL++
+ * DEPENDS: change dbus -> dbus-glib
+ * PRE_BUILD, dbus.patch : add
+ patch for dbus api change
+ see
<http://lists.freedesktop.org/archives/hal/2006-July/005596.html>
+
2006-06-28 Eric Sandall <eric AT sandall.us>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/utils/hal/PRE_BUILD b/utils/hal/PRE_BUILD
new file mode 100755
index 0000000..5c5f3cd
--- /dev/null
+++ b/utils/hal/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/dbus.patch
diff --git a/utils/hal/dbus.patch b/utils/hal/dbus.patch
new file mode 100644
index 0000000..b1b745a
--- /dev/null
+++ b/utils/hal/dbus.patch
@@ -0,0 +1,24 @@
+diff -uNr hal-0.5.7/tools/hal-device.c hal-0.5.7.cp/tools/hal-device.c
+--- hal-0.5.7/tools/hal-device.c 2005-11-02 16:38:14.000000000 +0100
++++ hal-0.5.7.cp/tools/hal-device.c 2006-07-25 09:07:13.000000000 +0200
+@@ -155,7 +155,7 @@
+
+ libhal_ctx_shutdown(hal_ctx, &error);
+ libhal_ctx_free(hal_ctx);
+- dbus_connection_disconnect(conn);
++ dbus_connection_close(conn);
+ dbus_connection_unref(conn);
+ dbus_error_free(&error);
+
+diff -uNr hal-0.5.7/tools/lshal.c hal-0.5.7.cp/tools/lshal.c
+--- hal-0.5.7/tools/lshal.c 2006-02-13 15:35:31.000000000 +0100
++++ hal-0.5.7.cp/tools/lshal.c 2006-07-25 09:08:02.000000000 +0200
+@@ -701,7 +701,7 @@
+ libhal_ctx_shutdown (hal_ctx, &error);
+ libhal_ctx_free (hal_ctx);
+
+- dbus_connection_disconnect (conn);
++ dbus_connection_close (conn);
+ dbus_connection_unref (conn);
+
+ if (show_device)



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (5ec88c10b9030395503b32ffc1f707df1deeaa61), Treeve Jelbert, 07/25/2006

Archive powered by MHonArc 2.6.24.

Top of Page