diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-03-16 07:18:46 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-03-16 07:18:46 +0800 |
| commit | b4e693806199ef57af55074657268a48930cf3ae (patch) | |
| tree | b99d1e25e10c96aaf3c5232f0ab4b591bc5e129f /sysutils/hal | |
| parent | 5d1300d15314aa0dbea487410d2aa1e04e15d8a9 (diff) | |
| download | marcuscom-ports-b4e693806199ef57af55074657268a48930cf3ae.tar marcuscom-ports-b4e693806199ef57af55074657268a48930cf3ae.tar.gz marcuscom-ports-b4e693806199ef57af55074657268a48930cf3ae.tar.bz2 marcuscom-ports-b4e693806199ef57af55074657268a48930cf3ae.tar.lz marcuscom-ports-b4e693806199ef57af55074657268a48930cf3ae.tar.xz marcuscom-ports-b4e693806199ef57af55074657268a48930cf3ae.tar.zst marcuscom-ports-b4e693806199ef57af55074657268a48930cf3ae.zip | |
Fix a crash on 64-bit platforms.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10756 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/hal')
| -rw-r--r-- | sysutils/hal/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/hal/files/patch-hald_device.c | 11 | ||||
| -rw-r--r-- | sysutils/hal/files/patch-hald_device_store.c | 12 |
3 files changed, 25 insertions, 1 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index c1f832e5d..c4b156929 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/hal/Makefile,v 1.37 2008/02/18 22:01:37 marcus Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.38 2008/03/15 18:32:12 marcus Exp $ # PORTNAME= hal DISTVERSION= 0.5.11rc1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ diff --git a/sysutils/hal/files/patch-hald_device.c b/sysutils/hal/files/patch-hald_device.c new file mode 100644 index 000000000..8e5ed0a73 --- /dev/null +++ b/sysutils/hal/files/patch-hald_device.c @@ -0,0 +1,11 @@ +--- hald/device.c.orig 2008-03-15 19:13:58.000000000 -0400 ++++ hald/device.c 2008-03-15 19:14:45.000000000 -0400 +@@ -871,7 +871,7 @@ hdpfe (gpointer key, + { + hdpfe_ud_t *c; + HalProperty *prop; +- const gchar *key_string = g_quark_to_string ((GQuark) key); ++ const gchar *key_string = g_quark_to_string ((GQuark) GPOINTER_TO_UINT(key)); + + c = (hdpfe_ud_t *) user_data; + prop = (HalProperty *) value; diff --git a/sysutils/hal/files/patch-hald_device_store.c b/sysutils/hal/files/patch-hald_device_store.c new file mode 100644 index 000000000..24bd1c2d3 --- /dev/null +++ b/sysutils/hal/files/patch-hald_device_store.c @@ -0,0 +1,12 @@ +--- hald/device_store.c.orig 2008-03-15 19:15:15.000000000 -0400 ++++ hald/device_store.c 2008-03-15 19:16:30.000000000 -0400 +@@ -292,6 +292,9 @@ hal_device_store_remove (HalDeviceStore + (gpointer)emit_device_property_changed, + store); + g_signal_handlers_disconnect_by_func (device, ++ (gpointer)device_pre_property_changed, ++ store); ++ g_signal_handlers_disconnect_by_func (device, + (gpointer)emit_device_capability_added, + store); + g_signal_handlers_disconnect_by_func (device, |