[packages/chmtools] Rel 4

[arekm]

commit a04ed9b87ac4f22d362f07b39371155afe5c7853
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed May 20 21:03:22 2026 +0200

    Rel 4

 chmtools-types.patch | 72 ++++++++++++++++++++++++++++++++++++++++++++--------
 chmtools.spec        |  4 +--
 2 files changed, 63 insertions(+), 13 deletions(-)
---
diff --git a/chmtools.spec b/chmtools.spec
index 584cd4d..ccf6417 100644
--- a/chmtools.spec
+++ b/chmtools.spec
@@ -2,7 +2,7 @@ Summary:	CHM Tools
 Summary(pl.UTF-8):	Narzędzia CHM
 Name:		chmtools
 Version:	0
-Release:	3
+Release:	4
 License:	GPL
 Group:		Applications/Text
 Source0:	http://www.speakeasy.org/~russotto/chm/%{name}.tar.gz
@@ -30,7 +30,7 @@ oraz (niepełnej) dokumentacji do formatu CHM.
 %build
 %{__make} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags}"
+	CFLAGS="%{rpmcflags} %{rpmcppflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/chmtools-types.patch b/chmtools-types.patch
index 7185794..de15889 100644
--- a/chmtools-types.patch
+++ b/chmtools-types.patch
@@ -1,18 +1,44 @@
---- chmtools/chmlib.h.orig	2002-01-08 05:01:31.000000000 +0100
-+++ chmtools/chmlib.h	2003-11-26 21:16:59.177783736 +0100
-@@ -19,8 +19,7 @@
- */
+diff -urN chmtools.orig/chmdump.c chmtools/chmdump.c
+--- chmtools.orig/chmdump.c	2002-01-08 05:02:20.000000000 +0100
++++ chmtools/chmdump.c	2026-05-20 18:48:14.166221672 +0200
+@@ -2,8 +2,13 @@
+    places this source file in the public domain. */
  
  #include <stdio.h>
--typedef unsigned long ulong;
--// typedef unsigned short ushort; Already defined for Darwin
 +#include <stdlib.h>
- typedef unsigned char ubyte;
++#include <string.h>
+ #include <limits.h>
+ #include <errno.h>
++#include <unistd.h>
++#include <sys/stat.h>
++#include <sys/types.h>
+ #include "chmlib.h"
  
- typedef struct guid_t
---- chmtools/chmlib.c.orig	2001-10-14 22:37:30.000000000 +0200
-+++ chmtools/chmlib.c	2003-11-26 21:16:32.774797600 +0100
-@@ -162,7 +162,7 @@
+ static void  usage(char *pname)
+@@ -11,7 +16,7 @@
+   fprintf(stderr, "Usage: %s chmfile outdir\n", pname);
+ }
+ 
+-main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+   ubyte *buf;
+   ulong length;
+diff -urN chmtools.orig/chmlib.c chmtools/chmlib.c
+--- chmtools.orig/chmlib.c	2001-10-14 22:37:30.000000000 +0200
++++ chmtools/chmlib.c	2026-05-20 18:48:18.542888339 +0200
+@@ -19,8 +19,10 @@
+ */
+ 
+ #include <stdlib.h>
++#include <string.h>
+ #include "chmlib.h"
+ #include "fixendian.h"
++#include "lzx.h"
+ 
+ #define FILELEN_HSECT 0
+ #define DIR_HSECT 1
+@@ -162,7 +164,7 @@
    int nentries;
    int nchunks;
    pmglchunkheader pmglch;
@@ -21,3 +47,27 @@
    
    readdirheader(c);
    chunkstart = ftell(c->cf);
+diff -urN chmtools.orig/chmlib.h chmtools/chmlib.h
+--- chmtools.orig/chmlib.h	2002-01-08 05:01:31.000000000 +0100
++++ chmtools/chmlib.h	2026-05-20 18:46:52.975544178 +0200
+@@ -19,8 +19,7 @@
+ */
+ 
+ #include <stdio.h>
+-typedef unsigned long ulong;
+-// typedef unsigned short ushort; Already defined for Darwin
++#include <stdlib.h>
+ typedef unsigned char ubyte;
+ 
+ typedef struct guid_t
+diff -urN chmtools.orig/lzx.c chmtools/lzx.c
+--- chmtools.orig/lzx.c	2002-04-30 00:58:48.000000000 +0200
++++ chmtools/lzx.c	2026-05-20 18:47:15.622888339 +0200
+@@ -18,6 +18,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include "lzx.h"
+ #include "lzx_int.h"
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chmtools.git/commitdiff/a04ed9b87ac4f22d362f07b39371155afe5c7853