Contents of /trunk/xtdesktop/patches/xtdesktop-0.7b-build-fixes.patch
Parent Directory | Revision Log
Revision 1314 -
(show annotations)
(download)
Tue May 3 16:54:09 2011 UTC (13 years, 4 months ago) by niro
File size: 2164 byte(s)
Tue May 3 16:54:09 2011 UTC (13 years, 4 months ago) by niro
File size: 2164 byte(s)
added patch to fix builds with newer gcc
1 | diff -Naur xtdesktop-0.7b/desk.cc xtdesktop-0.7b-magellan/desk.cc |
2 | --- xtdesktop-0.7b/desk.cc 2005-11-15 13:02:54.000000000 +0100 |
3 | +++ xtdesktop-0.7b-magellan/desk.cc 2011-05-03 18:18:48.000000000 +0200 |
4 | @@ -174,7 +174,7 @@ |
5 | } |
6 | static int Filter_Links (const struct dirent * dir) |
7 | { |
8 | - char *p; |
9 | + const char *p; |
10 | static char *ext =".lnk"; |
11 | static int extlen = strlen(ext); |
12 | if( !(p = strstr(dir->d_name, ext)) ) return 0; |
13 | diff -Naur xtdesktop-0.7b/desk.h xtdesktop-0.7b-magellan/desk.h |
14 | --- xtdesktop-0.7b/desk.h 2004-09-08 09:25:25.000000000 +0200 |
15 | +++ xtdesktop-0.7b-magellan/desk.h 2011-05-03 18:15:34.000000000 +0200 |
16 | @@ -110,7 +110,7 @@ |
17 | void LoadIcons (void); |
18 | void setCheckMountProc (Icon * I); |
19 | static void procIsMounted (Icon * I); |
20 | - Boolean Desk::isMounted (char *mnt); |
21 | + Boolean isMounted (char *mnt); |
22 | static Boolean procExecJobs (XtPointer D); |
23 | Boolean ExecJobs (void); |
24 | inline Pixmap getUPixmap(void){return UnknownPixmap;}; |
25 | @@ -128,7 +128,7 @@ |
26 | inline int getCaptionBorder(void) { return CaptionBorder; }; |
27 | inline int getsnapX (void) { return snapX; }; |
28 | inline int getsnapY (void) { return snapY; }; |
29 | - void Desk::LowerIcons(Icon *I); |
30 | + void LowerIcons(Icon *I); |
31 | }; |
32 | |
33 | #endif |
34 | diff -Naur xtdesktop-0.7b/icon.h xtdesktop-0.7b-magellan/icon.h |
35 | --- xtdesktop-0.7b/icon.h 2011-05-03 18:19:30.000000000 +0200 |
36 | +++ xtdesktop-0.7b-magellan/icon.h 2011-05-03 18:15:47.000000000 +0200 |
37 | @@ -104,8 +104,8 @@ |
38 | void updateMount (Boolean state); |
39 | inline char* getConfigFile(void) { return ConfigFile; }; |
40 | void checkAccess( char *path, int mode ); |
41 | - void Icon::raiseme (void); |
42 | - void Icon::lowerme (void); |
43 | + void raiseme (void); |
44 | + void lowerme (void); |
45 | }; |
46 | |
47 | #endif |
48 | diff -Naur xtdesktop-0.7b/menu.h xtdesktop-0.7b-magellan/menu.h |
49 | --- xtdesktop-0.7b/menu.h 2004-06-07 15:13:16.000000000 +0200 |
50 | +++ xtdesktop-0.7b-magellan/menu.h 2011-05-03 18:16:17.000000000 +0200 |
51 | @@ -36,7 +36,7 @@ |
52 | }; |
53 | void AddCommand (char *item, char *command); |
54 | void AddProps(char *item, Icon *I); |
55 | - static void PopupMenu::procExec (Widget w, XtPointer client_data, |
56 | + static void procExec (Widget w, XtPointer client_data, |
57 | XtPointer call_data); |
58 | }; |
59 |