Fix issues with GNU inline semantic.

7 files changed, 246 insertions, 1 deletions

diff --git a/x11/xfce4-places-plugin/distinfo b/x11/xfce4-places-plugin/distinfo
index db0dd4ec215..11fbfb907a6 100644
--- a/x11/xfce4-places-plugin/distinfo
+++ b/x11/xfce4-places-plugin/distinfo
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.2 2007/12/05 07:51:18 martti Exp $
+$NetBSD: distinfo,v 1.3 2012/04/19 21:12:42 joerg Exp $
 
 SHA1 (xfce4-places-plugin-1.0.0.tar.bz2) = 16cb0b7c3d869010f12656da64277e213bbb8de8
 RMD160 (xfce4-places-plugin-1.0.0.tar.bz2) = 3e8d64745d869e8bcd6a851f14c1dc7b999ecf84
 Size (xfce4-places-plugin-1.0.0.tar.bz2) = 298759 bytes
+SHA1 (patch-panel-plugin_cfg.c) = 7f293620a299227631098d76ac4f8642ca8ae2ea
+SHA1 (patch-panel-plugin_cfg.h) = 91c537d0f209d7fea4bdb53557af22a107f0a8df
+SHA1 (patch-panel-plugin_model.c) = 114a613b80ea8d456aa4b13a487f36eb40c2264b
+SHA1 (patch-panel-plugin_model.h) = bc0893c65821c37c5acfdd007b4d66aa321ebadd
+SHA1 (patch-panel-plugin_view.c) = c8ceab9e0ecff37dc76f45525eeecd10bb69cfba
+SHA1 (patch-panel-plugin_view.h) = bf49a456befa444685bcd97ec7daddbc0a9a1c9e
diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_cfg.c b/x11/xfce4-places-plugin/patches/patch-panel-plugin_cfg.c
new file mode 100644
index 00000000000..fc40c05ef3e
--- /dev/null
+++ b/x11/xfce4-places-plugin/patches/patch-panel-plugin_cfg.c
@@ -0,0 +1,41 @@
+$NetBSD: patch-panel-plugin_cfg.c,v 1.1 2012/04/19 21:12:42 joerg Exp $
+
+--- panel-plugin/cfg.c.orig	2012-04-19 14:12:44.000000000 +0000
++++ panel-plugin/cfg.c
+@@ -37,31 +37,31 @@
+ 
+ /********** PlacesCfgViewIface helpers **********/
+ 
+-inline PlacesCfg*
++PlacesCfg*
+ places_cfg_view_iface_get_cfg(PlacesCfgViewIface *iface)
+ {
+     return iface->cfg;
+ }
+ 
+-inline void
++void
+ places_cfg_view_iface_open_dialog(PlacesCfgViewIface *iface)
+ {
+     iface->open_dialog(iface->cfg);
+ }
+ 
+-inline void
++void
+ places_cfg_view_iface_load(PlacesCfgViewIface *iface)
+ {
+     iface->load(iface->cfg);
+ }
+ 
+-inline void
++void
+ places_cfg_view_iface_save(PlacesCfgViewIface *iface)
+ {
+     iface->save(iface->cfg);
+ }
+ 
+-inline void
++void
+ places_cfg_view_iface_finalize(PlacesCfgViewIface *iface)
+ {
+     iface->finalize(iface);
diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_cfg.h b/x11/xfce4-places-plugin/patches/patch-panel-plugin_cfg.h
new file mode 100644
index 00000000000..512f183bffd
--- /dev/null
+++ b/x11/xfce4-places-plugin/patches/patch-panel-plugin_cfg.h
@@ -0,0 +1,29 @@
+$NetBSD: patch-panel-plugin_cfg.h,v 1.1 2012/04/19 21:12:42 joerg Exp $
+
+--- panel-plugin/cfg.h.orig	2012-04-19 14:12:42.000000000 +0000
++++ panel-plugin/cfg.h
+@@ -62,19 +62,19 @@ struct _PlacesCfgViewIface {
+     
+ };
+ 
+-inline PlacesCfg*
++PlacesCfg*
+ places_cfg_view_iface_get_cfg(PlacesCfgViewIface*);
+ 
+-inline void
++void
+ places_cfg_view_iface_open_dialog(PlacesCfgViewIface*);
+ 
+-inline void
++void
+ places_cfg_view_iface_load(PlacesCfgViewIface*);
+ 
+-inline void
++void
+ places_cfg_view_iface_save(PlacesCfgViewIface*);
+ 
+-inline void
++void
+ places_cfg_view_iface_finalize(PlacesCfgViewIface*);
+ 
+ 
diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.c b/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.c
new file mode 100644
index 00000000000..d360d43d91c
--- /dev/null
+++ b/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.c
@@ -0,0 +1,63 @@
+$NetBSD: patch-panel-plugin_model.c,v 1.1 2012/04/19 21:12:42 joerg Exp $
+
+--- panel-plugin/model.c.orig	2007-10-25 22:03:52.000000000 +0000
++++ panel-plugin/model.c
+@@ -27,7 +27,7 @@
+ 
+ #include <libxfce4util/libxfce4util.h>
+ 
+-inline void
++void
+ places_bookmark_action_call(PlacesBookmarkAction *act)
+ {
+     g_assert(act != NULL);
+@@ -36,7 +36,7 @@ places_bookmark_action_call(PlacesBookma
+         act->action(act);
+ }
+ 
+-inline void
++void
+ places_bookmark_action_free(PlacesBookmarkAction *act)
+ {
+     g_assert(act != NULL);
+@@ -62,7 +62,7 @@ places_bookmark_actions_free(GList *acti
+ static int bookmarks = 0;
+ #endif
+ 
+-inline PlacesBookmark*
++PlacesBookmark*
+ places_bookmark_create(gchar *label)
+ {
+     PlacesBookmark *bookmark;
+@@ -77,7 +77,7 @@ places_bookmark_create(gchar *label)
+     return bookmark;
+ }
+ 
+-inline void
++void
+ places_bookmark_free(PlacesBookmark *bookmark)
+ {
+     g_assert(bookmark != NULL);
+@@ -104,19 +104,19 @@ places_bookmark_free(PlacesBookmark *boo
+         g_free(bookmark);
+ }
+ 
+-inline GList*
++GList*
+ places_bookmark_group_get_bookmarks(PlacesBookmarkGroup *pbg)
+ {
+     return pbg->get_bookmarks(pbg);
+ }
+ 
+-inline gboolean
++gboolean
+ places_bookmark_group_changed(PlacesBookmarkGroup *pbg)
+ {
+     return pbg->changed(pbg);
+ }
+ 
+-inline void
++void
+ places_bookmark_group_finalize(PlacesBookmarkGroup *pbg)
+ {
+     pbg->finalize(pbg);
diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.h b/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.h
new file mode 100644
index 00000000000..76720a9cdb0
--- /dev/null
+++ b/x11/xfce4-places-plugin/patches/patch-panel-plugin_model.h
@@ -0,0 +1,47 @@
+$NetBSD: patch-panel-plugin_model.h,v 1.1 2012/04/19 21:12:42 joerg Exp $
+
+--- panel-plugin/model.h.orig	2007-10-25 22:03:52.000000000 +0000
++++ panel-plugin/model.h
+@@ -35,10 +35,10 @@ struct _PlacesBookmarkAction
+ 
+ };
+ 
+-inline void
++void
+ places_bookmark_action_call(PlacesBookmarkAction*);
+ 
+-inline void
++void
+ places_bookmark_action_free(PlacesBookmarkAction*);
+ 
+ /* Places Bookmark */
+@@ -65,10 +65,10 @@ struct _PlacesBookmark
+     void                 (*free) (PlacesBookmark *self);
+ };
+ 
+-inline PlacesBookmark*
++PlacesBookmark*
+ places_bookmark_create(gchar *label);
+ 
+-inline void
++void
+ places_bookmark_free(PlacesBookmark *bookmark);
+ 
+ /* Places Bookmark Group */
+@@ -81,13 +81,13 @@ struct _PlacesBookmarkGroup
+     gpointer    priv;
+ };
+ 
+-inline GList*
++GList*
+ places_bookmark_group_get_bookmarks(PlacesBookmarkGroup*);
+ 
+-inline gboolean
++gboolean
+ places_bookmark_group_changed(PlacesBookmarkGroup*);
+ 
+-inline void
++void
+ places_bookmark_group_finalize(PlacesBookmarkGroup*);
+ 
+ #endif
diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_view.c b/x11/xfce4-places-plugin/patches/patch-panel-plugin_view.c
new file mode 100644
index 00000000000..931c7d13c12
--- /dev/null
+++ b/x11/xfce4-places-plugin/patches/patch-panel-plugin_view.c
@@ -0,0 +1,34 @@
+$NetBSD: patch-panel-plugin_view.c,v 1.1 2012/04/19 21:12:42 joerg Exp $
+
+--- panel-plugin/view.c.orig	2012-04-19 14:12:11.000000000 +0000
++++ panel-plugin/view.c
+@@ -121,25 +121,25 @@ static void     pview_button_update(Plac
+ 
+ /********** Interface for Cfg's Use **********/
+ 
+-inline void
++void
+ places_view_cfg_iface_update_menu(PlacesViewCfgIface *iface)
+ {
+     iface->update_menu(iface->places_view);
+ }
+ 
+-inline void
++void
+ places_view_cfg_iface_update_button(PlacesViewCfgIface *iface)
+ {
+     iface->update_button(iface->places_view);
+ }
+ 
+-inline void
++void
+ places_view_cfg_iface_reconfigure_model(PlacesViewCfgIface *iface)
+ {
+     iface->reconfigure_model(iface->places_view);
+ }
+ 
+-inline GtkWidget*
++GtkWidget*
+ places_view_cfg_iface_make_empty_cfg_dialog(PlacesViewCfgIface *iface)
+ {
+     return iface->make_empty_cfg_dialog(iface->places_view);
diff --git a/x11/xfce4-places-plugin/patches/patch-panel-plugin_view.h b/x11/xfce4-places-plugin/patches/patch-panel-plugin_view.h
new file mode 100644
index 00000000000..8b1a372473d
--- /dev/null
+++ b/x11/xfce4-places-plugin/patches/patch-panel-plugin_view.h
@@ -0,0 +1,25 @@
+$NetBSD: patch-panel-plugin_view.h,v 1.1 2012/04/19 21:12:42 joerg Exp $
+
+--- panel-plugin/view.h.orig	2012-04-19 14:11:58.000000000 +0000
++++ panel-plugin/view.h
+@@ -44,16 +44,16 @@ typedef struct {
+     
+ } PlacesViewCfgIface;
+ 
+-inline void
++void
+ places_view_cfg_iface_update_menu(PlacesViewCfgIface*);
+ 
+-inline void
++void
+ places_view_cfg_iface_update_button(PlacesViewCfgIface*);
+ 
+-inline void
++void
+ places_view_cfg_iface_reconfigure_model(PlacesViewCfgIface*);
+ 
+-inline GtkWidget*
++GtkWidget*
+ places_view_cfg_iface_make_empty_cfg_dialog(PlacesViewCfgIface*);
+ 
+ #include "cfg.h"