diff options
| -rw-r--r-- | sys-apps/hal/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-apps/hal/files/0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch | 47 | ||||
| -rw-r--r-- | sys-apps/hal/files/0.5.9/19_hald_runner_catch_dbus_disconnect.patch | 18 | ||||
| -rw-r--r-- | sys-apps/hal/files/0.5.9/series | 1 |
4 files changed, 50 insertions, 25 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index ffa9efdbe880..a4d694f24edb 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/hal # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.177 2007/04/25 14:17:56 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.178 2007/04/25 14:35:11 cardoe Exp $ + + 25 Apr 2007; Doug Goldstein <cardoe@gentoo.org> + files/0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch, + +files/0.5.9/19_hald_runner_catch_dbus_disconnect.patch, + files/0.5.9/series: + refresh previous patch. Add fix to catch D-Bus disconnect from hald_runner + (possible sparc fix) 25 Apr 2007; Doug Goldstein <cardoe@gentoo.org> +files/0.5.9/17_autoconf_cflag_cleanup.patch, diff --git a/sys-apps/hal/files/0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch b/sys-apps/hal/files/0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch index 720999f2f1a5..7ad37bc83cdc 100644 --- a/sys-apps/hal/files/0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch +++ b/sys-apps/hal/files/0.5.9/18_hal_fix_info.category_for_laptop_panel_v2.patch @@ -1,7 +1,7 @@ -diff --git a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi -index c982099..6368ad8 100644 ---- a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi -+++ b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi +Index: b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi +=================================================================== +--- a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi 2007-03-07 16:52:19.000000000 -0500 ++++ b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi 2007-04-25 10:31:29.000000000 -0400 @@ -4,17 +4,20 @@ <device> @@ -15,28 +15,27 @@ index c982099..6368ad8 100644 - <append key="org.freedesktop.Hal.Device.LaptopPanel.method_signatures" type="strlist">i</append> - <append key="org.freedesktop.Hal.Device.LaptopPanel.method_argnames" type="strlist">brightness_value</append> - <append key="org.freedesktop.Hal.Device.LaptopPanel.method_execpaths" type="strlist">hal-system-lcd-set-brightness</append> -- -- <append key="org.freedesktop.Hal.Device.LaptopPanel.method_names" type="strlist">GetBrightness</append> -- <append key="org.freedesktop.Hal.Device.LaptopPanel.method_signatures" type="strlist"></append> -- <append key="org.freedesktop.Hal.Device.LaptopPanel.method_argnames" type="strlist"></append> -- <append key="org.freedesktop.Hal.Device.LaptopPanel.method_execpaths" type="strlist">hal-system-lcd-get-brightness</append> + <append key="org.freedesktop.Hal.Device.LaptopPanel.method_names" type="strlist">SetBrightness</append> + <append key="org.freedesktop.Hal.Device.LaptopPanel.method_signatures" type="strlist">i</append> + <append key="org.freedesktop.Hal.Device.LaptopPanel.method_argnames" type="strlist">brightness_value</append> + <append key="org.freedesktop.Hal.Device.LaptopPanel.method_execpaths" type="strlist">hal-system-lcd-set-brightness</append> -+ ++ + <append key="org.freedesktop.Hal.Device.LaptopPanel.method_names" type="strlist">GetBrightness</append> + <append key="org.freedesktop.Hal.Device.LaptopPanel.method_signatures" type="strlist"></append> + <append key="org.freedesktop.Hal.Device.LaptopPanel.method_argnames" type="strlist"></append> + <append key="org.freedesktop.Hal.Device.LaptopPanel.method_execpaths" type="strlist">hal-system-lcd-get-brightness</append> -+ + +- <append key="org.freedesktop.Hal.Device.LaptopPanel.method_names" type="strlist">GetBrightness</append> +- <append key="org.freedesktop.Hal.Device.LaptopPanel.method_signatures" type="strlist"></append> +- <append key="org.freedesktop.Hal.Device.LaptopPanel.method_argnames" type="strlist"></append> +- <append key="org.freedesktop.Hal.Device.LaptopPanel.method_execpaths" type="strlist">hal-system-lcd-get-brightness</append> </match> </device> -diff --git a/fdi/policy/10osvendor/10-macbook-backlight.fdi b/fdi/policy/10osvendor/10-macbook-backlight.fdi -index 227bbb5..a22fb20 100644 ---- a/fdi/policy/10osvendor/10-macbook-backlight.fdi -+++ b/fdi/policy/10osvendor/10-macbook-backlight.fdi +Index: b/fdi/policy/10osvendor/10-macbook-backlight.fdi +=================================================================== +--- a/fdi/policy/10osvendor/10-macbook-backlight.fdi 2007-03-19 19:43:31.000000000 -0400 ++++ b/fdi/policy/10osvendor/10-macbook-backlight.fdi 2007-04-25 10:30:56.000000000 -0400 @@ -13,6 +13,7 @@ <device> <match key="info.udi" string="/org/freedesktop/Hal/devices/macbook_backlight"> @@ -45,11 +44,11 @@ index 227bbb5..a22fb20 100644 <merge key="info.product" type="string">MacBook Backlight Control</merge> <merge key="laptop_panel.access_method" type="string">custom</merge> <merge key="laptop_panel.num_levels" type="int">118</merge> -diff --git a/fdi/policy/10osvendor/10-macbookpro-utils.fdi b/fdi/policy/10osvendor/10-macbookpro-utils.fdi -index 8aed6c0..f02c614 100644 ---- a/fdi/policy/10osvendor/10-macbookpro-utils.fdi -+++ b/fdi/policy/10osvendor/10-macbookpro-utils.fdi -@@ -32,6 +32,7 @@ +Index: b/fdi/policy/10osvendor/10-macbookpro-utils.fdi +=================================================================== +--- a/fdi/policy/10osvendor/10-macbookpro-utils.fdi 2007-04-18 10:19:08.000000000 -0400 ++++ b/fdi/policy/10osvendor/10-macbookpro-utils.fdi 2007-04-25 10:30:56.000000000 -0400 +@@ -17,6 +17,7 @@ <device> <match key="info.udi" string="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"> <append key="info.capabilities" type="strlist">laptop_panel</append> @@ -57,10 +56,10 @@ index 8aed6c0..f02c614 100644 <merge key="info.product" type="string">MacBook Pro Laptop Panel</merge> <merge key="laptop_panel.access_method" type="string">custom</merge> <merge key="laptop_panel.num_levels" type="int">229</merge> -diff --git a/fdi/policy/10osvendor/10-omap-backlight.fdi b/fdi/policy/10osvendor/10-omap-backlight.fdi -index 5d3f1ce..2f041a1 100644 ---- a/fdi/policy/10osvendor/10-omap-backlight.fdi -+++ b/fdi/policy/10osvendor/10-omap-backlight.fdi +Index: b/fdi/policy/10osvendor/10-omap-backlight.fdi +=================================================================== +--- a/fdi/policy/10osvendor/10-omap-backlight.fdi 2007-03-07 16:52:19.000000000 -0500 ++++ b/fdi/policy/10osvendor/10-omap-backlight.fdi 2007-04-25 10:30:56.000000000 -0400 @@ -10,6 +10,7 @@ <device> <match key="info.udi" string="/org/freedesktop/Hal/devices/omapfb_bl"> diff --git a/sys-apps/hal/files/0.5.9/19_hald_runner_catch_dbus_disconnect.patch b/sys-apps/hal/files/0.5.9/19_hald_runner_catch_dbus_disconnect.patch new file mode 100644 index 000000000000..cc4c2c90db15 --- /dev/null +++ b/sys-apps/hal/files/0.5.9/19_hald_runner_catch_dbus_disconnect.patch @@ -0,0 +1,18 @@ +Index: b/hald/hald_runner.c +=================================================================== +--- a/hald/hald_runner.c 2007-03-30 15:20:09.000000000 -0400 ++++ b/hald/hald_runner.c 2007-04-25 10:32:38.000000000 -0400 +@@ -726,6 +726,13 @@ + msg, &call, INT_MAX)) + DIE (("No memory")); + ++ /** ++ * The connection was disconnected as per D-Bus API ++ * This is an error condition and should not really happen ++ */ ++ if (call == NULL) ++ goto error; ++ + hd = g_new0 (HelperData, 1); + hd->d = device; + hd->cb = cb; diff --git a/sys-apps/hal/files/0.5.9/series b/sys-apps/hal/files/0.5.9/series index 22db6ec14d15..174b39b3c0bd 100644 --- a/sys-apps/hal/files/0.5.9/series +++ b/sys-apps/hal/files/0.5.9/series @@ -16,6 +16,7 @@ 16_dev_root_is_mounted.patch 17_autoconf_cflag_cleanup.patch 18_hal_fix_info.category_for_laptop_panel_v2.patch +19_hald_runner_catch_dbus_disconnect.patch 95_gentoo_man_page.patch 96_plugdev_allow_send.patch 97_ignore_fixed_drives.patch |