Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (66dfcf39ffe4e3c56d8ea240daabd0f9b034a186)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (66dfcf39ffe4e3c56d8ea240daabd0f9b034a186)
  • Date: Sat, 28 May 2011 17:48:56 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

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

New commits:
commit 66dfcf39ffe4e3c56d8ea240daabd0f9b034a186
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

upower 0.9.11

diff --git a/libs/upower/DETAILS b/libs/upower/DETAILS
index 4c52bff..cfc4a1e 100755
--- a/libs/upower/DETAILS
+++ b/libs/upower/DETAILS
@@ -1,6 +1,6 @@
SPELL=upower
- VERSION=0.9.10
-
SOURCE_HASH=sha512:7595ec81b0475e9dc945adac09ce418cb9d6169955b2b71239ea7c02a2b5e086539b9b6875d21c62b81fba7ddbbbd068830ba5a161c04b729bd1b160874e7fd6
+ VERSION=0.9.11
+
SOURCE_HASH=sha512:fa969ba3a1de6e39d3636fcd564d70153c91f831460707b6fb74311a1eb8dc8298869ce4b965b1e372f6ee15b2748d24994000c10b09cfec72df91f2742765c2
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/upower/HISTORY b/libs/upower/HISTORY
index c85e82f..856af7c 100644
--- a/libs/upower/HISTORY
+++ b/libs/upower/HISTORY
@@ -1,3 +1,7 @@
+2011-05-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.11
+ * PRE_BUILD, glib2-2.28.patch: removed
+
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
diff --git a/libs/upower/PRE_BUILD b/libs/upower/PRE_BUILD
deleted file mode 100755
index 7875c41..0000000
--- a/libs/upower/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 191ac6e..0000000
--- a/libs/upower/glib2-2.28.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# 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,



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (66dfcf39ffe4e3c56d8ea240daabd0f9b034a186), Ladislav Hagara, 05/28/2011

Archive powered by MHonArc 2.6.24.

Top of Page