pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/46210: sysutils/gamin G_CONST_RETURN removal



>Number:         46210
>Category:       pkg
>Synopsis:       sysutils/gamin G_CONST_RETURN removal
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Mar 16 22:45:00 +0000 2012
>Originator:     Francis GUDIN
>Release:        DragonFly 3.0
>Organization:
>Environment:
DragonFly digibox.bsdbellule.fr 3.0-RELEASE DragonFly 2a8d2fe-RELEASE #0: Thu 
Mar 15 14:19:18 CET 2012
>Description:
G_CONST_RETURN was deprecated and is no longer available nowadays (cf. 
http://www.mail-archive.com/gtk-devel-list%gnome.org@localhost/msg13980.html): 
the attached patch substitutes a plain const.
>How-To-Repeat:
Try building the pkg.
>Fix:
(git format-patch output:)

From 055b98fb4b867372ed16d418e0b016e4ea2bb83e Mon Sep 17 00:00:00 2001
From: Francis GUDIN <fgudin%bsdbellule.fr@localhost>
Date: Fri, 16 Mar 2012 22:01:50 +0100
Subject: [PATCH] sysutils/gamin: add a patch-aj that substitute const for
 obsolete G_CONST_RETURN from gam_node.* and
 gam_subscription.*

---
 sysutils/gamin/distinfo         |    1 +
 sysutils/gamin/patches/patch-aj |   44 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 sysutils/gamin/patches/patch-aj

diff --git a/sysutils/gamin/distinfo b/sysutils/gamin/distinfo
index 3bf44d9..4590062 100644
--- a/sysutils/gamin/distinfo
+++ b/sysutils/gamin/distinfo
@@ -12,3 +12,4 @@ SHA1 (patch-af) = 7cda705d59206a1fad0c91b56206630f01717adc
 SHA1 (patch-ag) = 59b35394c29d0cbbf7905df24ef4ba913ebfec46
 SHA1 (patch-ah) = 79e132b615a6492587a10a550c421fcc91a27761
 SHA1 (patch-ai) = 54c6d347eef37a97e16c6f00870953fbdba41182
+SHA1 (patch-aj) = 9565180a51f385633d6d7ebf3d8e92593afab641
diff --git a/sysutils/gamin/patches/patch-aj b/sysutils/gamin/patches/patch-aj
new file mode 100644
index 0000000..62666cb
--- /dev/null
+++ b/sysutils/gamin/patches/patch-aj
@@ -0,0 +1,44 @@
+--- server/gam_subscription.h.orig     2012-03-16 21:40:46.520480000 +0100
++++ server/gam_subscription.h  2012-03-16 21:42:48.501488000 +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);
+ 
+--- server/gam_subscription.c.orig     2012-03-16 21:40:43.030452000 +0100
++++ server/gam_subscription.c  2012-03-16 21:42:48.501488000 +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)
+--- server/gam_node.h.orig     2012-03-16 21:41:09.660672000 +0100
++++ server/gam_node.h  2012-03-16 21:42:48.501488000 +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);
+ 
+--- server/gam_node.c.orig     2012-03-16 21:41:13.650704000 +0100
++++ server/gam_node.c  2012-03-16 21:42:48.501488000 +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);
-- 
1.7.9.2




Home | Main Index | Thread Index | Old Index