Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (b0463aeaf7c6287ed41dd4ce141a15243b6a9a4b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (b0463aeaf7c6287ed41dd4ce141a15243b6a9a4b)
  • Date: Sun, 25 Dec 2011 12:12:33 -0600

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

utils/gamin/HISTORY | 4 +++
utils/gamin/PRE_BUILD | 4 +++
utils/gamin/glib-fix.patch | 53
+++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 61 insertions(+)

New commits:
commit b0463aeaf7c6287ed41dd4ce141a15243b6a9a4b
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

gamin: apply patch to build with new glib2

diff --git a/utils/gamin/HISTORY b/utils/gamin/HISTORY
index f73dfa5..88a2a5e 100644
--- a/utils/gamin/HISTORY
+++ b/utils/gamin/HISTORY
@@ -1,3 +1,7 @@
+2011-12-25 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added to apply patch use of deprecated G_CONST_RETURN
+
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-October/011050.html
+
2010-10-04 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Force glib2 to be cast if not already
Avoids circular gamin -> glib2 ?-> gamin cast order
diff --git a/utils/gamin/PRE_BUILD b/utils/gamin/PRE_BUILD
new file mode 100755
index 0000000..b78c45d
--- /dev/null
+++ b/utils/gamin/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SCRIPT_DIRECTORY/glib-fix.patch
diff --git a/utils/gamin/glib-fix.patch b/utils/gamin/glib-fix.patch
new file mode 100644
index 0000000..f120a48
--- /dev/null
+++ b/utils/gamin/glib-fix.patch
@@ -0,0 +1,53 @@
+Index: gamin-0.1.10/server/gam_node.c
+===================================================================
+--- gamin-0.1.10.orig/server/gam_node.c 2011-10-12 15:25:45.217178314
+0100
++++ gamin-0.1.10/server/gam_node.c 2011-10-12 15:26:17.807178293 +0100
+@@ -122,7 +122,7 @@
+ * it has finished with the string. If it must keep it longer, it
+ * should makes its own copy. The returned string must not be freed.
+ */
+-G_CONST_RETURN char *
++const char *
+ gam_node_get_path(GamNode * node)
+ {
+ g_assert(node);
+Index: gamin-0.1.10/server/gam_node.h
+===================================================================
+--- gamin-0.1.10.orig/server/gam_node.h 2011-10-12 15:25:46.857178269
+0100
++++ gamin-0.1.10/server/gam_node.h 2011-10-12 15:26:28.637178297 +0100
+@@ -58,7 +58,7 @@
+ void gam_node_set_is_dir (GamNode *node,
+ gboolean is_dir);
+
+-G_CONST_RETURN char *gam_node_get_path (GamNode *node);
++const char *gam_node_get_path (GamNode *node);
+
+ GList *gam_node_get_subscriptions (GamNode *node);
+
+Index: gamin-0.1.10/server/gam_subscription.c
+===================================================================
+--- gamin-0.1.10.orig/server/gam_subscription.c 2011-10-12
15:25:40.497177525 +0100
++++ gamin-0.1.10/server/gam_subscription.c 2011-10-12 15:26:39.867178304
+0100
+@@ -141,7 +141,7 @@
+ * @param sub the GamSubscription
+ * @returns The path being monitored. It should not be freed.
+ */
+-G_CONST_RETURN char *
++const char *
+ gam_subscription_get_path(GamSubscription * sub)
+ {
+ if (sub == NULL)
+Index: gamin-0.1.10/server/gam_subscription.h
+===================================================================
+--- gamin-0.1.10.orig/server/gam_subscription.h 2011-10-12
15:25:28.507178266 +0100
++++ gamin-0.1.10/server/gam_subscription.h 2011-10-12 15:25:58.817178285
+0100
+@@ -21,7 +21,7 @@
+
+ int gam_subscription_get_reqno (GamSubscription *sub);
+
+-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub);
++const char *gam_subscription_get_path (GamSubscription *sub);
+
+ GamListener *gam_subscription_get_listener (GamSubscription *sub);
+
+



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (b0463aeaf7c6287ed41dd4ce141a15243b6a9a4b), Robin Cook, 12/25/2011

Archive powered by MHonArc 2.6.24.

Top of Page