Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (54b1ccbffc2cec4c4929a7cdded7bc4bec8c3673)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (54b1ccbffc2cec4c4929a7cdded7bc4bec8c3673)
  • Date: Fri, 20 Apr 2012 16:36:15 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

utils/hal/HISTORY | 4 +
utils/hal/PRE_BUILD | 6 ++
utils/hal/glib232.patch | 129
++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 139 insertions(+)

New commits:
commit 54b1ccbffc2cec4c4929a7cdded7bc4bec8c3673
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

hal: fixed build with glib2 >= 2.32

diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index fb0fe58..e6514fc 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,7 @@
+2012-04-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply the patch; use is_version_less()
+ * glib232.patch: added, to fix build with glib2 >= 2.32
+
2011-10-12 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: use ACPI provider

diff --git a/utils/hal/PRE_BUILD b/utils/hal/PRE_BUILD
index bf0c4dc..375a0fa 100755
--- a/utils/hal/PRE_BUILD
+++ b/utils/hal/PRE_BUILD
@@ -1,9 +1,15 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

message "${MESSAGE_COLOR}Apply Linux 2.6.38+ headers
patch...${DEFAULT_COLOR}" &&
patch -p1 < "${SPELL_DIRECTORY}"/linux-2.6.38-v4l.patch &&

+if spell_ok glib2 && ! is_version_less $(installed_version glib2) 2.32; then
+ patch -p0 < "$SPELL_DIRECTORY/glib232.patch"
+fi &&
+
if [[ $HAL_VER == devel ]]; then
NOCONFIGURE=1 ./autogen.sh
fi
diff --git a/utils/hal/glib232.patch b/utils/hal/glib232.patch
new file mode 100644
index 0000000..9f821b3
--- /dev/null
+++ b/utils/hal/glib232.patch
@@ -0,0 +1,129 @@
+--- hald/linux/addons/addon-acpi-buttons-toshiba.c.orig
++++ hald/linux/addons/addon-acpi-buttons-toshiba.c
+@@ -40,7 +40,7 @@
+ #include <string.h>
+ #include <unistd.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+
+ #include "libhal/libhal.h"
+ #include "../../logger.h"
+--- hald/linux/addons/addon-dell-backlight.cpp.orig
++++ hald/linux/addons/addon-dell-backlight.cpp
+@@ -29,7 +29,7 @@
+
+ #include <string.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+--- hald/linux/addons/addon-generic-backlight.c.orig
++++ hald/linux/addons/addon-generic-backlight.c
+@@ -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>
+
+--- hald/linux/addons/addon-imac-backlight.c.orig
++++ hald/linux/addons/addon-imac-backlight.c
+@@ -29,7 +29,7 @@
+ #include <stdlib.h>
+ #include <sys/io.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+--- hald/linux/addons/addon-input.c.orig
++++ hald/linux/addons/addon-input.c
+@@ -41,7 +41,7 @@
+ #else
+ #include <linux/input.h>
+ #endif
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <glib/gprintf.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+--- hald/linux/addons/addon-ipw-killswitch.c.orig
++++ hald/linux/addons/addon-ipw-killswitch.c
+@@ -36,7 +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>
+--- hald/linux/addons/addon-leds.c.orig
++++ hald/linux/addons/addon-leds.c
+@@ -36,7 +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>
+--- hald/linux/addons/addon-macbookpro-backlight.c.orig
++++ hald/linux/addons/addon-macbookpro-backlight.c
+@@ -39,7 +39,7 @@
+ #include <pci/pci.h>
+ #include <unistd.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+--- hald/linux/addons/addon-omap-backlight.c.orig
++++ hald/linux/addons/addon-omap-backlight.c
+@@ -41,7 +41,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+--- hald/linux/addons/addon-rfkill-killswitch.c.orig
++++ hald/linux/addons/addon-rfkill-killswitch.c
+@@ -36,7 +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>
+--- hald/linux/addons/addon-storage.c.orig
++++ hald/linux/addons/addon-storage.c
+@@ -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>
+
+--- hald/linux/addons/addon-usb-csr.c.orig
++++ hald/linux/addons/addon-usb-csr.c
+@@ -29,7 +29,7 @@
+ #include <string.h>
+ #include <usb.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (54b1ccbffc2cec4c4929a7cdded7bc4bec8c3673), Vlad Glagolev, 04/20/2012

Archive powered by MHonArc 2.6.24.

Top of Page