[packages/WindowMaker] - rel 20, build fixes

baggins baggins at pld-linux.org
Fri Sep 26 22:46:37 CEST 2025


commit eb37fbb210bbf2d2726aa180f07a12a2b31d7b0c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Sep 27 00:46:22 2025 +0200

    - rel 20, build fixes

 WindowMaker.spec   |  8 +++++++-
 gcc14.patch        | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 giflib5.patch      | 42 ++++++++++++++++++++++++++++++++++++++++++
 multiple-def.patch | 11 +++++++++++
 4 files changed, 111 insertions(+), 1 deletion(-)
---
diff --git a/WindowMaker.spec b/WindowMaker.spec
index 34bdb5c..79ff9d3 100644
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -12,7 +12,7 @@ Summary(ru.UTF-8):	WindowMaker - оконный менеджер для X11
 Summary(uk.UTF-8):	WindowMaker - віконний менеджер для X11
 Name:		WindowMaker
 Version:	0.92.0
-Release:	19
+Release:	20
 License:	GPL
 Group:		X11/Window Managers
 Source0:	ftp://windowmaker.info/pub/source/release/%{name}-%{version}.tar.gz
@@ -40,6 +40,9 @@ Patch13:	%{name}-wine.patch
 Patch14:	%{name}-libpng14.patch
 Patch15:	%{name}-libpng15.patch
 Patch16:	%{name}-format.patch
+Patch17:	giflib5.patch
+Patch18:	gcc14.patch
+Patch19:	multiple-def.patch
 URL:		http://www.windowmaker.info/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -245,6 +248,9 @@ utilizando componentes estáticos (raramente necessário).
 %patch -P 14 -p1
 %patch -P 15 -p1
 %patch -P 16 -p1
+%patch -P 17 -p1
+%patch -P 18 -p1
+%patch -P 19 -p1
 
 for f in WindowMaker/*menu*; do
 	%{__sed} -i s,/GNUstep/Apps,/GNUstep/Applications, $f
diff --git a/gcc14.patch b/gcc14.patch
new file mode 100644
index 0000000..e823810
--- /dev/null
+++ b/gcc14.patch
@@ -0,0 +1,51 @@
+--- WindowMaker-0.92.0/WINGs/string.c~	2004-10-12 20:32:12.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/string.c	2025-09-27 00:26:21.256659488 +0200
+@@ -4,6 +4,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <ctype.h>
++#include <assert.h>
+ 
+ #include "WUtil.h"
+ 
+--- WindowMaker-0.92.0/src/actions.c~	2025-09-27 00:35:05.000000000 +0200
++++ WindowMaker-0.92.0/src/actions.c	2025-09-27 00:36:48.669992860 +0200
+@@ -49,6 +49,7 @@
+ #include "workspace.h"
+ #include "wsound.h"
+ #include "xinerama.h"
++#include "usermenu.h"
+ 
+ 
+ /****** Global Variables ******/
+--- WindowMaker-0.92.0/src/dock.c~	2025-09-27 00:35:05.000000000 +0200
++++ WindowMaker-0.92.0/src/dock.c	2025-09-27 00:38:32.196659537 +0200
+@@ -3779,7 +3779,7 @@
+ 
+     hasMoved = False;
+     if (wPreferences.flags.noupdates)
+-        return;
++        return 1;
+ 
+     if (XGrabPointer(dpy, icon->core->window, True, ButtonMotionMask
+                      |ButtonReleaseMask|ButtonPressMask, GrabModeAsync,
+--- WindowMaker-0.92.0/src/startup.c~	2025-09-27 00:35:05.000000000 +0200
++++ WindowMaker-0.92.0/src/startup.c	2025-09-27 00:42:12.529992876 +0200
+@@ -38,6 +38,7 @@
+ #include <X11/cursorfont.h>
+ #include <X11/Xproto.h>
+ #include <X11/keysym.h>
++#include <X11/Xresource.h>
+ #ifdef SHAPE
+ #include <X11/extensions/shape.h>
+ #endif
+--- WindowMaker-0.92.0/src/usermenu.c~	2004-10-12 19:47:56.000000000 +0200
++++ WindowMaker-0.92.0/src/usermenu.c	2025-09-27 00:43:03.519992886 +0200
+@@ -76,6 +76,7 @@
+ #include "actions.h"
+ #include "funcs.h"
+ #include "keybind.h"
++#include "xmodifier.h"
+ 
+ #include "framewin.h"
+ 
diff --git a/giflib5.patch b/giflib5.patch
new file mode 100644
index 0000000..63994c8
--- /dev/null
+++ b/giflib5.patch
@@ -0,0 +1,42 @@
+--- WindowMaker-0.92.0/wrlib/gif.c.orig	2004-10-12 20:21:01.000000000 +0200
++++ WindowMaker-0.92.0/wrlib/gif.c	2025-09-27 00:22:55.966659479 +0200
+@@ -61,10 +61,10 @@
+     /* default error message */
+     RErrorCode = RERR_BADINDEX;
+ 
+-    gif = DGifOpenFileName(file);
++    gif = DGifOpenFileName(file, NULL);
+ 
+     if (!gif) {
+-        switch (GifLastError()) {
++        switch (gif->Error) {
+         case D_GIF_ERR_OPEN_FAILED:
+             RErrorCode = RERR_OPEN;
+             break;
+@@ -79,7 +79,7 @@
+     }
+ 
+     if (gif->SWidth<1 || gif->SHeight<1) {
+-        DGifCloseFile(gif);
++        DGifCloseFile(gif, NULL);
+         RErrorCode = RERR_BADIMAGEFILE;
+         return NULL;
+     }
+@@ -202,7 +202,7 @@
+     /* yuck! */
+     goto did_not_get_any_errors;
+ giferr:
+-    switch (GifLastError()) {
++    switch (gif->Error) {
+     case D_GIF_ERR_OPEN_FAILED:
+         RErrorCode = RERR_OPEN;
+         break;
+@@ -223,7 +223,7 @@
+         free(buffer);
+ 
+     if (gif)
+-        DGifCloseFile(gif);
++        DGifCloseFile(gif, NULL);
+ 
+     return image;
+ }
diff --git a/multiple-def.patch b/multiple-def.patch
new file mode 100644
index 0000000..dd0af34
--- /dev/null
+++ b/multiple-def.patch
@@ -0,0 +1,11 @@
+--- WindowMaker-0.92.0/WINGs/WINGs/WINGsP.h~	2025-09-27 00:27:13.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/WINGs/WINGsP.h	2025-09-27 00:33:19.263326170 +0200
+@@ -121,7 +121,7 @@
+ } W_DragDestinationInfo;
+ 
+ 
+-struct W_DraggingInfo {
++typedef struct W_DraggingInfo {
+     unsigned char protocolVersion; /* version supported on the other side */
+     Time timestamp;
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/WindowMaker.git/commitdiff/eb37fbb210bbf2d2726aa180f07a12a2b31d7b0c



More information about the pld-cvs-commit mailing list