Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm
In directory sc8-pr-cvs17:/tmp/cvs-serv2090/main/finkinfo/x11-wm
Modified Files:
Tag: pangocairo-branch
xfce-taskbar.info
Added Files:
Tag: pangocairo-branch
xfce-taskbar.patch
Log Message:
more buildfink fixes
--- NEW FILE: xfce-taskbar.patch ---
diff -uNr xfce-3.8.18/xfce/taskbar.c xfce-3.8.18-new/xfce/taskbar.c
--- xfce-3.8.18/xfce/taskbar.c 2002-09-26 05:22:22.000000000 -0400
+++ xfce-3.8.18-new/xfce/taskbar.c 2007-07-19 16:02:54.000000000 -0400
@@ -1696,7 +1696,6 @@
case TASKBAR_SORT_UNSORTED:
fprintf(f,"\tSortByUnsorted\n");
break;
- default:
}
}
diff -uNr xfce-3.8.18/xfgnome/xfgnome.c xfce-3.8.18-new/xfgnome/xfgnome.c
--- xfce-3.8.18/xfgnome/xfgnome.c 2001-08-10 09:11:08.000000000 -0400
+++ xfce-3.8.18-new/xfgnome/xfgnome.c 2007-07-19 16:07:36.000000000 -0400
@@ -20,6 +20,8 @@
# include <config.h>
#endif
+#define XFGNOME
+
#include <X11/Intrinsic.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
diff -uNr xfce-3.8.18/xfsamba/xfsamba.c xfce-3.8.18-new/xfsamba/xfsamba.c
--- xfce-3.8.18/xfsamba/xfsamba.c 2002-05-10 20:42:33.000000000 -0400
+++ xfce-3.8.18-new/xfsamba/xfsamba.c 2007-07-19 16:13:09.000000000 -0400
@@ -26,6 +26,8 @@
# include <config.h>
#endif
+#define _XFSAMBA_NOHEADH_
+
#include <unistd.h>
#include <stdarg.h>
#include <signal.h>
diff -uNr xfce-3.8.18/xfsamba/xfsamba.h xfce-3.8.18-new/xfsamba/xfsamba.h
--- xfce-3.8.18/xfsamba/xfsamba.h 2002-11-10 08:27:33.000000000 -0500
+++ xfce-3.8.18-new/xfsamba/xfsamba.h 2007-07-19 16:13:09.000000000 -0400
@@ -240,7 +240,10 @@
EXTERN selected_struc selected;
EXTERN nmb_list *thisN, *headN;
-EXTERN nmb_history *thisH, *headH;
+EXTERN nmb_history *thisH;
+#ifndef _XFSAMBA_NOHEADH_
+EXTERN nmb_history *headH;
+#endif
EXTERN void *fork_obj;
EXTERN int SMBResult;
EXTERN int SMBabortdrop;
diff -uNr xfce-3.8.18/xfsamba/xfsamba_mem.c
xfce-3.8.18-new/xfsamba/xfsamba_mem.c
--- xfce-3.8.18/xfsamba/xfsamba_mem.c 2002-11-10 08:27:33.000000000 -0500
+++ xfce-3.8.18-new/xfsamba/xfsamba_mem.c 2007-07-19 16:13:09.000000000
-0400
@@ -26,6 +26,8 @@
# include <config.h>
#endif
+#define _XFSAMBA_NOHEADH_
+
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
#endif
diff -uNr xfce-3.8.18/xfwm/xfwm.h xfce-3.8.18-new/xfwm/xfwm.h
--- xfce-3.8.18/xfwm/xfwm.h 2002-05-22 17:24:36.000000000 -0400
+++ xfce-3.8.18-new/xfwm/xfwm.h 2007-07-19 16:07:44.000000000 -0400
@@ -352,10 +352,14 @@
extern Atom _XA_OL_DECOR_RESIZE;
extern Atom _XA_OL_DECOR_HEADER;
extern Atom _XA_OL_DECOR_ICON_NAME;
+#ifndef XFGNOME
extern Atom _XA_WIN_WORKSPACE_COUNT;
extern Atom _XA_WIN_WORKSPACE;
+#endif
extern Atom _XA_WIN_LAYER;
+#ifndef XFGNOME
extern Atom _XA_WIN_STATE;
+#endif
extern Atom _XA_WM_WINDOW_ROLE;
extern Atom _XA_WM_CLIENT_LEADER;
Index: xfce-taskbar.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm/xfce-taskbar.info,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- xfce-taskbar.info 20 Apr 2007 16:25:30 -0000 1.1.2.3
+++ xfce-taskbar.info 19 Jul 2007 20:28:22 -0000 1.1.2.4
@@ -6,6 +6,7 @@
BuildDepends: imlib, gdk-pixbuf, libjpeg, libpng3, libtiff, netpbm, audiofile,
esound, glib, orbit-dev, giflib, gnome-libs-dev, gettext-dev, gettext-bin,
gettext-tools, libiconv-dev, gcc3.3
Source: mirror:sourceforge:xfce/xfce-%v.tar.gz
Source-MD5: 04c197eee32d712a49170539d50279ea
+Patch: %n.patch
Conflicts: xfce
Replaces: xfce
ConfigureParams: --mandir=%p/share/man --with-data-dir=%p/share/xfce
--with-conf-dir=%p/etc/xfce --enable-taskbar
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
