diff options
| author |   Wise Slacker | 2022-06-20 14:18:54 +0200 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo | 2022-07-02 04:55:43 +0200 |
| commit | 196eb943999dd063a587b15e30aaab941ba2804b (patch) | |
| tree | 5300798c0b2ca62fd4219087edd4e03d37b2d554 | |
| parent | ea6f99744db086119fce588e54fc8733c48844a0 (diff) | |
| download | slackbuilds-196eb943999dd063a587b15e30aaab941ba2804b.tar.gz | |
desktop/fvwm95: Patch for gcc >= 10.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | desktop/fvwm95/fvwm95.SlackBuild | 2 | ||||
| -rw-r--r-- | desktop/fvwm95/fvwm95.new.patch | 46 |
2 files changed, 48 insertions, 0 deletions
diff --git a/desktop/fvwm95/fvwm95.SlackBuild b/desktop/fvwm95/fvwm95.SlackBuild index 6a41e52cc5..596bf22c65 100644 --- a/desktop/fvwm95/fvwm95.SlackBuild +++ b/desktop/fvwm95/fvwm95.SlackBuild @@ -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" \ diff --git a/desktop/fvwm95/fvwm95.new.patch b/desktop/fvwm95/fvwm95.new.patch new file mode 100644 index 0000000000..3d5368e7a5 --- /dev/null +++ b/desktop/fvwm95/fvwm95.new.patch @@ -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; + |