public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/mingw-gsm] rawhide: Update to 1.0.24
@ 2026-08-05 16:58
0 siblings, 0 replies; only message in thread
From: @ 2026-08-05 16:58 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/mingw-gsm
Branch : rawhide
Commit : 192d12a50758cdd90ed5af4bd75c0fdf8c502582
Author : František Dvořák <valtri@civ.zcu.cz>
Date : 2026-08-05T18:58:32+02:00
Stats : +358/-281 in 9 file(s)
URL : https://src.fedoraproject.org/rpms/mingw-gsm/c/192d12a50758cdd90ed5af4bd75c0fdf8c502582?branch=rawhide
Log:
Update to 1.0.24
---
diff --git a/.gitignore b/.gitignore
index d1e195b..9175d3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/gsm-1.0.13.tar.gz
/gsm-1.0.16.tar.gz
+/gsm-1.0.24.tar.gz
diff --git a/gsm-64bit.patch b/gsm-64bit.patch
deleted file mode 100644
index 195ed31..0000000
--- a/gsm-64bit.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gsm-1.0-pl12/inc/private.h.64bit 2006-04-26 21:17:01.000000000 +0200
-+++ gsm-1.0-pl12/inc/private.h 2007-05-11 00:25:23.000000000 +0200
-@@ -10,10 +10,10 @@
- #define PRIVATE_H
-
- typedef short word; /* 16 bit signed int */
--typedef long longword; /* 32 bit signed int */
-+typedef int longword; /* 32 bit signed int */
-
- typedef unsigned short uword; /* unsigned word */
--typedef unsigned long ulongword; /* unsigned longword */
-+typedef unsigned int ulongword; /* unsigned longword */
-
- struct gsm_state {
-
diff --git a/gsm-makefile.patch b/gsm-makefile.patch
new file mode 100644
index 0000000..1917a15
--- /dev/null
+++ b/gsm-makefile.patch
@@ -0,0 +1,187 @@
+diff --git a/Makefile b/Makefile
+index 2ad5e5d..a1aa787 100644
+--- a/Makefile
++++ b/Makefile
+@@ -44,13 +44,17 @@ WAV49 = -DWAV49
+ # CCFLAGS = -c -O
+
+ CC = gcc -ansi -pedantic
+-CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment
++CCFLAGS = -c $(RPM_OPT_FLAGS) -DNeedFunctionPrototypes=1 -Wall -Wno-comment -D_XOPEN_SOURCE=700 -D_REENTRANT -fPIC
+
+ LD = $(CC)
+
+ # LD = gcc
+ # LDFLAGS =
+
++SO_MAJOR = 1
++SO_MINOR = 0
++SO_PATCH = 24
++SO_VER = $(SO_MAJOR).$(SO_MINOR).$(SO_PATCH)
+
+ # If your compiler needs additional flags/libraries, regardless of
+ # the source compiled, configure them here.
+@@ -81,7 +85,7 @@ INSTALL_ROOT =
+ GSM_INSTALL_ROOT = $(INSTALL_ROOT)
+ GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
+ GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
+-GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
++GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/share/man/man3
+
+
+ # Where do you want to install the toast binaries and their manpage?
+@@ -91,12 +95,12 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
+
+ TOAST_INSTALL_ROOT = $(INSTALL_ROOT)
+ TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin
+-TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1
++TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/share/man/man1
+
+ # Other tools
+
+ SHELL = /bin/sh
+-LN = ln
++LN = ln -s
+ BASENAME = basename
+ AR = ar
+ ARFLAGS = cr
+@@ -140,6 +144,7 @@ LFLAGS = $(LDFLAGS) $(LDINC)
+ # Targets
+
+ LIBGSM = $(LIB)/libgsm.a
++LIBGSMSO = $(LIB)/libgsm.so
+
+ TOAST = $(BIN)/toast
+ UNTOAST = $(BIN)/untoast
+@@ -257,7 +262,9 @@ STUFF = ChangeLog \
+ # Install targets
+
+ GSM_INSTALL_TARGETS = \
+- $(GSM_INSTALL_LIB)/libgsm.a \
++ $(GSM_INSTALL_LIB)/libgsm.so.$(SO_VER) \
++ $(GSM_INSTALL_LIB)/libgsm.so.$(SO_MAJOR)\
++ $(GSM_INSTALL_LIB)/libgsm.so \
+ $(GSM_INSTALL_INC)/gsm.h \
+ $(GSM_INSTALL_MAN)/gsm.3 \
+ $(GSM_INSTALL_MAN)/gsm_explode.3 \
+@@ -279,7 +286,7 @@ TOAST_INSTALL_TARGETS = \
+
+ # Target rules
+
+-all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
++all: $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST)
+ @-echo $(ROOT): Done.
+
+ tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
+@@ -299,24 +306,32 @@ install: toastinstall gsminstall
+
+ # The basic API: libgsm
+
++$(LIBGSMSO).$(SO_VER): $(LIB) $(GSM_OBJECTS)
++ $(LD) $(LFLAGS) -o $@ -shared -Xlinker -soname -Xlinker libgsm.so.$(SO_MAJOR) $(GSM_OBJECTS) -lc
++
++$(LIBGSMSO).$(SO_MAJOR): $(LIBGSMSO).$(SO_VER)
++ ln -fs libgsm.so.$(SO_VER) lib/libgsm.so.$(SO_MAJOR)
++
++$(LIBGSMSO): $(LIBGSMSO).$(SO_VER)
++ ln -fs libgsm.so.$(SO_VER) lib/libgsm.so
++
+ $(LIBGSM): $(LIB) $(GSM_OBJECTS)
+ -rm $(RMFLAGS) $(LIBGSM)
+ $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
+ $(RANLIB) $(LIBGSM)
+
+-
+ # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
+
+-$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
+- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
++$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSMSO)
++ $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB)
+
+ $(UNTOAST): $(BIN) $(TOAST)
+ -rm $(RMFLAGS) $(UNTOAST)
+- $(LN) $(TOAST) $(UNTOAST)
++ $(LN) toast $(UNTOAST)
+
+ $(TCAT): $(BIN) $(TOAST)
+ -rm $(RMFLAGS) $(TCAT)
+- $(LN) $(TOAST) $(TCAT)
++ $(LN) toast $(TCAT)
+
+
+ # The local bin and lib directories
+@@ -352,52 +367,55 @@ toastuninstall:
+
+ $(TOAST_INSTALL_BIN)/toast: $(TOAST)
+ -rm $(RMFLAGS) $@
+- cp $(TOAST) $@
+- chmod 755 $@
++ install -pm755 $(TOAST) $@
+
+ $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast
+ -rm $(RMFLAGS) $@
+- $(LN) $? $@
++ $(LN) -rs $? $@
+
+ $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast
+ -rm $(RMFLAGS) $@
+- $(LN) $? $@
++ $(LN) -rs $? $@
+
+ $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1
+ -rm $(RMFLAGS) $@
+- cp $? $@
+- chmod 444 $@
++ install -pm644 $? $@
+
+ $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3
+ -rm $(RMFLAGS) $@
+- cp $? $@
+- chmod 444 $@
++ install -pm644 $? $@
+
+ $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3
+ -rm $(RMFLAGS) $@
+- cp $? $@
+- chmod 444 $@
++ install -pm644 $? $@
+
+ $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3
+ -rm $(RMFLAGS) $@
+- cp $? $@
+- chmod 444 $@
++ install -pm644 $? $@
+
+ $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3
+ -rm $(RMFLAGS) $@
+- cp $? $@
+- chmod 444 $@
++ install -pm644 $? $@
+
+ $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h
+ -rm $(RMFLAGS) $@
+- cp $? $@
+- chmod 444 $@
++ install -pm644 $? $@
+
+ $(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
+ -rm $(RMFLAGS) $@
+- cp $? $@
+- chmod 444 $@
++ install -pm644 $? $@
+
++$(GSM_INSTALL_LIB)/libgsm.so.$(SO_VER): $(LIBGSMSO).$(SO_VER)
++ -rm $(RMFLAGS) $@
++ install -pm755 $? $@
++
++$(GSM_INSTALL_LIB)/libgsm.so.$(SO_MAJOR): $(LIBGSMSO).$(SO_MAJOR)
++ -rm $(RMFLAGS) $@
++ ln -s libgsm.so.$(SO_VER) $@
++
++$(GSM_INSTALL_LIB)/libgsm.so: $(LIBGSMSO)
++ -rm $(RMFLAGS) $@
++ ln -s libgsm.so.$(SO_VER) $@
+
+ # Distribution
+
diff --git a/gsm-mingw-config.patch b/gsm-mingw-config.patch
new file mode 100644
index 0000000..43ab06d
--- /dev/null
+++ b/gsm-mingw-config.patch
@@ -0,0 +1,20 @@
+Author: František Dvořák <valtri@civ.zcu.cz>
+Date: Wed Aug 5 18:05:15 2026 +0200
+
+ MinGW port - code changes
+
+diff --git a/inc/config.h b/inc/config.h
+index dfb1ead..d6295bd 100644
+--- a/inc/config.h
++++ b/inc/config.h
+@@ -18,10 +18,7 @@
+ #define HAS_ERRNO_DECL 1 /* errno.h declares errno */
+
+ #define HAS_FSTAT 1 /* fstat syscall */
+-#define HAS_FCHMOD 1 /* fchmod syscall */
+ #define HAS_CHMOD 1 /* chmod syscall */
+-#define HAS_FCHOWN 1 /* fchown syscall */
+-#define HAS_CHOWN 1 /* chown syscall */
+ /*efine HAS__FSETMODE 1 /* _fsetmode -- set file mode */
+
+ #define HAS_STRING_H 1 /* /usr/include/string.h */
diff --git a/gsm-mingw-makefile.patch b/gsm-mingw-makefile.patch
new file mode 100644
index 0000000..3e8558a
--- /dev/null
+++ b/gsm-mingw-makefile.patch
@@ -0,0 +1,128 @@
+commit 45f89f0a1ed6ef1b83b3d246f662f3491a68d60c
+Author: František Dvořák <valtri@civ.zcu.cz>
+Date: Wed Aug 5 18:41:52 2026 +0200
+
+ MinGW port - make
+
+diff --git a/Makefile b/Makefile
+index af41850..8cf3f8e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -44,7 +44,7 @@ WAV49 = -DWAV49
+ # CCFLAGS = -c -O
+
+ CC = gcc -ansi -pedantic
+-CCFLAGS = -c $(RPM_OPT_FLAGS) -DNeedFunctionPrototypes=1 -Wall -Wno-comment -D_XOPEN_SOURCE=700 -D_REENTRANT -fPIC
++CCFLAGS = -c -DNeedFunctionPrototypes=1 -Wall -Wno-comment -D_XOPEN_SOURCE=700 -D_REENTRANT -fPIC
+
+ LD = $(CC)
+
+@@ -68,6 +68,7 @@ SO_VER = $(SO_MAJOR).$(SO_MINOR).$(SO_PATCH)
+ # LDLIB = -lgcc
+ ######### Additional libraries needed by $(LD)
+
++EXEEXT = .exe
+
+ # Where do you want to install libraries, binaries, a header file
+ # and the manual pages?
+@@ -144,11 +145,12 @@ LFLAGS = $(LDFLAGS) $(LDINC)
+ # Targets
+
+ LIBGSM = $(LIB)/libgsm.a
+-LIBGSMSO = $(LIB)/libgsm.so
++LIBGSMSO = $(LIB)/libgsm-$(SO_MAJOR).dll
++LIBGSMIL = $(LIB)/libgsm.dll.a
+
+-TOAST = $(BIN)/toast
+-UNTOAST = $(BIN)/untoast
+-TCAT = $(BIN)/tcat
++TOAST = $(BIN)/toast$(EXEEXT)
++UNTOAST = $(BIN)/untoas$(EXEEXT)
++TCAT = $(BIN)/tcat$(EXEEXT)
+
+ # Headers
+
+@@ -262,9 +264,8 @@ STUFF = ChangeLog \
+ # Install targets
+
+ GSM_INSTALL_TARGETS = \
+- $(GSM_INSTALL_LIB)/libgsm.so.$(SO_VER) \
+- $(GSM_INSTALL_LIB)/libgsm.so.$(SO_MAJOR)\
+- $(GSM_INSTALL_LIB)/libgsm.so \
++ $(GSM_INSTALL_BIN)/libgsm-$(SO_MAJOR).dll \
++ $(GSM_INSTALL_LIB)/libgsm.dll.a \
+ $(GSM_INSTALL_INC)/gsm.h \
+ $(GSM_INSTALL_MAN)/gsm.3 \
+ $(GSM_INSTALL_MAN)/gsm_explode.3 \
+@@ -272,9 +273,9 @@ GSM_INSTALL_TARGETS = \
+ $(GSM_INSTALL_MAN)/gsm_print.3
+
+ TOAST_INSTALL_TARGETS = \
+- $(TOAST_INSTALL_BIN)/toast \
+- $(TOAST_INSTALL_BIN)/tcat \
+- $(TOAST_INSTALL_BIN)/untoast \
++ $(TOAST_INSTALL_BIN)/toast$(EXEEXT) \
++ $(TOAST_INSTALL_BIN)/tcat$(EXEEXT) \
++ $(TOAST_INSTALL_BIN)/untoast$(EXEEXT) \
+ $(TOAST_INSTALL_MAN)/toast.1
+
+
+@@ -306,14 +307,8 @@ install: toastinstall gsminstall
+
+ # The basic API: libgsm
+
+-$(LIBGSMSO).$(SO_VER): $(LIB) $(GSM_OBJECTS)
+- $(LD) $(LFLAGS) -o $@ -shared -Xlinker -soname -Xlinker libgsm.so.$(SO_MAJOR) $(GSM_OBJECTS) -lc
+-
+-$(LIBGSMSO).$(SO_MAJOR): $(LIBGSMSO).$(SO_VER)
+- ln -fs libgsm.so.$(SO_VER) lib/libgsm.so.$(SO_MAJOR)
+-
+-$(LIBGSMSO): $(LIBGSMSO).$(SO_VER)
+- ln -fs libgsm.so.$(SO_VER) lib/libgsm.so
++$(LIBGSMSO) $(LIBGSMIL): $(LIB) $(GSM_OBJECTS)
++ $(LD) $(LFLAGS) -shared -Xlinker -soname -Xlinker libgsm-$(SO_MAJOR).dll -o $(LIBGSMSO) $(GSM_OBJECTS) -Wl,--out-implib=$(LIBGSMIL)
+
+ $(LIBGSM): $(LIB) $(GSM_OBJECTS)
+ -rm $(RMFLAGS) $(LIBGSM)
+@@ -365,15 +360,15 @@ toastuninstall:
+ rm $(RMFLAGS) $(TOAST_INSTALL_TARGETS); \
+ fi
+
+-$(TOAST_INSTALL_BIN)/toast: $(TOAST)
++$(TOAST_INSTALL_BIN)/toast$(EXEEXT): $(TOAST)
+ -rm $(RMFLAGS) $@
+ install -pm755 $(TOAST) $@
+
+-$(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast
++$(TOAST_INSTALL_BIN)/untoast$(EXEEXT): $(TOAST_INSTALL_BIN)/toast
+ -rm $(RMFLAGS) $@
+ $(LN) -rs $? $@
+
+-$(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast
++$(TOAST_INSTALL_BIN)/tcat$(EXEEXT): $(TOAST_INSTALL_BIN)/toast
+ -rm $(RMFLAGS) $@
+ $(LN) -rs $? $@
+
+@@ -405,17 +400,13 @@ $(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
+ -rm $(RMFLAGS) $@
+ install -pm644 $? $@
+
+-$(GSM_INSTALL_LIB)/libgsm.so.$(SO_VER): $(LIBGSMSO).$(SO_VER)
+- -rm $(RMFLAGS) $@
++$(GSM_INSTALL_BIN)/libgsm-$(SO_MAJOR).dll: $(LIBGSMSO)
++ -rm $@
+ install -pm755 $? $@
+
+-$(GSM_INSTALL_LIB)/libgsm.so.$(SO_MAJOR): $(LIBGSMSO).$(SO_MAJOR)
+- -rm $(RMFLAGS) $@
+- ln -s libgsm.so.$(SO_VER) $@
+-
+-$(GSM_INSTALL_LIB)/libgsm.so: $(LIBGSMSO)
+- -rm $(RMFLAGS) $@
+- ln -s libgsm.so.$(SO_VER) $@
++$(GSM_INSTALL_LIB)/libgsm.dll.a: $(LIBGSMIL)
++ -rm $@
++ install -pm644 $? $@
+
+ # Distribution
+
diff --git a/gsm-mingw.patch b/gsm-mingw.patch
deleted file mode 100644
index 4467ceb..0000000
--- a/gsm-mingw.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-Author: František Dvořák <valtri@civ.zcu.cz>
-Date: Wed Jan 11 16:38:38 2017 +0100
-
- MinGW port
-
-diff --git a/Makefile b/Makefile
-index cfab74f..4eaeec5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -44,14 +44,13 @@ WAV49 = -DWAV49
- # CCFLAGS = -c -O
-
- CC = gcc -ansi -pedantic
--CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1
-+CCFLAGS = -c -D_REENTRANT -DNeedFunctionPrototypes=1
-
- LD = $(CC)
-
- # LD = gcc
- # LDFLAGS =
-
--
- # If your compiler needs additional flags/libraries, regardless of
- # the source compiled, configure them here.
-
-@@ -64,6 +63,7 @@ LD = $(CC)
- # LDLIB = -lgcc
- ######### Additional libraries needed by $(LD)
-
-+EXEEXT = .exe
-
- # Where do you want to install libraries, binaries, a header file
- # and the manual pages?
-@@ -81,7 +81,7 @@ INSTALL_ROOT =
- GSM_INSTALL_ROOT = $(INSTALL_ROOT)
- GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
- GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
--GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
-+GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/share/man/man3
-
-
- # Where do you want to install the toast binaries and their manpage?
-@@ -91,7 +91,7 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
-
- TOAST_INSTALL_ROOT = $(INSTALL_ROOT)
- TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin
--TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1
-+TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/share/man/man1
-
- # Other tools
-
-@@ -100,7 +100,7 @@ LN = ln
- BASENAME = basename
- AR = ar
- ARFLAGS = cr
--RMFLAGS =
-+RMFLAGS = -f
- FIND = find
- COMPRESS = compress
- COMPRESSFLAGS =
-@@ -130,20 +130,21 @@ INC = $(ROOT)/inc
- ######### Remove -DNDEBUG to enable assertions.
-
- CFLAGS = $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
-- $(WAV49) $(CCINC) -I$(INC)
-+ $(WAV49) $(CCINC) -I$(INC) $(RPM_CFLAGS)
- ######### It's $(CC) $(CFLAGS)
-
--LFLAGS = $(LDFLAGS) $(LDINC)
-+LFLAGS = $(LDFLAGS) $(LDINC) $(RPM_LDFLAGS)
- ######### It's $(LD) $(LFLAGS)
-
-
- # Targets
-
- LIBGSM = $(LIB)/libgsm.a
-+LIBGSMSO = $(LIB)/libgsm-1.dll
-
--TOAST = $(BIN)/toast
--UNTOAST = $(BIN)/untoast
--TCAT = $(BIN)/tcat
-+TOAST = $(BIN)/toast$(EXEEXT)
-+UNTOAST = $(BIN)/untoast$(EXEEXT)
-+TCAT = $(BIN)/tcat$(EXEEXT)
-
- # Headers
-
-@@ -257,7 +258,8 @@ STUFF = ChangeLog \
- # Install targets
-
- GSM_INSTALL_TARGETS = \
-- $(GSM_INSTALL_LIB)/libgsm.a \
-+ $(GSM_INSTALL_BIN)/libgsm-1.dll \
-+ $(GSM_INSTALL_LIB)/libgsm.dll.a \
- $(GSM_INSTALL_INC)/gsm.h \
- $(GSM_INSTALL_MAN)/gsm.3 \
- $(GSM_INSTALL_MAN)/gsm_explode.3 \
-@@ -265,9 +267,9 @@ GSM_INSTALL_TARGETS = \
- $(GSM_INSTALL_MAN)/gsm_print.3
-
- TOAST_INSTALL_TARGETS = \
-- $(TOAST_INSTALL_BIN)/toast \
-- $(TOAST_INSTALL_BIN)/tcat \
-- $(TOAST_INSTALL_BIN)/untoast \
-+ $(TOAST_INSTALL_BIN)/toast$(EXEEXT) \
-+ $(TOAST_INSTALL_BIN)/tcat$(EXEEXT) \
-+ $(TOAST_INSTALL_BIN)/untoast$(EXEEXT) \
- $(TOAST_INSTALL_MAN)/toast.1
-
-
-@@ -279,7 +281,7 @@ TOAST_INSTALL_TARGETS = \
-
- # Target rules
-
--all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
-+all: $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST)
- @-echo $(ROOT): Done.
-
- tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
-@@ -299,16 +301,18 @@ install: toastinstall gsminstall
-
- # The basic API: libgsm
-
-+$(LIBGSMSO) $(LIB)/libgsm.dll.a: $(LIB) $(GSM_OBJECTS)
-+ $(LD) $(LDFLAGS) $(LIBS) $(GSM_OBJECTS) -shared -Xlinker -soname -Xlinker libgsm-1.dll -o $(LIBGSMSO) -Wl,--out-implib=$(LIB)/libgsm.dll.a
-+
- $(LIBGSM): $(LIB) $(GSM_OBJECTS)
- -rm $(RMFLAGS) $(LIBGSM)
- $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
- $(RANLIB) $(LIBGSM)
-
--
- # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
-
--$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
-- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
-+$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSMSO)
-+ $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB)
-
- $(UNTOAST): $(BIN) $(TOAST)
- -rm $(RMFLAGS) $(UNTOAST)
-@@ -350,54 +354,53 @@ toastuninstall:
- rm $(RMFLAGS) $(TOAST_INSTALL_TARGETS); \
- fi
-
--$(TOAST_INSTALL_BIN)/toast: $(TOAST)
-+$(TOAST_INSTALL_BIN)/toast$(EXEEXT): $(TOAST)
- -rm $@
-- cp $(TOAST) $@
-- chmod 755 $@
-+ install -pm755 $(TOAST) $@
-
--$(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast
-+$(TOAST_INSTALL_BIN)/untoast$(EXEEXT): $(TOAST_INSTALL_BIN)/toast$(EXEEXT)
- -rm $@
- ln $? $@
-
--$(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast
-+$(TOAST_INSTALL_BIN)/tcat$(EXEEXT): $(TOAST_INSTALL_BIN)/toast$(EXEEXT)
- -rm $@
- ln $? $@
-
- $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1
- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ install -pm644 $? $@
-
- $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3
- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ install -pm644 $? $@
-
- $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3
- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ install -pm644 $? $@
-
- $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3
- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ install -pm644 $? $@
-
- $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3
- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ install -pm644 $? $@
-
- $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h
- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ install -pm644 $? $@
-
- $(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ install -pm644 $? $@
-
-+$(GSM_INSTALL_BIN)/libgsm-1.dll: $(LIBGSMSO)
-+ -rm $@
-+ install -pm755 $? $@
-+
-+$(GSM_INSTALL_LIB)/libgsm.dll.a: $(LIB)/libgsm.dll.a
-+ -rm $@
-+ install -pm644 $? $@
-
- # Distribution
-
-diff --git a/inc/config.h b/inc/config.h
-index dfb1ead..d6295bd 100644
---- a/inc/config.h
-+++ b/inc/config.h
-@@ -18,10 +18,7 @@
- #define HAS_ERRNO_DECL 1 /* errno.h declares errno */
-
- #define HAS_FSTAT 1 /* fstat syscall */
--#define HAS_FCHMOD 1 /* fchmod syscall */
- #define HAS_CHMOD 1 /* chmod syscall */
--#define HAS_FCHOWN 1 /* fchown syscall */
--#define HAS_CHOWN 1 /* chown syscall */
- /*efine HAS__FSETMODE 1 /* _fsetmode -- set file mode */
-
- #define HAS_STRING_H 1 /* /usr/include/string.h */
diff --git a/gsm-warnings.patch b/gsm-warnings.patch
index 182871b..6399279 100644
--- a/gsm-warnings.patch
+++ b/gsm-warnings.patch
@@ -1,31 +1,12 @@
-diff -up gsm-1.0-pl16/add-test/add_test.c.warn gsm-1.0-pl16/add-test/add_test.c
---- gsm-1.0-pl16/add-test/add_test.c.warn 2006-04-26 21:14:25.000000000 +0200
-+++ gsm-1.0-pl16/add-test/add_test.c 2016-11-24 10:35:09.642537236 +0100
-@@ -9,6 +9,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
-
- #include "gsm.h"
-
-@@ -29,7 +30,7 @@ word M_gsm_abs P((word op1));
- longword M_gsm_L_mult P((word op1, word op2));
- longword M_gsm_L_add P((longword op1, longword op2));
-
--help()
-+void help(void)
- {
- puts( " add a b sub a b mult a b div a b" );
- puts( "L_add A B L_sub A B L_mult A B mult_r a b" );
-diff -up gsm-1.0-pl16/src/toast.c.warn gsm-1.0-pl16/src/toast.c
---- gsm-1.0-pl16/src/toast.c.warn 2006-04-26 21:14:26.000000000 +0200
-+++ gsm-1.0-pl16/src/toast.c 2016-11-24 10:35:15.266571608 +0100
-@@ -6,6 +6,8 @@
+diff -up gsm-1.0-pl17/src/toast.c.warn gsm-1.0-pl17/src/toast.c
+--- gsm-1.0-pl17/src/toast.c.warn 2017-06-28 02:09:38.000000000 +0200
++++ gsm-1.0-pl17/src/toast.c 2017-06-29 11:44:43.979453734 +0200
+@@ -6,6 +6,9 @@
/* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/toast.c,v 1.8 1996/07/02 10:41:04 jutta Exp $ */
+#include <stdio.h>
++#include <unistd.h>
+#include <getopt.h>
#include "toast.h"
diff --git a/mingw-gsm.spec b/mingw-gsm.spec
index 0576146..dc29a34 100644
--- a/mingw-gsm.spec
+++ b/mingw-gsm.spec
@@ -4,30 +4,32 @@
%undefine _auto_set_build_flags
Name: mingw-gsm
-Version: 1.0.16
-Release: 23%{?dist}
+Version: 1.0.24
+Release: 1%{?dist}
Summary: Shared libraries for GSM speech compressor
License: MIT
URL: http://www.quut.com/gsm/
Source: http://www.quut.com/gsm/gsm-%{version}.tar.gz
-# patches from gsm package
+# from gsm package
+Patch0: gsm-makefile.patch
+# from gsm package
Patch1: gsm-warnings.patch
-Patch2: gsm-64bit.patch
-# patch for MinGW (build dll, .exe suffix)
-# (stdin/out in tools not supported for now)
-Patch3: gsm-mingw.patch
+# MinGW port sources
+Patch2: gsm-mingw-config.patch
+# MinGW port build
+Patch3: gsm-mingw-makefile.patch
BuildArch: noarch
-BuildRequires: make
+BuildRequires: make
BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-gcc
BuildRequires: mingw64-filesystem >= 95
BuildRequires: mingw64-gcc
-%global srcver 1.0-pl16
+%global srcver 1.0-pl24
%description
Contains runtime shared libraries for libgsm, an implementation of
@@ -131,8 +133,9 @@ This package are MinGW compiled gsm tools for the Win64 target.
%prep
%setup -qc
pushd gsm-%{srcver}
+%patch -P0 -p1 -b .mk
%patch -P1 -p1 -b .warn
-%patch -P2 -p1 -b .64bit
+%patch -P2 -p1
%patch -P3 -p1
popd
@@ -216,7 +219,6 @@ popd
%doc gsm-%{srcver}/README
%dir %{mingw32_includedir}/gsm
%exclude %{mingw32_mandir}
-%exclude %{mingw32_libdir}/libgsm.a
%{mingw32_bindir}/libgsm-1.dll
%{mingw32_libdir}/libgsm.dll.a
%{mingw32_includedir}/gsm.h
@@ -231,7 +233,6 @@ popd
%doc gsm-%{srcver}/README
%dir %{mingw64_includedir}/gsm
%exclude %{mingw64_mandir}
-%exclude %{mingw64_libdir}/libgsm.a
%{mingw64_bindir}/libgsm-1.dll
%{mingw64_libdir}/libgsm.dll.a
%{mingw64_includedir}/gsm.h
@@ -242,6 +243,9 @@ popd
%changelog
+* Wed Aug 05 2026 František Dvořák <valtri@civ.zcu.cz> - 1.0.24-1
+- Update to 1.0.24
+
* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.16-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
diff --git a/sources b/sources
index 5ba50f8..0f83642 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gsm-1.0.16.tar.gz) = dfcadca2ff062294deed23859f73f704fc28e2f30f5544f44befd445cb031308673f4885ba9b65c6a4e304bf12398c3458ee2b2f476e998fa4f8ea7728c9589b
+SHA512 (gsm-1.0.24.tar.gz) = d9563a81f0911ac01c7dd2b9c33a18f57c2978d0f446f942d89718286c552fce353c2a2b38e5587d9c51d01c08f4f53fd4c2f8ebff99597dd8488a7c2c5c064f
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-05 16:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-05 16:58 [rpms/mingw-gsm] rawhide: Update to 1.0.24
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox