Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (c4691bb2743e52910815ca98d8aabccc929f1efa)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (c4691bb2743e52910815ca98d8aabccc929f1efa)
  • Date: Thu, 26 May 2011 18:17:13 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

libs/upower/HISTORY | 6 ++++
libs/upower/PRE_BUILD | 4 +++
libs/upower/glib2-2.28.patch | 57
+++++++++++++++++++++++++++++++++++++++++++
3 files changed, 67 insertions(+)

New commits:
commit c4691bb2743e52910815ca98d8aabccc929f1efa
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

upower: Apply glib2-2.28.patch (Bug #15984)
Fix glib2 2.28 glib-unix.h inclusion
See http://bugs.gentoo.org/show_bug.cgi?id=367363 and
https://bugs.freedesktop.org/show_bug.cgi?id=37489

diff --git a/libs/upower/HISTORY b/libs/upower/HISTORY
index c58affc..c85e82f 100644
--- a/libs/upower/HISTORY
+++ b/libs/upower/HISTORY
@@ -1,3 +1,9 @@
+2011-05-26 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply glib2-2.28.patch (Bug #15984)
+ * glib2-2.28.patch: Fix glib2 2.28 glib-unix.h inclusion
+ See http://bugs.gentoo.org/show_bug.cgi?id=367363 and
+ https://bugs.freedesktop.org/show_bug.cgi?id=37489
+
2011-05-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.10

diff --git a/libs/upower/PRE_BUILD b/libs/upower/PRE_BUILD
new file mode 100755
index 0000000..7875c41
--- /dev/null
+++ b/libs/upower/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+message "${MESSAGE_COLOR}Applying glib2 2.28 patch...${DEFAULT_COLOR}" &&
+patch "${SOURCE_DIRECTORY}/src/up-main.c" \
+ "${SPELL_DIRECTORY}/glib2-2.28.patch"
diff --git a/libs/upower/glib2-2.28.patch b/libs/upower/glib2-2.28.patch
new file mode 100644
index 0000000..191ac6e
--- /dev/null
+++ b/libs/upower/glib2-2.28.patch
@@ -0,0 +1,57 @@
+#
+# From http://bugs.gentoo.org/show_bug.cgi?id=367363
+#
+diff -Ncr upower-0.9.10_orig/src/up-main.c upower-0.9.10/src/up-main.c
+*** upower-0.9.10_orig/src/up-main.c Fri Apr 29 02:20:10 2011
+--- upower-0.9.10/src/up-main.c Mon May 23 16:04:14 2011
+***************
+*** 41,47 ****
+ #include "up-kbd-backlight.h"
+ #include "up-wakeups.h"
+
+! #if GLIB_CHECK_VERSION(2,28,7)
+ #include <glib-unix.h>
+ #endif
+
+--- 41,47 ----
+ #include "up-kbd-backlight.h"
+ #include "up-wakeups.h"
+
+! #if GLIB_CHECK_VERSION(2,29,4)
+ #include <glib-unix.h>
+ #endif
+
+***************
+*** 92,98 ****
+ return ret;
+ }
+
+! #if GLIB_CHECK_VERSION(2,28,7)
+
+ /**
+ * up_main_sigint_cb:
+--- 92,98 ----
+ return ret;
+ }
+
+! #if GLIB_CHECK_VERSION(2,29,4)
+
+ /**
+ * up_main_sigint_cb:
+***************
+*** 201,207 ****
+ goto out;
+ }
+
+! #if GLIB_CHECK_VERSION(2,28,7)
+ /* do stuff on ctrl-c */
+ g_unix_signal_add_watch_full (SIGINT,
+ G_PRIORITY_DEFAULT,
+--- 201,207 ----
+ goto out;
+ }
+
+! #if GLIB_CHECK_VERSION(2,29,4)
+ /* do stuff on ctrl-c */
+ g_unix_signal_add_watch_full (SIGINT,
+ G_PRIORITY_DEFAULT,




Archive powered by MHonArc 2.6.24.

Top of Page