millerson.name/gentoo
2
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-09 00:10:21 +03:00
Code Packages Projects Releases Wiki Activity

app-laptop/pbbuttonsd: fix build with gcc-15

Browse Source 
Closes: https://bugs.gentoo.org/947851
Closes: https://bugs.gentoo.org/948138
Closes: https://bugs.gentoo.org/946207
Closes: https://bugs.gentoo.org/944303
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/35160
Closes: https://github.com/gentoo/gentoo/pull/35160
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Alexander Golubev
2025-08-12 02:02:50 +03:00
committed by Sam James
parent ba58d9da80
commit 72b29691b9
2 changed files with 104 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1a-fix-build-with-gcc-15.patch Normal file
View File

@@ -0,0 +1,102 @@
Use consistent function signatures when handling function pointers
This fixes compilation with gcc-15.
Author: Alexander Golubev <fatzer2@gmail.com>
Bug: https://bugs.gentoo.org/944303
Bug: https://bugs.gentoo.org/946207
Bug: https://bugs.gentoo.org/947851
Bug: https://bugs.gentoo.org/948138
Origin: Self-created patch to fix the gentoo bug
diff --git a/src/class_backlight.h b/src/class_backlight.h
index db2ccdf..41f9e6a 100644
--- a/src/class_backlight.h
+++ b/src/class_backlight.h
@@ -40,7 +40,7 @@ struct driver_backlight {
char *name;
int (*get_brightness)();
int (*get_brightness_max)();
- void (*set_brightness)();
+ void (*set_brightness)(int val);
void (*driver_exit)();
};
diff --git a/src/input_manager.c b/src/input_manager.c
index dbbfc6b..1dcc61c 100644
--- a/src/input_manager.c
+++ b/src/input_manager.c
@@ -382,7 +382,7 @@ handleInputSource (GIOChannel *io, GIOCondition condition, gpointer data)
* @{
*/
InputSource*
-addInputSource (int fd, int (*handler)(), gpointer user_data, gboolean close_on_exit)
+addInputSource (int fd, int (*handler)(int fd, gpointer user_data), gpointer user_data, gboolean close_on_exit)
{
struct moddata_inputmanager *base = &modbase_inputmanager;
InputSource *src;
diff --git a/src/input_manager.h b/src/input_manager.h
index b65a500..b2de0d5 100644
--- a/src/input_manager.h
+++ b/src/input_manager.h
@@ -15,7 +15,7 @@
#include <glib.h>
#include <pbbtaglist.h>
-typedef void (*inputqueue_t)();
+typedef void (*inputqueue_t)(struct tagitem *taglist);
#define MAXINPUTS 16
#define TIMERCOUNT 3 /* ATTENTION: keep an eye on the init routine */
@@ -65,8 +65,8 @@ gint cbEventDevices (gconstpointer a, gconstpointer b);
void scanEventDevices ();
void destroyInputSource (gpointer data);
gboolean handleInputSource (GIOChannel *io, GIOCondition condition, gpointer data);
-InputSource *addInputSource (int fd, int (*handler)(), gpointer user_data, gboolean close_on_exit);
-int register_function (int queueid, void (*func)());
+InputSource *addInputSource (int fd, int (*handler)(int fd, gpointer user_data), gpointer user_data, gboolean close_on_exit);
+int register_function (int queueid, inputqueue_t func);
long process_queue_single (int queueid, long tag, long data);
int process_queue (int queueid, struct tagitem *taglist);
void ipc_handler ();
diff --git a/src/input_manager.c b/src/input_manager.c
index 1dcc61c..908d821 100644
--- a/src/input_manager.c
+++ b/src/input_manager.c
@@ -421,7 +421,7 @@ addInputSource (int fd, int (*handler)(int fd, gpointer user_data), gpointer use
/* --- queue managers --- */
int
-register_function (int queueid, void (*func)())
+register_function (int queueid, inputqueue_t func)
{
struct moddata_inputmanager *base = &modbase_inputmanager;
inputqueue_t *queue = base->iqueues[queueid];
@@ -486,12 +486,14 @@ process_queue (int queueid, struct tagitem *taglist)
* were successful.
*/
void
-ipc_handler ()
+ipc_handler (struct tagitem *taglist)
{
struct pbbmessage *msg;
struct tagitem *source, *dest;
char msgbuffer[8192];
+ (void) taglist; /* unused */
+
if ((ipc_receive (msgbuffer, sizeof(msgbuffer))) == 0) {
msg = (struct pbbmessage *) msgbuffer;
switch (msg->action) {
diff --git a/src/input_manager.h b/src/input_manager.h
index b2de0d5..ea78bf8 100644
--- a/src/input_manager.h
+++ b/src/input_manager.h
@@ -69,7 +69,7 @@ InputSource *addInputSource (int fd, int (*handler)(int fd, gpointer user_data),
int register_function (int queueid, inputqueue_t func);
long process_queue_single (int queueid, long tag, long data);
int process_queue (int queueid, struct tagitem *taglist);
-void ipc_handler ();
+void ipc_handler (struct tagitem *taglist);
gboolean input_event_handler (int fd, gpointer user_data);
/*gboolean mice_handler (int fd, gpointer user_data);*/
gboolean cb_timer100 (gpointer data);

3
app-laptop/pbbuttonsd/pbbuttonsd-0.8.1a-r1.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -36,6 +36,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.8.1-lz.patch
"${FILESDIR}"/${P}-fix-multiple-definition-in-alsa-and-oss.patch
"${FILESDIR}"/${P}-fix-build-with-dash.patch
"${FILESDIR}"/${P}-fix-build-with-gcc-15.patch
)
src_prepare() {