hollalinux
/
slackbuilds
mirror of https://github.com/SlackBuildsOrg/slackbuilds.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

desktop/fvwm95: Patch for gcc >= 10.x. 

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Wise Slacker 2022-06-20 14:18:54 +02:00 committed by Willy Sudiarto Raharjo
parent ea6f99744d
commit 196eb94399
No known key found for this signature in database
GPG Key ID: 3F617144D7238786
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/fvwm95/fvwm95.SlackBuild
View File

@ -83,6 +83,8 @@ find -L . \
# Apply patch to make compilation possible
patch -p1 < $CWD/fvwm95.patch
# Apply patch to repair FvwmTaskbar 06/2022
patch -p1 < $CWD/fvwm95.new.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \

46
desktop/fvwm95/fvwm95.new.patch Normal file
View File

@ -0,0 +1,46 @@
diff -urpN fvwm95-2.0.43f.orig/modules/FvwmScroll/GrabWindow.c fvwm95-2.0.43f/modules/FvwmScroll/GrabWindow.c
--- fvwm95-2.0.43f.orig/modules/FvwmScroll/GrabWindow.c 2022-06-16 22:45:46.614676791 +0200
+++ fvwm95-2.0.43f/modules/FvwmScroll/GrabWindow.c 2022-06-17 23:58:40.056000000 +0200
@@ -38,10 +38,10 @@
#include <X11/Intrinsic.h>
#include "FvwmScroll.h"
-char *MyName;
+extern char *MyName;
-Display *dpy; /* which display are we talking to */
-int x_fd,fd_width;
+extern Display *dpy; /* which display are we talking to */
+extern int x_fd,fd_width;
int Width = 300, Height = 300;
int target_width, target_height;
int target_x_offset = 0, target_y_offset = 0;
@@ -55,9 +55,9 @@ int Reduction_V = 2;
#define PAD_WIDTH2 3
#define PAD_WIDTH3 5
-Window Root;
-int screen;
-int d_depth;
+extern Window Root;
+extern int screen;
+extern int d_depth;
Window main_win,holder_win;
Pixel back_pix, fore_pix, hilite_pix,shadow_pix;
diff -urpN fvwm95-2.0.43f.orig/modules/FvwmTaskBar/Goodies.c fvwm95-2.0.43f/modules/FvwmTaskBar/Goodies.c
--- fvwm95-2.0.43f.orig/modules/FvwmTaskBar/Goodies.c 2022-06-16 22:45:46.615676777 +0200
+++ fvwm95-2.0.43f/modules/FvwmTaskBar/Goodies.c 2022-06-17 23:59:05.760000000 +0200
@@ -46,7 +46,8 @@ XFontSet StatusFontset;
#endif
int stwin_width = 100, old_stwin_width = 100, goodies_width = 0;
int anymail, unreadmail, newmail, mailcleared = 0;
-int fontheight, clock_width;
+extern int fontheight;
+int clock_width;
int BellVolume = DEFAULT_BELL_VOLUME;
Pixmap mailpix, wmailpix, pmask, pclip, speakerpix, speakeroffpix,s_mask;
XpmAttributes s_attr;