[packages/alltray] Rel 4
arekm
arekm at pld-linux.org
Tue May 12 19:12:45 CEST 2026
commit 45fe3f6603b88512da3d7ec27a8927a5d8023fd4
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue May 12 19:12:31 2026 +0200
Rel 4
alltray-common-h-extern.patch | 287 ++++++++++++++++++++++++++++++++++++++++++
alltray.spec | 4 +-
2 files changed, 290 insertions(+), 1 deletion(-)
---
diff --git a/alltray.spec b/alltray.spec
index 1847f98..a874eac 100644
--- a/alltray.spec
+++ b/alltray.spec
@@ -2,7 +2,7 @@ Summary: AllTray - small program to dock application into the system tray
Summary(pl.UTF-8): AllTray - mały program do dokowania aplikacji w tacce systemowej
Name: alltray
Version: 0.70
-Release: 3
+Release: 4
License: GPL v2+
Group: X11/Applications
#Source0Download: https://github.com/mbt/alltray/releases
@@ -11,6 +11,7 @@ Group: X11/Applications
Source0: http://downloads.sourceforge.net/alltray/%{name}-%{version}.tar.gz
# Source0-md5: 675a0a60f22fae04da787095ef0bd7d9
Patch0: %{name}-link.patch
+Patch1: %{name}-common-h-extern.patch
URL: https://launchpad.net/alltray
BuildRequires: GConf2-devel >= 2.0
BuildRequires: autoconf
@@ -36,6 +37,7 @@ KDE, Xfce 4, Fluxboksem i WindowMakerem.
%prep
%setup -q
%patch -P0 -p1
+%patch -P1 -p1
%build
%{__libtoolize}
diff --git a/alltray-common-h-extern.patch b/alltray-common-h-extern.patch
new file mode 100644
index 0000000..66c457d
--- /dev/null
+++ b/alltray-common-h-extern.patch
@@ -0,0 +1,287 @@
+--- alltray-0.70/src/common.h.orig 2026-05-12 00:45:40.585676217 +0200
++++ alltray-0.70/src/common.h 2026-05-12 00:45:51.162707876 +0200
+@@ -41,35 +41,35 @@
+ #define LEFT 0
+ #define NO_SUCCESS -1
+
+-Atom wm_name_atom;
+-Atom wm_icon_atom;
+-Atom net_wm_icon;
+-Atom net_wm_name;
+-Atom net_close_window;
+-Atom wm_delete_window;
+-Atom wm_take_focus;
+-Atom net_wm_ping;
+-Atom net_wm_pid;
+-Atom net_number_of_desktops;
+-Atom net_current_desktop;
+-Atom net_wm_state_skip_pager;
+-Atom net_wm_state_skip_taskbar;
+-Atom net_wm_state;
+-Atom wm_state;
+-Atom net_wm_state_sticky;
+-Atom net_wm_desktop;
+-Atom net_active_window;
+-Atom net_wm_window_type;
+-Atom net_wm_window_type_normal;
+-Atom selection_atom;
+-Atom manager_atom;
+-Atom system_tray_opcode_atom;
+-Atom net_client_list_stacking;
+-Atom net_client_list;
+-Atom gdk_timestamp_prop;
+-Atom utf8_string;
+-Atom net_wm_visible_name;
+-Atom alltray_found_window;
++extern Atom wm_name_atom;
++extern Atom wm_icon_atom;
++extern Atom net_wm_icon;
++extern Atom net_wm_name;
++extern Atom net_close_window;
++extern Atom wm_delete_window;
++extern Atom wm_take_focus;
++extern Atom net_wm_ping;
++extern Atom net_wm_pid;
++extern Atom net_number_of_desktops;
++extern Atom net_current_desktop;
++extern Atom net_wm_state_skip_pager;
++extern Atom net_wm_state_skip_taskbar;
++extern Atom net_wm_state;
++extern Atom wm_state;
++extern Atom net_wm_state_sticky;
++extern Atom net_wm_desktop;
++extern Atom net_active_window;
++extern Atom net_wm_window_type;
++extern Atom net_wm_window_type_normal;
++extern Atom selection_atom;
++extern Atom manager_atom;
++extern Atom system_tray_opcode_atom;
++extern Atom net_client_list_stacking;
++extern Atom net_client_list;
++extern Atom gdk_timestamp_prop;
++extern Atom utf8_string;
++extern Atom net_wm_visible_name;
++extern Atom alltray_found_window;
+
+ typedef struct _balloon_struct {
+
+--- alltray-0.70/src/utils.c.orig 2026-05-12 00:45:40.587407083 +0200
++++ alltray-0.70/src/utils.c 2026-05-12 00:45:51.162960909 +0200
+@@ -50,6 +50,36 @@
+ #include "inlinepixbufs.h"
+ #include "config.h"
+
++Atom wm_name_atom;
++Atom wm_icon_atom;
++Atom net_wm_icon;
++Atom net_wm_name;
++Atom net_close_window;
++Atom wm_delete_window;
++Atom wm_take_focus;
++Atom net_wm_ping;
++Atom net_wm_pid;
++Atom net_number_of_desktops;
++Atom net_current_desktop;
++Atom net_wm_state_skip_pager;
++Atom net_wm_state_skip_taskbar;
++Atom net_wm_state;
++Atom wm_state;
++Atom net_wm_state_sticky;
++Atom net_wm_desktop;
++Atom net_active_window;
++Atom net_wm_window_type;
++Atom net_wm_window_type_normal;
++Atom selection_atom;
++Atom manager_atom;
++Atom system_tray_opcode_atom;
++Atom net_client_list_stacking;
++Atom net_client_list;
++Atom gdk_timestamp_prop;
++Atom utf8_string;
++Atom net_wm_visible_name;
++Atom alltray_found_window;
++
+ char *event_names[] = {
+ "",
+ "",
+--- alltray-0.70/lib/nomap.c.orig 2026-05-12 00:45:15.976431906 +0200
++++ alltray-0.70/lib/nomap.c 2026-05-12 00:45:24.416978916 +0200
+@@ -51,6 +51,7 @@
+ #include <X11/Xutil.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <X11/Xatom.h>
+
+ #include "config.h"
+@@ -180,7 +181,7 @@
+ DPRINTF ((stderr, "set error handler\n"));
+
+ void *dlh_xerr = NULL;
+- int (*fptr_xerr)() = 0;
++ XErrorHandler (*fptr_xerr)(XErrorHandler) = 0;
+
+ dlh_xerr = dlopen ("libX11.so", RTLD_GLOBAL | RTLD_NOW);
+
+@@ -190,7 +191,7 @@
+ if (dlh_xerr != NULL) {
+ dlclose (dlh_xerr);
+
+- fptr_xerr = (int (*)())dlsym (dlh_xerr, "XSetErrorHandler");
++ fptr_xerr = (XErrorHandler (*)(XErrorHandler))dlsym (dlh_xerr, "XSetErrorHandler");
+
+ if (fptr_xerr != NULL) {
+ DPRINTF ((stderr, "liballtraynomap: set error handler\n"));
+@@ -241,7 +242,7 @@
+ DPRINTF ((stderr, "set error handler\n"));
+
+ void *dlh_xerr = NULL;
+- int (*fptr_xerr)() = 0;
++ XErrorHandler (*fptr_xerr)(XErrorHandler) = 0;
+
+ dlh_xerr = dlopen ("libX11.so", RTLD_GLOBAL | RTLD_NOW);
+
+@@ -251,7 +252,7 @@
+ if (dlh_xerr != NULL) {
+ dlclose (dlh_xerr);
+
+- fptr_xerr = (int (*)())dlsym (dlh_xerr, "XSetErrorHandler");
++ fptr_xerr = (XErrorHandler (*)(XErrorHandler))dlsym (dlh_xerr, "XSetErrorHandler");
+
+ if (fptr_xerr != NULL) {
+ DPRINTF ((stderr, "liballtraynomap: set error handler\n"));
+@@ -277,7 +278,7 @@
+ XMapWindow (Display* display, Window w)
+ {
+
+- static int (*fptr)() = 0;
++ static int (*fptr)(Display*, Window) = 0;
+ int value;
+
+ static int xmms_main=0;
+@@ -291,7 +292,7 @@
+ DPRINTF ((stderr, "liballtraynomap: set error handler\n"));
+
+ void *dlh_xerr = NULL;
+- int (*fptr_xerr)() = 0;
++ XErrorHandler (*fptr_xerr)(XErrorHandler) = 0;
+
+ dlh_xerr = dlopen ("libX11.so", RTLD_GLOBAL | RTLD_NOW);
+
+@@ -301,7 +302,7 @@
+ if (dlh_xerr != NULL) {
+ dlclose (dlh_xerr);
+
+- fptr_xerr = (int (*)())dlsym (dlh_xerr, "XSetErrorHandler");
++ fptr_xerr = (XErrorHandler (*)(XErrorHandler))dlsym (dlh_xerr, "XSetErrorHandler");
+
+ if (fptr_xerr != NULL) {
+ DPRINTF ((stderr, "liballtraynomap: set error handler\n"));
+@@ -311,7 +312,7 @@
+ }
+
+ #ifdef RTLD_NEXT
+- fptr = (int (*)())dlsym (RTLD_NEXT, "XMapWindow");
++ fptr = (int (*)(Display*, Window))dlsym (RTLD_NEXT, "XMapWindow");
+ #else
+
+ DPRINTF ((stderr, "liballtraynomap: no RTLD_NEXT\n"));
+@@ -326,7 +327,7 @@
+ fprintf (stderr, "liballtraynomap: %s\n", dlerror ());
+
+ if (dlh != NULL) {
+- fptr = (int (*)())dlsym (dlh, "XMapWindow");
++ fptr = (int (*)(Display*, Window))dlsym (dlh, "XMapWindow");
+ dlclose (dlh);
+ }
+
+@@ -456,7 +457,7 @@
+ extern int XMapSubwindows(Display *display, Window w)
+ {
+
+- static int (*fptr)() = 0;
++ static int (*fptr)(Display*, Window) = 0;
+ int value;
+
+ if (fptr == 0) {
+@@ -465,7 +466,7 @@
+ DPRINTF ((stderr, "liballtraynomap: set error handler\n"));
+
+ void *dlh_xerr = NULL;
+- int (*fptr_xerr)() = 0;
++ XErrorHandler (*fptr_xerr)(XErrorHandler) = 0;
+
+ dlh_xerr = dlopen ("libX11.so", RTLD_GLOBAL | RTLD_NOW);
+
+@@ -475,7 +476,7 @@
+ if (dlh_xerr != NULL) {
+ dlclose (dlh_xerr);
+
+- fptr_xerr = (int (*)())dlsym (dlh_xerr, "XSetErrorHandler");
++ fptr_xerr = (XErrorHandler (*)(XErrorHandler))dlsym (dlh_xerr, "XSetErrorHandler");
+
+ if (fptr_xerr != NULL) {
+ DPRINTF ((stderr, "liballtraynomap: set error handler\n"));
+@@ -486,7 +487,7 @@
+
+
+ #ifdef RTLD_NEXT
+- fptr = (int (*)())dlsym (RTLD_NEXT, "XMapSubwindows");
++ fptr = (int (*)(Display*, Window))dlsym (RTLD_NEXT, "XMapSubwindows");
+ #else
+
+ DPRINTF ((stderr, "liballtraynomap: no RTLD_NEXT\n"));
+@@ -501,7 +502,7 @@
+ fprintf (stderr, "liballtraynomap: %s\n", dlerror ());
+
+ if (dlh != NULL) {
+- fptr = (int (*)())dlsym (dlh, "XMapSubwindows");
++ fptr = (int (*)(Display*, Window))dlsym (dlh, "XMapSubwindows");
+ dlclose (dlh);
+ }
+
+@@ -544,7 +545,7 @@
+ XMapRaised (Display* display, Window w)
+ {
+
+- static int (*fptr)() = 0;
++ static int (*fptr)(Display*, Window) = 0;
+ int value;
+
+ if (fptr == 0) {
+@@ -552,7 +553,7 @@
+ DPRINTF ((stderr, "liballtraynomap: set error handler\n"));
+
+ void *dlh_xerr = NULL;
+- int (*fptr_xerr)() = 0;
++ XErrorHandler (*fptr_xerr)(XErrorHandler) = 0;
+
+ dlh_xerr = dlopen ("libX11.so", RTLD_GLOBAL | RTLD_NOW);
+
+@@ -562,7 +563,7 @@
+ if (dlh_xerr != NULL) {
+ dlclose (dlh_xerr);
+
+- fptr_xerr = (int (*)())dlsym (dlh_xerr, "XSetErrorHandler");
++ fptr_xerr = (XErrorHandler (*)(XErrorHandler))dlsym (dlh_xerr, "XSetErrorHandler");
+
+ if (fptr_xerr != NULL) {
+ DPRINTF ((stderr, "liballtraynomap: set error handler\n"));
+@@ -573,7 +574,7 @@
+
+
+ #ifdef RTLD_NEXT
+- fptr = (int (*)())dlsym (RTLD_NEXT, "XMapRaised");
++ fptr = (int (*)(Display*, Window))dlsym (RTLD_NEXT, "XMapRaised");
+ #else
+
+ DPRINTF ((stderr, "liballtraynomap: no RTLD_NEXT\n"));
+@@ -588,7 +589,7 @@
+ fprintf (stderr, "liballtraynomap: %s\n", dlerror ());
+
+ if (dlh != NULL) {
+- fptr = (int (*)())dlsym (dlh, "XMapRaised");
++ fptr = (int (*)(Display*, Window))dlsym (dlh, "XMapRaised");
+ dlclose (dlh);
+ }
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/alltray.git/commitdiff/45fe3f6603b88512da3d7ec27a8927a5d8023fd4
More information about the pld-cvs-commit
mailing list