[pkgsrc/trunk]: pkgsrc/x11/xfce3 Make this compile (was: static after non-sta...

[is <is%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8ac5df1900c2
branches:  trunk
changeset: 540247:8ac5df1900c2
user:      is <is%pkgsrc.org@localhost>
date:      Fri Apr 04 09:19:49 2008 +0000

description:
Make this compile (was: static after non-static declaration error)

diffstat:

 x11/xfce3/distinfo         |   4 +++-
 x11/xfce3/patches/patch-ad |  14 ++++++++++++++
 x11/xfce3/patches/patch-ae |  21 +++++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletions(-)

diffs (58 lines):

diff -r 31cde32a9519 -r 8ac5df1900c2 x11/xfce3/distinfo
--- a/x11/xfce3/distinfo        Fri Apr 04 01:56:55 2008 +0000
+++ b/x11/xfce3/distinfo        Fri Apr 04 09:19:49 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/12/14 15:35:25 joerg Exp $
+$NetBSD: distinfo,v 1.4 2008/04/04 09:19:49 is Exp $
 
 SHA1 (xfce-3.8.18.tar.gz) = d4ab39c4ddeb68d2cc1ceb03af14b0e95b8f5c61
 RMD160 (xfce-3.8.18.tar.gz) = 5060b285e6f9bc1bfdda54d314d0c92832264268
@@ -6,3 +6,5 @@
 SHA1 (patch-aa) = 483963bb078ec5bf15cd7c51f34b4f4184848ceb
 SHA1 (patch-ab) = 58d94c58d30e09b56f3c4744844bc28adab284ba
 SHA1 (patch-ac) = 522fda7357121014b3570ebce1f64aaca3141a54
+SHA1 (patch-ad) = 49f7238d3bc4774cf5415698d3a1c4f9d4bfcb20
+SHA1 (patch-ae) = 74d136e005bb89bcd4b72b2d491dfe50917046e6
diff -r 31cde32a9519 -r 8ac5df1900c2 x11/xfce3/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xfce3/patches/patch-ad        Fri Apr 04 09:19:49 2008 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2008/04/04 09:19:49 is Exp $
+
+--- xfsamba/xfsamba.h.orig     2008-04-03 16:51:11.000000000 +0200
++++ xfsamba/xfsamba.h
+@@ -240,7 +240,8 @@ void cb_paste(GtkWidget * widget, GtkCTr
+ 
+ EXTERN selected_struc selected;
+ EXTERN nmb_list *thisN, *headN;
+-EXTERN nmb_history *thisH, *headH;
++EXTERN nmb_history *thisH;
++static nmb_history *headH;
+ EXTERN void *fork_obj;
+ EXTERN int SMBResult;
+ EXTERN int SMBabortdrop;
diff -r 31cde32a9519 -r 8ac5df1900c2 x11/xfce3/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xfce3/patches/patch-ae        Fri Apr 04 09:19:49 2008 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.1 2008/04/04 09:19:49 is Exp $
+
+--- xfgnome/xfgnome.h.orig     2001-07-13 19:57:44.000000000 +0200
++++ xfgnome/xfgnome.h
+@@ -140,13 +140,13 @@ static int list_desk_change (unsigned lo
+ 
+ static Atom _XA_WIN_SUPPORTING_WM_CHECK;
+ static Atom _XA_WIN_PROTOCOLS;
+-static Atom _XA_WIN_STATE;
++/*static*/ Atom _XA_WIN_STATE;
+ static Atom _XA_WIN_HINTS;
+ static Atom _XA_WIN_APP_STATE;
+ /*static Atom _XA_WIN_EXPANDED_SIZE;*/
+ static Atom _XA_WIN_ICONS;
+-static Atom _XA_WIN_WORKSPACE;
+-static Atom _XA_WIN_WORKSPACE_COUNT;
++/*static*/ Atom _XA_WIN_WORKSPACE;
++/*static*/ Atom _XA_WIN_WORKSPACE_COUNT;
+ static Atom _XA_WIN_WORKSPACE_NAMES;
+ static Atom _XA_WIN_CLIENT_LIST;
+ static Atom _XA_WIN_DESKTOP_BUTTON_PROXY;