package/hal/hal04-remove-glib-dbus-headers.patch

   1 diff -ur hal-0.5.8/hald/device_info.c hal-0.5.8-patched/hald/device_info.c
   2 --- hal-0.5.8/hald/device_info.c        2006-09-11 16:56:39.000000000 -0500
   3 +++ hal-0.5.8-patched/hald/device_info.c        2006-11-15 11:52:24.000000000 -0600
   4 @@ -33,8 +33,6 @@
   5  #include <dirent.h>
   6  #include <expat.h>
   7  #include <assert.h>
   8 -#include <dbus/dbus.h>
   9 -#include <dbus/dbus-glib.h>
  10  #include <math.h>
  11
  12  #include "hald.h"
  13 diff -ur hal-0.5.8/hald/dummy/osspec.c hal-0.5.8-patched/hald/dummy/osspec.c
  14 --- hal-0.5.8/hald/dummy/osspec.c       2006-09-11 16:56:39.000000000 -0500
  15 +++ hal-0.5.8-patched/hald/dummy/osspec.c       2006-11-15 11:52:24.000000000 -0600
  16 @@ -28,8 +28,6 @@
  17  #endif
  18
  19  #include <glib.h>
  20 -#include <dbus/dbus.h>
  21 -#include <dbus/dbus-glib.h>
  22
  23  #include "../osspec.h"
  24  #include "../logger.h"
  25 diff -ur hal-0.5.8/hald/hald.c hal-0.5.8-patched/hald/hald.c
  26 --- hal-0.5.8/hald/hald.c       2006-09-11 16:56:39.000000000 -0500
  27 +++ hal-0.5.8-patched/hald/hald.c       2006-11-15 11:52:24.000000000 -0600
  28 @@ -42,10 +42,6 @@
  29  #include <grp.h>
  30  #include <syslog.h>
  31
  32 -#include <dbus/dbus.h>
  33 -#include <dbus/dbus-glib.h>
  34 -#include <dbus/dbus-glib-lowlevel.h>
  35 -
  36  /*#include "master_slave.h"*/
  37
  38  #include "logger.h"
  39 diff -ur hal-0.5.8/hald/hald_dbus.c hal-0.5.8-patched/hald/hald_dbus.c
  40 --- hal-0.5.8/hald/hald_dbus.c  2006-09-11 16:56:39.000000000 -0500
  41 +++ hal-0.5.8-patched/hald/hald_dbus.c  2006-11-15 11:52:24.000000000 -0600
  42 @@ -35,9 +35,6 @@
  43  #include <stdint.h>
  44  #include <sys/time.h>
  45
  46 -#include <dbus/dbus.h>
  47 -#include <dbus/dbus-glib-lowlevel.h>
  48 -
  49  #include "hald.h"
  50  #include "hald_dbus.h"
  51  #include "device.h"
  52 diff -ur hal-0.5.8/hald/hald_runner.c hal-0.5.8-patched/hald/hald_runner.c
  53 --- hal-0.5.8/hald/hald_runner.c        2006-09-11 16:56:39.000000000 -0500
  54 +++ hal-0.5.8-patched/hald/hald_runner.c        2006-11-15 11:52:24.000000000 -0600
  55 @@ -31,8 +31,6 @@
  56  #include <stdio.h>
  57
  58  #include <glib.h>
  59 -#include <dbus/dbus.h>
  60 -#include <dbus/dbus-glib-lowlevel.h>
  61
  62  #include "hald.h"
  63  #include "util.h"
  64 diff -ur hal-0.5.8/hald/linux/addons/addon-cpufreq.h hal-0.5.8-patched/hald/linux/addons/addon-cpufreq.h
  65 --- hal-0.5.8/hald/linux/addons/addon-cpufreq.h 2006-09-11 16:56:39.000000000 -0500
  66 +++ hal-0.5.8-patched/hald/linux/addons/addon-cpufreq.h 2006-11-15 11:52:24.000000000 -0600
  67 @@ -29,8 +29,6 @@
  68  #include <config.h>
  69  #endif
  70
  71 -#include <dbus/dbus-glib.h>
  72 -#include <dbus/dbus-glib-lowlevel.h>
  73  #include <glib.h>
  74  #include <stdio.h>
  75  #include <stdlib.h>
  76 diff -ur hal-0.5.8/hald/linux/addons/addon-macbookpro-backlight.c hal-0.5.8-patched/hald/linux/addons/addon-macbookpro-backlight.c
  77 --- hal-0.5.8/hald/linux/addons/addon-macbookpro-backlight.c    2006-09-11 16:56:39.000000000 -0500
  78 +++ hal-0.5.8-patched/hald/linux/addons/addon-macbookpro-backlight.c    2006-11-15 11:52:24.000000000 -0600
  79 @@ -37,8 +37,6 @@
  80  #include <unistd.h>
  81
  82  #include <glib/gmain.h>
  83 -#include <dbus/dbus-glib.h>
  84 -#include <dbus/dbus-glib-lowlevel.h>
  85
  86  #include "libhal/libhal.h"
  87  #include "../../logger.h"
  88 diff -ur hal-0.5.8/hald/linux/addons/addon-usb-csr.c hal-0.5.8-patched/hald/linux/addons/addon-usb-csr.c
  89 --- hal-0.5.8/hald/linux/addons/addon-usb-csr.c 2006-09-11 16:56:39.000000000 -0500
  90 +++ hal-0.5.8-patched/hald/linux/addons/addon-usb-csr.c 2006-11-15 11:52:24.000000000 -0600
  91 @@ -30,8 +30,6 @@
  92  #include <usb.h>
  93
  94  #include <glib/gmain.h>
  95 -#include <dbus/dbus-glib.h>
  96 -#include <dbus/dbus-glib-lowlevel.h>
  97
  98  #include "libhal/libhal.h"
  99  #include "../../logger.h"
 100 diff -ur hal-0.5.8/hald/linux/blockdev.c hal-0.5.8-patched/hald/linux/blockdev.c
 101 --- hal-0.5.8/hald/linux/blockdev.c     2006-09-11 16:56:39.000000000 -0500
 102 +++ hal-0.5.8-patched/hald/linux/blockdev.c     2006-11-15 11:52:24.000000000 -0600
 103 @@ -37,9 +37,6 @@
 104  #include <syslog.h>
 105  #include <unistd.h>
 106
 107 -#include <dbus/dbus.h>
 108 -#include <dbus/dbus-glib.h>
 109 -
 110  #include "../device_info.h"
 111  #include "../hald.h"
 112  #include "../hald_dbus.h"
 113 diff -ur hal-0.5.8/hald/linux/classdev.c hal-0.5.8-patched/hald/linux/classdev.c
 114 --- hal-0.5.8/hald/linux/classdev.c     2006-09-11 18:32:56.000000000 -0500
 115 +++ hal-0.5.8-patched/hald/linux/classdev.c     2006-11-15 11:52:24.000000000 -0600
 116 @@ -39,9 +39,6 @@
 117  #include <sys/stat.h>
 118  #include <unistd.h>
 119
 120 -#include <dbus/dbus.h>
 121 -#include <dbus/dbus-glib.h>
 122 -
 123  #include "../device_info.h"
 124  #include "../device_store.h"
 125  #include "../hald.h"
 126 diff -ur hal-0.5.8/hald/linux/coldplug.c hal-0.5.8-patched/hald/linux/coldplug.c
 127 --- hal-0.5.8/hald/linux/coldplug.c     2006-09-11 16:56:39.000000000 -0500
 128 +++ hal-0.5.8-patched/hald/linux/coldplug.c     2006-11-15 11:52:24.000000000 -0600
 129 @@ -33,9 +33,6 @@
 130  #include <sys/stat.h>
 131  #include <unistd.h>
 132
 133 -#include <dbus/dbus.h>
 134 -#include <dbus/dbus-glib.h>
 135 -
 136  #include "../device_info.h"
 137  #include "../hald.h"
 138  #include "../logger.h"
 139 diff -ur hal-0.5.8/hald/linux/hotplug.c hal-0.5.8-patched/hald/linux/hotplug.c
 140 --- hal-0.5.8/hald/linux/hotplug.c      2006-09-11 16:56:39.000000000 -0500
 141 +++ hal-0.5.8-patched/hald/linux/hotplug.c      2006-11-15 11:52:24.000000000 -0600
 142 @@ -32,9 +32,6 @@
 143  #include <string.h>
 144  #include <unistd.h>
 145
 146 -#include <dbus/dbus.h>
 147 -#include <dbus/dbus-glib.h>
 148 -
 149  #include "../device_info.h"
 150  #include "../hald.h"
 151  #include "../logger.h"
 152 diff -ur hal-0.5.8/hald/linux/ids.c hal-0.5.8-patched/hald/linux/ids.c
 153 --- hal-0.5.8/hald/linux/ids.c  2006-09-11 16:56:39.000000000 -0500
 154 +++ hal-0.5.8-patched/hald/linux/ids.c  2006-11-15 11:56:11.000000000 -0600
 155 @@ -33,7 +33,6 @@
 156  #include <unistd.h>
 157
 158  #include <dbus/dbus.h>
 159 -#include <dbus/dbus-glib.h>
 160
 161  #include "../logger.h"
 162
 163 diff -ur hal-0.5.8/hald/linux/osspec.c hal-0.5.8-patched/hald/linux/osspec.c
 164 --- hal-0.5.8/hald/linux/osspec.c       2006-09-11 16:56:39.000000000 -0500
 165 +++ hal-0.5.8-patched/hald/linux/osspec.c       2006-11-15 11:52:24.000000000 -0600
 166 @@ -44,9 +44,6 @@
 167  #include <sys/utsname.h>
 168  #include <unistd.h>
 169
 170 -#include <dbus/dbus.h>
 171 -#include <dbus/dbus-glib.h>
 172 -
 173  #include "../device_info.h"
 174  #include "../hald.h"
 175  #include "../hald_dbus.h"
 176 diff -ur hal-0.5.8/hald/linux/physdev.c hal-0.5.8-patched/hald/linux/physdev.c
 177 --- hal-0.5.8/hald/linux/physdev.c      2006-09-11 16:56:39.000000000 -0500
 178 +++ hal-0.5.8-patched/hald/linux/physdev.c      2006-11-15 11:52:24.000000000 -0600
 179 @@ -31,9 +31,6 @@
 180  #include <stdint.h>
 181  #include <unistd.h>
 182
 183 -#include <dbus/dbus.h>
 184 -#include <dbus/dbus-glib.h>
 185 -
 186  #include "../device_info.h"
 187  #include "../hald.h"
 188  #include "../logger.h"
 189 diff -ur hal-0.5.8/hald/util.c hal-0.5.8-patched/hald/util.c
 190 --- hal-0.5.8/hald/util.c       2006-09-11 16:56:39.000000000 -0500
 191 +++ hal-0.5.8-patched/hald/util.c       2006-11-15 11:52:24.000000000 -0600
 192 @@ -42,8 +42,6 @@
 193  #include <sys/file.h>
 194
 195  #include <glib.h>
 196 -#include <dbus/dbus.h>
 197 -#include <dbus/dbus-glib.h>
 198
 199  #include "osspec.h"
 200  #include "logger.h"
 201 diff -ur hal-0.5.8/hald-runner/main.c hal-0.5.8-patched/hald-runner/main.c
 202 --- hal-0.5.8/hald-runner/main.c        2006-09-11 16:56:39.000000000 -0500
 203 +++ hal-0.5.8-patched/hald-runner/main.c        2006-11-15 11:52:24.000000000 -0600
 204 @@ -24,8 +24,6 @@
 205   **************************************************************************/
 206  #include <stdio.h>
 207  #include <stdlib.h>
 208 -#define DBUS_API_SUBJECT_TO_CHANGE
 209 -#include <dbus/dbus-glib-lowlevel.h>
 210
 211  #include <glib.h>
 212  #include "utils.h"
 213 diff -ur hal-0.5.8/hald-runner/runner.c hal-0.5.8-patched/hald-runner/runner.c
 214 --- hal-0.5.8/hald-runner/runner.c      2006-09-11 16:56:39.000000000 -0500
 215 +++ hal-0.5.8-patched/hald-runner/runner.c      2006-11-15 11:56:42.000000000 -0600
 216 @@ -31,8 +31,7 @@
 217  #include <signal.h>
 218  #include <string.h>
 219
 220 -#define DBUS_API_SUBJECT_TO_CHANGE
 221 -#include <dbus/dbus-glib-lowlevel.h>
 222 +#include <dbus/dbus.h>
 223
 224  #include <glib.h>
 225  #include "utils.h"
 226 diff -ur hal-0.5.8/hald-runner/runner.h hal-0.5.8-patched/hald-runner/runner.h
 227 --- hal-0.5.8/hald-runner/runner.h      2006-09-11 16:56:39.000000000 -0500
 228 +++ hal-0.5.8-patched/hald-runner/runner.h      2006-11-15 11:52:24.000000000 -0600
 229 @@ -25,9 +25,6 @@
 230  #ifndef RUNNER_H
 231  #define RUNNER_H
 232
 233 -#define DBUS_API_SUBJECT_TO_CHANGE
 234 -#include <dbus/dbus-glib-lowlevel.h>
 235 -
 236  #include <glib.h>
 237
 238  typedef struct {
 239 diff -ur hal-0.5.8/hald-runner/utils.c hal-0.5.8-patched/hald-runner/utils.c
 240 --- hal-0.5.8/hald-runner/utils.c       2006-09-11 16:56:39.000000000 -0500
 241 +++ hal-0.5.8-patched/hald-runner/utils.c       2006-11-15 11:52:24.000000000 -0600
 242 @@ -24,8 +24,6 @@
 243   **************************************************************************/
 244  #include <stdio.h>
 245  #include <stdlib.h>
 246 -#define DBUS_API_SUBJECT_TO_CHANGE
 247 -#include <dbus/dbus-glib-lowlevel.h>
 248  #include <glib.h>
 249
 250  #include "utils.h"
 251 diff -ur hal-0.5.8/hald-runner/utils.h hal-0.5.8-patched/hald-runner/utils.h
 252 --- hal-0.5.8/hald-runner/utils.h       2006-09-11 16:56:39.000000000 -0500
 253 +++ hal-0.5.8-patched/hald-runner/utils.h       2006-11-15 11:52:35.000000000 -0600
 254 @@ -25,8 +25,7 @@
 255  #ifndef UTILS_H
 256  #define UTILS_H
 257
 258 -#define DBUS_API_SUBJECT_TO_CHANGE
 259 -#include <dbus/dbus-glib-lowlevel.h>
 260 +#include <dbus/dbus.h>
 261
 262  char **get_string_array(DBusMessageIter *iter, gchar *extra);
 263  char **get_string_array_from_fd(int fd);
 264 diff -ur hal-0.5.8/tools/lshal.c hal-0.5.8-patched/tools/lshal.c
 265 --- hal-0.5.8/tools/lshal.c     2006-09-11 16:56:40.000000000 -0500
 266 +++ hal-0.5.8-patched/tools/lshal.c     2006-11-15 11:52:24.000000000 -0600
 267 @@ -36,8 +36,6 @@
 268  #include <getopt.h>
 269
 270  #include <glib.h>
 271 -#include <dbus/dbus-glib-lowlevel.h>
 272 -#include <dbus/dbus-glib.h>
 273  #include <libhal.h>
 274
 275  #ifdef __SUNPRO_C