[packages/AfterStep] - build fixes, release 4

[qboosh]

commit ab1ac5c7583b22c96103948f45fccaf809a09bbc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Sep 30 05:50:51 2025 +0200

    - build fixes, release 4

 AfterStep-includes.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 AfterStep.spec           | 16 +++++++++-------
 2 files changed, 55 insertions(+), 7 deletions(-)
---
diff --git a/AfterStep.spec b/AfterStep.spec
index e4497e8..807f627 100644
--- a/AfterStep.spec
+++ b/AfterStep.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
-%bcond_with	mmx		# use MMX
-%bcond_with	gnome2		# build with support for GNOME2 wm-properties
+%bcond_with	mmx		# MMX instructions
+%bcond_with	gnome2		# GNOME2 wm-properties support
 %bcond_without	opengl		# GLX support
 #
 %ifarch pentium3 pentium4 athlon %{x8664}
@@ -16,7 +16,7 @@ Summary(ja.UTF-8):	AfterStep ウィンドウマネージャ (NeXT風)
 Summary(pl.UTF-8):	AfterStep - zarządca okien
 Name:		AfterStep
 Version:	%{afterstep_ver}
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		X11/Window Managers
 Source0:	ftp://ftp.afterstep.org/stable/%{name}-%{version}.tar.bz2
@@ -30,6 +30,7 @@ Patch3:		%{name}-link.patch
 Patch4:		%{name}-ac.patch
 Patch5:		%{name}-inline.patch
 Patch6:		%{name}-ar.patch
+Patch7:		%{name}-includes.patch
 URL:		http://www.afterstep.org/
 %{?with_opengl:BuildRequires:	OpenGL-devel}
 BuildRequires:	alsa-lib-devel >= 0.9
@@ -235,6 +236,7 @@ Statyczna biblioteka AfterImage.
 %patch -P4 -p1
 %patch -P5 -p1
 %patch -P6 -p1
+%patch -P7 -p1
 
 #cp -f autoconf/configure*.in .
 
@@ -379,11 +381,11 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libAfterBase
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libAfterBase.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libAfterBase.so.0
+%ghost %{_libdir}/libAfterBase.so.0
 
 %files -n libAfterBase-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libAfterBase.so
+%{_libdir}/libAfterBase.so
 %{_includedir}/libAfterBase
 
 %files -n libAfterBase-static
@@ -404,13 +406,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/asvector
 %attr(755,root,root) %{_bindir}/asview
 %attr(755,root,root) %{_libdir}/libAfterImage.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libAfterImage.so.0
+%ghost %{_libdir}/libAfterImage.so.0
 
 %files -n libAfterImage-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/afterimage-config
 %attr(755,root,root) %{_bindir}/afterimage-libs
-%attr(755,root,root) %{_libdir}/libAfterImage.so
+%{_libdir}/libAfterImage.so
 %{_includedir}/libAfterImage
 %{_mandir}/man3/afterimage.3x*
 %{_mandir}/man3/ascmap.3x*
diff --git a/AfterStep-includes.patch b/AfterStep-includes.patch
new file mode 100644
index 0000000..d621b0b
--- /dev/null
+++ b/AfterStep-includes.patch
@@ -0,0 +1,46 @@
+--- afterstep-devel-2.2.12/libAfterConf/Feel.c.orig	2013-05-01 15:34:11.000000000 +0200
++++ afterstep-devel-2.2.12/libAfterConf/Feel.c	2025-09-29 21:51:33.654931170 +0200
+@@ -29,6 +29,7 @@
+ 
+ #include "afterconf.h"
+ 
++#include <X11/XKBlib.h>
+ 
+ flag_options_xref WindowBoxFlagsXref[] = {
+ 	{ASA_Virtual, WINDOWBOX_Virtual_ID, 0}
+--- afterstep-devel-2.2.12/src/afterstep/afterstep.c.orig	2013-05-01 15:34:11.000000000 +0200
++++ afterstep-devel-2.2.12/src/afterstep/afterstep.c	2025-09-30 05:33:44.226021526 +0200
+@@ -34,6 +34,12 @@
+ #include "../../libAfterStep/wmprops.h"
+ #include "../../libAfterStep/moveresize.h"
+ 
++/* in dbus.c */
++Bool asdbus_GetCanHibernate (void);
++Bool asdbus_GetCanSuspend (void);
++Bool asdbus_Hibernate (int timeout);
++Bool asdbus_Suspend (int timeout);
++void asdbus_UnregisterSMClient (const char *sm_client_path);
+ 
+ /**************************************************************************/
+ /* 		Global variables that defines our behaviour 		  */
+--- afterstep-devel-2.2.12/src/afterstep/events.c.orig	2013-05-01 15:34:11.000000000 +0200
++++ afterstep-devel-2.2.12/src/afterstep/events.c	2025-09-30 05:40:12.161446073 +0200
+@@ -45,6 +45,7 @@
+ #include "../../libAfterStep/wmprops.h"
+ #include "../../libAfterStep/moveresize.h"
+ 
++#include <X11/XKBlib.h>
+ #include <X11/keysym.h>
+ #ifdef XSHMIMAGE
+ # include <sys/ipc.h>
+--- afterstep-devel-2.2.12/src/afterstep/menuitem.c.orig	2013-05-01 15:34:11.000000000 +0200
++++ afterstep-devel-2.2.12/src/afterstep/menuitem.c	2025-09-30 05:42:37.348894993 +0200
+@@ -53,6 +53,8 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
++#include <X11/XKBlib.h>
++
+ #include "dirtree.h"
+ 
+ /***************************************************************************/
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/AfterStep.git/commitdiff/ab1ac5c7583b22c96103948f45fccaf809a09bbc