[packages/hotkeys] - fixed missing includes and mistaken types; release 8

[qboosh]

commit 614e1ffcf68c28f27376664a5327b099dbdf9f6f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Sep 2 22:23:52 2025 +0200

    - fixed missing includes and mistaken types; release 8

 hotkeys-includes.patch | 135 +++++++++++++++++++++++++++++++++++++++++++++++++
 hotkeys.spec           |   4 +-
 2 files changed, 138 insertions(+), 1 deletion(-)
---
diff --git a/hotkeys.spec b/hotkeys.spec
index bfa146d..26b4253 100644
--- a/hotkeys.spec
+++ b/hotkeys.spec
@@ -2,7 +2,7 @@ Summary:	A program to use the special keys on internet/multimedia keyboards
 Summary(pl.UTF-8):	Obsługa klawiszy specjalnych na internetowych/multimedialnych klawiaturach
 Name:		hotkeys
 Version:	0.5.7.1
-Release:	7
+Release:	8
 License:	GPL v2+
 Group:		X11/Applications/Multimedia
 Source0:	http://ypwong.org/hotkeys/%{version}/%{name}_%{version}.tar.gz
@@ -13,6 +13,7 @@ Patch0:		%{name}-db41.patch
 Patch1:		%{name}-libxml2.patch
 Patch2:		%{name}-ac_am.patch
 Patch3:		%{name}-home_etc.patch
+Patch4:		%{name}-includes.patch
 URL:		http://ypwong.org/hotkeys/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -47,6 +48,7 @@ plik formacie XML.
 %patch -P1 -p1
 %patch -P2 -p1
 %patch -P3 -p1
+%patch -P4 -p1
 
 cat %{SOURCE1} >> acinclude.m4
 
diff --git a/hotkeys-includes.patch b/hotkeys-includes.patch
new file mode 100644
index 0000000..1548946
--- /dev/null
+++ b/hotkeys-includes.patch
@@ -0,0 +1,135 @@
+--- hotkeys-0.5.7.1/acinclude.m4.orig	2025-09-02 20:04:20.719622904 +0200
++++ hotkeys-0.5.7.1/acinclude.m4	2025-09-02 20:07:39.884203139 +0200
+@@ -369,6 +369,7 @@ AC_DEFUN(AM_CHECK_DB3,
+     AC_MSG_CHECKING(for version of db3)
+     AC_TRY_RUN([
+     #include <db.h>
++    #include <stdlib.h>
+     int main ()
+     {
+         int major=0, minor=0, patch=0;
+@@ -434,6 +435,7 @@ dnl    AC_SUBST(XML_LIBS)
+     AC_MSG_CHECKING(for xmlChildrenNode in parser.h)
+     AC_TRY_RUN([
+     #include <parser.h>
++    #include <stdlib.h>
+     int main ()
+     {
+ #ifdef xmlChildrenNode
+--- hotkeys-0.5.7.1/src/xmalloc.c.orig	2001-01-17 18:14:33.000000000 +0100
++++ hotkeys-0.5.7.1/src/xmalloc.c	2025-09-02 21:26:01.263245446 +0200
+@@ -19,6 +19,7 @@
+ # include <config.h>
+ #endif
+ #include "common.h"
++#include "hotkeys.h"
+ 
+ #include <sys/types.h>
+ 
+--- hotkeys-0.5.7.1/src/conf.c.orig	2025-09-02 20:09:24.194856192 +0200
++++ hotkeys-0.5.7.1/src/conf.c	2025-09-02 21:27:10.813673265 +0200
+@@ -23,6 +23,7 @@
+ #  include <config.h>
+ #endif
+ #include "common.h"
++#include "hotkeys.h"
+ 
+ #include <stdio.h>
+ #include <db.h>
+--- hotkeys-0.5.7.1/src/fixVMware.c.orig	2001-03-14 18:33:53.000000000 +0100
++++ hotkeys-0.5.7.1/src/fixVMware.c	2025-09-02 21:32:41.539042455 +0200
+@@ -22,6 +22,8 @@
+ #include <signal.h>
+ #include <unistd.h>
+ #include <pthread.h>
++#include <stdlib.h>
++#include <strings.h>
+ 
+ #include "hotkeys.h"
+ 
+@@ -34,8 +36,8 @@ fixIt(int sig)
+     XFlush(dpy);
+ }
+ 
+-static void
+-startFixVMwareThread(void)
++static void *
++startFixVMwareThread(void *v_)
+ {
+     struct sigaction s;
+     sigset_t    set;
+@@ -55,6 +57,7 @@ startFixVMwareThread(void)
+         alarm(interval);
+         pause();
+     }
++    return NULL;
+ }
+ 
+ void
+--- hotkeys-0.5.7.1/src/hotkeys.c.orig	2002-12-03 20:26:32.000000000 +0100
++++ hotkeys-0.5.7.1/src/hotkeys.c	2025-09-02 21:41:46.479068187 +0200
+@@ -77,6 +77,13 @@ extern char *getenv();
+ #include "conf.h"
+ 
+ #include <X11/Xmu/Error.h>
++#include <X11/Xmu/SysUtil.h>
++#include <gtk/gtk.h>
++
++void fixVMware(char* time);
++void readConfigFile(void);
++
++int fork2(void);
+ 
+ #define	lowbit(x)	((x) & (-(x)))
+ #define	M(m)	fprintf(stderr,(m))
+@@ -595,7 +602,7 @@ adjustVol(int adj)
+     int sign = adj > 0 ? 1 : -1;
+ 
+     if ( adj == 0 )
+-        return;
++        return ret;
+ 
+     if ( multiplier == 0 )
+     {
+@@ -883,13 +890,13 @@ doMute(void)
+     return ret;
+ }
+ 
+-static int 
+-ejectDisc(void)
++static void* 
++ejectDisc(void*v)
+ {
+     int fd, status;
+ 
+     if ( cdromDevice == NULL )
+-        return 0;
++        return NULL;
+ 
+     /* the idea of this code is from xine's vcd plugin, mostly linux
+        specific FIXME */
+@@ -933,12 +940,12 @@ ejectDisc(void)
+                 break;
+         }
+         close(fd);
+-        return 0;
++        return NULL;
+     }
+     else
+     {
+         SYSLOG(LOG_NOTICE, "CDROM_DRIVE_STATUS failed: %s\n", strerror(errno));
+-        return -1;
++        return (void*)-1;
+     }
+ }
+ 
+--- hotkeys-0.5.7.1/src/hotkeys.h.orig	2002-11-27 20:33:50.000000000 +0100
++++ hotkeys-0.5.7.1/src/hotkeys.h	2025-09-02 21:42:00.649155533 +0200
+@@ -42,7 +42,6 @@ static Display* GetDisplay(char* program
+ void bailout(void);
+ static int adjust_vol(int adj);
+ static int doMute(void);
+-static int ejectDisc(void);
+ static int closeTray(void);
+ static int launchApp(int keycode);
+ static void printXkbActionMessage(FILE* file,XkbEvent* xkbev);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hotkeys.git/commitdiff/614e1ffcf68c28f27376664a5327b099dbdf9f6f