[packages/libjsw] Rel 3

arekm arekm at pld-linux.org
Sun Mar 15 10:51:26 CET 2026


commit 13833e8565ac7c27edcdbb360e82e63a1d2dd594
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Mar 15 10:51:18 2026 +0100

    Rel 3

 libjsw-gcc14.patch   | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 libjsw-nostrip.patch | 28 ++++++++++++++++++++++++++
 libjsw.spec          |  6 +++++-
 3 files changed, 88 insertions(+), 1 deletion(-)
---
diff --git a/libjsw.spec b/libjsw.spec
index 904ccf7..b00f014 100644
--- a/libjsw.spec
+++ b/libjsw.spec
@@ -2,7 +2,7 @@ Summary:	UNIX Joystick Wrapper Library and calibrator
 Summary(pl.UTF-8):	Biblioteka do obsługi joysticka pod Uniksem
 Name:		libjsw
 Version:	1.5.8
-Release:	2
+Release:	3
 License:	GPL-like
 Group:		Libraries
 Source0:	http://wolfsinger.com/~wolfpack/packages/%{name}-%{version}.tar.bz2
@@ -11,6 +11,8 @@ Source1:	jscalibrator.desktop
 Source2:	jscalibrator.png
 Patch0:		%{name}-intbool.patch
 Patch1:		%{name}-link.patch
+Patch2:		%{name}-gcc14.patch
+Patch3:		%{name}-nostrip.patch
 URL:		http://freecode.com/projects/libjsw
 BuildRequires:	gtk+-devel
 BuildRequires:	libstdc++-devel
@@ -57,6 +59,8 @@ Kalibrator joysticka do używania z libjsw.
 %setup -q
 %patch -P0 -p1
 %patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
 
 %build
 cd libjsw
diff --git a/libjsw-gcc14.patch b/libjsw-gcc14.patch
new file mode 100644
index 0000000..194085e
--- /dev/null
+++ b/libjsw-gcc14.patch
@@ -0,0 +1,55 @@
+--- libjsw-1.5.8/jscalibrator/jcwidgets.c.orig	2008-08-14 10:21:54.000000000 +0200
++++ libjsw-1.5.8/jscalibrator/jcwidgets.c	2026-03-15 02:06:03.559904684 +0100
+@@ -1,5 +1,6 @@
+ #include <jsw.h>
+ #include <gtk/gtk.h>
++#include <string.h>
+
+ #include "guiutils.h"
+ #include "jc.h"
+@@ -1100,31 +1101,31 @@
+ 	static GtkItemFactoryEntry menu_items[] = {
+
+ { "/_Calibration",          NULL,         NULL,     JC_CMD_NONE, "<Branch>" },
+-{ "/Calibration/_Open",     "<control>O", JCMenuCB, JC_CMD_OPEN_CALIB, NULL },
++{ "/Calibration/_Open",     "<control>O", (GtkItemFactoryCallback)JCMenuCB, JC_CMD_OPEN_CALIB, NULL },
+ { "/Calibration/sep1",      NULL,         NULL,     JC_CMD_NONE, "<Separator>" },
+-{ "/Calibration/_Save",     "<control>S", JCMenuCB, JC_CMD_SAVE_CALIB, NULL },
+-{ "/Calibration/Save _As",  "<control>A", JCMenuCB, JC_CMD_SAVEAS_CALIB, NULL },
++{ "/Calibration/_Save",     "<control>S", (GtkItemFactoryCallback)JCMenuCB, JC_CMD_SAVE_CALIB, NULL },
++{ "/Calibration/Save _As",  "<control>A", (GtkItemFactoryCallback)JCMenuCB, JC_CMD_SAVEAS_CALIB, NULL },
+ { "/Calibration/sep2",      NULL,         NULL,     JC_CMD_NONE, "<Separator>" },
+-{ "/Calibration/Clean Up",  NULL,         JCMenuCB, JC_CMD_CLEANUP_CALIB, NULL },
++{ "/Calibration/Clean Up",  NULL,         (GtkItemFactoryCallback)JCMenuCB, JC_CMD_CLEANUP_CALIB, NULL },
+ { "/Calibration/sep3",      NULL,         NULL,     JC_CMD_NONE, "<Separator>" },
+-{ "/Calibration/E_xit",     "<control>X", JCMenuCB, JC_CMD_EXIT, NULL },
++{ "/Calibration/E_xit",     "<control>X", (GtkItemFactoryCallback)JCMenuCB, JC_CMD_EXIT, NULL },
+ { "/_Joystick",             NULL,         NULL,     JC_CMD_NONE, "<Branch>" },
+-{ "/Joystick/_Refresh",     "<control>R", JCMenuCB, JC_CMD_REFRESH, NULL },
++{ "/Joystick/_Refresh",     "<control>R", (GtkItemFactoryCallback)JCMenuCB, JC_CMD_REFRESH, NULL },
+ { "/Joystick/sep1",         NULL,         NULL,     JC_CMD_NONE, "<Separator>" },
+-{ "/Joystick/R_eopen",      "<control>E", JCMenuCB, JC_CMD_REOPEN_DEVICE, NULL },
+-{ "/Joystick/_Close",       "<control>C", JCMenuCB, JC_CMD_CLOSE_DEVICE, NULL },
++{ "/Joystick/R_eopen",      "<control>E", (GtkItemFactoryCallback)JCMenuCB, JC_CMD_REOPEN_DEVICE, NULL },
++{ "/Joystick/_Close",       "<control>C", (GtkItemFactoryCallback)JCMenuCB, JC_CMD_CLOSE_DEVICE, NULL },
+ { "/Joystick/sep2",         NULL,         NULL,     JC_CMD_NONE, "<Separator>" },
+-{ "/Joystick/Properties...", NULL,        JCMenuCB, JC_CMD_JOYSTICK_PROPERTIES, NULL },
++{ "/Joystick/Properties...", NULL,        (GtkItemFactoryCallback)JCMenuCB, JC_CMD_JOYSTICK_PROPERTIES, NULL },
+ { "/_View",                 NULL,         NULL,     JC_CMD_NONE, "<Branch>" },
+-{ "/View/Re_presentative",  "<control>P", JCMenuCB, JC_CMD_LAYOUT_REPRESENTATIVE, NULL },
+-{ "/View/_Logical",         "<control>L", JCMenuCB, JC_CMD_LAYOUT_LOGICAL, NULL },
++{ "/View/Re_presentative",  "<control>P", (GtkItemFactoryCallback)JCMenuCB, JC_CMD_LAYOUT_REPRESENTATIVE, NULL },
++{ "/View/_Logical",         "<control>L", (GtkItemFactoryCallback)JCMenuCB, JC_CMD_LAYOUT_LOGICAL, NULL },
+ { "/_Help",                 NULL,         NULL,     JC_CMD_NONE, "<LastBranch>" },
+-{ "/Help/Index",            NULL,         JCMenuCB, JC_CMD_HELP_INDEX, NULL },
++{ "/Help/Index",            NULL,         (GtkItemFactoryCallback)JCMenuCB, JC_CMD_HELP_INDEX, NULL },
+ { "/Help/sep1",             NULL,         NULL,     JC_CMD_NONE, "<Separator>" },
+-{ "/Help/Introduction",     NULL,         JCMenuCB, JC_CMD_HELP_INTRODUCTION, NULL },
+-{ "/Help/How To Calibrate", NULL,         JCMenuCB, JC_CMD_HELP_HOW_TO_CALIBRATE, NULL },
++{ "/Help/Introduction",     NULL,         (GtkItemFactoryCallback)JCMenuCB, JC_CMD_HELP_INTRODUCTION, NULL },
++{ "/Help/How To Calibrate", NULL,         (GtkItemFactoryCallback)JCMenuCB, JC_CMD_HELP_HOW_TO_CALIBRATE, NULL },
+ { "/Help/sep2",             NULL,         NULL,     JC_CMD_NONE, "<Separator>" },
+-{ "/Help/About",            NULL,         JCMenuCB, JC_CMD_HELP_ABOUT, NULL }
++{ "/Help/About",            NULL,         (GtkItemFactoryCallback)JCMenuCB, JC_CMD_HELP_ABOUT, NULL }
+
+ 	};
diff --git a/libjsw-nostrip.patch b/libjsw-nostrip.patch
new file mode 100644
index 0000000..583269c
--- /dev/null
+++ b/libjsw-nostrip.patch
@@ -0,0 +1,28 @@
+--- libjsw-1.5.8/libjsw/Makefile.orig	2008-08-14 10:21:54.000000000 +0200
++++ libjsw-1.5.8/libjsw/Makefile	2026-03-15 12:00:00.000000000 +0100
+@@ -118,9 +118,9 @@
+ #
+
+ INSTALL      = install
+-INSTBINFLAGS = -m 0755 -s
++INSTBINFLAGS = -m 0755
+ INSTUIDFLAGS = -m 4755
+-INSTLIBFLAGS = -m 0755 -s
++INSTLIBFLAGS = -m 0755
+ INSTINCFLAGS = -m 0644
+ INSTMANFLAGS = -m 0644
+ INSTCFGFLAGS = -m 0644
+--- libjsw-1.5.8/jscalibrator/Makefile.install.UNIX.orig	2008-08-14 10:21:54.000000000 +0200
++++ libjsw-1.5.8/jscalibrator/Makefile.install.UNIX	2026-03-15 12:00:00.000000000 +0100
+@@ -12,9 +12,9 @@
+ #
+
+ INSTALL      = install
+-INSTBINFLAGS = -m 0755 -s
++INSTBINFLAGS = -m 0755
+ INSTUIDFLAGS = -m 4755
+-INSTLIBFLAGS = -m 0755 -s
++INSTLIBFLAGS = -m 0755
+ INSTINCFLAGS = -m 0444
+ INSTMANFLAGS = -m 0444
+ INSTCFGFLAGS = -m 0644
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libjsw.git/commitdiff/13833e8565ac7c27edcdbb360e82e63a1d2dd594



More information about the pld-cvs-commit mailing list