wok-next rev 3106
Up: hal (0.5.12)
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sun May 17 23:52:28 2009 +0200 (2009-05-17) |
parents | 4f3e1cae6aea |
children | 4848fe4259a4 |
files | hal-dev/receipt hal-extra/receipt hal/receipt hal/stuff/hal-udev.patch |
line diff
1.1 --- a/hal-dev/receipt Sun May 17 23:50:50 2009 +0200 1.2 +++ b/hal-dev/receipt Sun May 17 23:52:28 2009 +0200 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="hal-dev" 1.7 -VERSION="0.5.11" 1.8 +VERSION="0.5.12" 1.9 CATEGORY="development" 1.10 SHORT_DESC="Hal devel files." 1.11 WANTED="hal"
2.1 --- a/hal-extra/receipt Sun May 17 23:50:50 2009 +0200 2.2 +++ b/hal-extra/receipt Sun May 17 23:52:28 2009 +0200 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="hal-extra" 2.7 -VERSION="0.5.11" 2.8 +VERSION="0.5.12" 2.9 CATEGORY="x-window" 2.10 SHORT_DESC="Hal devel files." 2.11 WANTED="hal" 2.12 @@ -12,12 +12,12 @@ 2.13 hald-addon-cpufreq 2.14 hald-addon-hid-ups 2.15 hald-addon-imac-backlight 2.16 +hald-addon-ipw-killswitch 2.17 hald-probe-video4linux 2.18 hald-probe-net-bluetooth 2.19 hald-probe-ieee1394-unit 2.20 hald-probe-pc-floppy 2.21 -hald-probe-printer 2.22 -hal-ipw-killswitch-linux" 2.23 +hald-probe-printer" 2.24 2.25 # Rules to gen a SliTaz package suitable for Tazpkg. 2.26 genpkg_rules()
3.1 --- a/hal/receipt Sun May 17 23:50:50 2009 +0200 3.2 +++ b/hal/receipt Sun May 17 23:52:28 2009 +0200 3.3 @@ -1,11 +1,11 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="hal" 3.7 -VERSION="0.5.11" 3.8 +VERSION="0.5.12" 3.9 CATEGORY="x-window" 3.10 SHORT_DESC="Hardware Abstraction Layer." 3.11 -DEPENDS="dbus dbus-glib slitaz-base-files udev" 3.12 -BUILD_DEPENDS="dbus-dev dbus-glib-dev udev-dev udev pciutils" 3.13 +DEPENDS="dbus dbus-glib slitaz-base-files udev util-linux-ng-blkid" 3.14 +BUILD_DEPENDS="dbus-dev dbus-glib-dev udev-dev udev pciutils util-linux-ng-blkid-dev" 3.15 MAINTAINER="pankso@slitaz.org" 3.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 3.17 WEB_SITE="http://www.freedesktop.org/wiki/Software/hal" 3.18 @@ -15,19 +15,19 @@ 3.19 hald-addon-cpufreq 3.20 hald-addon-hid-ups 3.21 hald-addon-imac-backlight 3.22 +hald-addon-ipw-killswitch 3.23 hald-probe-video4linux 3.24 hald-probe-net-bluetooth 3.25 hald-probe-ieee1394-unit 3.26 hald-probe-pc-floppy 3.27 -hald-probe-printer 3.28 -hal-ipw-killswitch-linux" 3.29 +hald-probe-printer" 3.30 3.31 # Rules to configure and make the package. 3.32 compile_rules() 3.33 { 3.34 cd $src 3.35 zcat /usr/share/misc/pci.ids.gz > /usr/share/misc/pci.ids && 3.36 - patch -p1 < ../stuff/hal-udev.patch || exit 1 && 3.37 + #patch -p1 < ../stuff/hal-udev.patch || exit 1 && 3.38 ./configure \ 3.39 --prefix=/usr \ 3.40 --libexecdir=/usr/lib/hal \
4.1 --- a/hal/stuff/hal-udev.patch Sun May 17 23:50:50 2009 +0200 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,29 +0,0 @@ 4.4 ---- hal-0.5.11/hald/linux/blockdev.c 2008-05-08 01:23:41.000000000 +0200 4.5 -+++ hal-0.5.11.new/hald/linux/blockdev.c 2008-10-26 17:21:21.317075298 +0100 4.6 -@@ -1750,11 +1750,11 @@ 4.7 - char *ret; 4.8 - char *u_stdout; 4.9 - int u_exit_status; 4.10 -- const char *argv[] = {"/usr/bin/udevinfo", "--root", "--query", "name", "--path", NULL, NULL}; 4.11 -+ const char *argv[] = {"/sbin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL}; 4.12 - GError *g_error; 4.13 - 4.14 - ret = NULL; 4.15 -- argv[5] = sysfs_path; 4.16 -+ argv[6] = sysfs_path; 4.17 - 4.18 - g_error = NULL; 4.19 - 4.20 ---- hal-0.5.11/hald/linux/coldplug.c 2008-05-08 01:23:32.000000000 +0200 4.21 -+++ hal-0.5.11.new/hald/linux/coldplug.c 2008-10-26 17:20:38.451808974 +0100 4.22 -@@ -149,8 +149,8 @@ 4.23 - static gboolean 4.24 - hal_util_init_sysfs_to_udev_map (void) 4.25 - { 4.26 -- char *udevdb_export_argv[] = { "/usr/bin/udevinfo", "-e", NULL }; 4.27 -- char *udevroot_argv[] = { "/usr/bin/udevinfo", "-r", NULL }; 4.28 -+ char *udevdb_export_argv[] = { "/sbin/udevadm", "info", "-e", NULL }; 4.29 -+ char *udevroot_argv[] = { "/sbin/udevadm", "info", "-r", NULL }; 4.30 - int udevinfo_exitcode; 4.31 - UdevInfo *info = NULL; 4.32 - char *p;