Attachment 55986 Details for Bug 45094 – simplied patch to avoid including internal glib headers

[patch] simplied patch to avoid including internal glib headers

hal-0.5.14-do-not-include-glib-internal.patch (text/plain), 3.10 KB, created by guido on 2012-01-22 10:42:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: guido

Created: 2012-01-22 10:42:31 UTC

Size: 3.10 KB

patch

obsolete

>diff -pru hal-0.5.14/hald/linux/addons/addon-generic-backlight.c hal-0.5.14-do-not-include-glib-internal/hald/linux/addons/addon-generic-backlight.c
>--- hal-0.5.14/hald/linux/addons/addon-generic-backlight.c	2009-08-24 14:42:30.000000000 +0200
>+++ hal-0.5.14-do-not-include-glib-internal/hald/linux/addons/addon-generic-backlight.c	2012-01-22 18:49:43.292215369 +0100
>@@ -35,7 +35,7 @@
> #include <sys/stat.h>
> #include <unistd.h> 
> 
>-#include <glib/gmain.h>
>+#include <glib.h>
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>diff -pru hal-0.5.14/hald/linux/addons/addon-input.c hal-0.5.14-do-not-include-glib-internal/hald/linux/addons/addon-input.c
>--- hal-0.5.14/hald/linux/addons/addon-input.c	2009-08-24 14:42:30.000000000 +0200
>+++ hal-0.5.14-do-not-include-glib-internal/hald/linux/addons/addon-input.c	2012-01-22 18:50:34.345163835 +0100
>@@ -41,8 +41,7 @@
> #else
>   #include <linux/input.h>
> #endif
>-#include <glib/gmain.h>
>-#include <glib/gprintf.h>
>+#include <glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
> #include "libhal/libhal.h"
>diff -pru hal-0.5.14/hald/linux/addons/addon-ipw-killswitch.c hal-0.5.14-do-not-include-glib-internal/hald/linux/addons/addon-ipw-killswitch.c
>--- hal-0.5.14/hald/linux/addons/addon-ipw-killswitch.c	2009-08-24 14:42:30.000000000 +0200
>+++ hal-0.5.14-do-not-include-glib-internal/hald/linux/addons/addon-ipw-killswitch.c	2012-01-22 18:51:19.306960927 +0100
>@@ -36,8 +36,6 @@
> #include <unistd.h> 
> 
> #include <glib.h>
>-#include <glib/gmain.h>
>-#include <glib/gstdio.h>
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>diff -pru hal-0.5.14/hald/linux/addons/addon-leds.c hal-0.5.14-do-not-include-glib-internal/hald/linux/addons/addon-leds.c
>--- hal-0.5.14/hald/linux/addons/addon-leds.c	2009-08-24 14:42:30.000000000 +0200
>+++ hal-0.5.14-do-not-include-glib-internal/hald/linux/addons/addon-leds.c	2012-01-22 18:52:07.111611020 +0100
>@@ -36,8 +36,6 @@
> #include <unistd.h> 
> 
> #include <glib.h>
>-#include <glib/gmain.h>
>-#include <glib/gstdio.h>
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>diff -pru hal-0.5.14/hald/linux/addons/addon-rfkill-killswitch.c hal-0.5.14-do-not-include-glib-internal/hald/linux/addons/addon-rfkill-killswitch.c
>--- hal-0.5.14/hald/linux/addons/addon-rfkill-killswitch.c	2009-08-24 14:42:30.000000000 +0200
>+++ hal-0.5.14-do-not-include-glib-internal/hald/linux/addons/addon-rfkill-killswitch.c	2012-01-22 18:52:39.079311546 +0100
>@@ -36,8 +36,6 @@
> #include <unistd.h> 
> 
> #include <glib.h>
>-#include <glib/gmain.h>
>-#include <glib/gstdio.h>
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>diff -pru hal-0.5.14/hald/linux/addons/addon-storage.c hal-0.5.14-do-not-include-glib-internal/hald/linux/addons/addon-storage.c
>--- hal-0.5.14/hald/linux/addons/addon-storage.c	2009-08-24 14:42:30.000000000 +0200
>+++ hal-0.5.14-do-not-include-glib-internal/hald/linux/addons/addon-storage.c	2012-01-22 18:53:25.867792994 +0100
>@@ -39,7 +39,7 @@
> #include <string.h>
> #include <sys/ioctl.h>
> #include <unistd.h>
>-#include <glib/gmain.h>
>+#include <glib.h>
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
>

Actions: View | Splinter Review

Attachments on bug 45094: 55986

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.