[packages/fix-info-dir] Rel 11

arekm arekm at pld-linux.org
Thu May 21 15:52:56 CEST 2026


commit a723eea2211d7d2c72fd4362a80f8e8122076add
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu May 21 15:52:38 2026 +0200

    Rel 11

 fix-info-dir-gzopen-cast.patch    | 30 ++++++++++++++++++++++++++++++
 fix-info-dir-string-include.patch | 10 ++++++++++
 fix-info-dir.spec                 |  6 +++++-
 3 files changed, 45 insertions(+), 1 deletion(-)
---
diff --git a/fix-info-dir.spec b/fix-info-dir.spec
index 2a5fb52..7d9bc2f 100644
--- a/fix-info-dir.spec
+++ b/fix-info-dir.spec
@@ -6,12 +6,14 @@ Summary:	Creates a top-level info `dir' file
 Summary(pl.UTF-8):	Tworzy główny plik 'dir' dla systemu Info
 Name:		fix-info-dir
 Version:	0.13
-Release:	10
+Release:	11
 License:	GPL
 Group:		Applications/System
 Source0:	ftp://ftp.pld.org.pl/software/fix-info-dir/%{name}-%{version}.tar.gz
 # Source0-md5:	27e91d3e5c91a2fdad85bf93c9e4cfcf
 Patch0:		%{name}-Makefile.patch
+Patch1:		%{name}-string-include.patch
+Patch2:		%{name}-gzopen-cast.patch
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -24,6 +26,8 @@ Narzędzie tworzące główny plik 'dir' dla systemu Info
 %prep
 %setup -q
 %patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
 
 %build
 %{__make} \
diff --git a/fix-info-dir-gzopen-cast.patch b/fix-info-dir-gzopen-cast.patch
new file mode 100644
index 0000000..227c82a
--- /dev/null
+++ b/fix-info-dir-gzopen-cast.patch
@@ -0,0 +1,30 @@
+--- fix-info-dir-0.13/fix-info-dir.c.orig	2026-05-21 01:31:50.519614884 +0200
++++ fix-info-dir-0.13/fix-info-dir.c	2026-05-21 01:32:07.069552353 +0200
+@@ -556,9 +556,9 @@
+ 
+     dirfile_len = strlen(dirfile);
+     
+-    vf.open = gzopen;
+-    vf.close = gzclose;
+-    vf.gets = gzgets;
++    vf.open = (void *(*)(const char *, const char *))gzopen;
++    vf.close = (int (*)(void*))gzclose;
++    vf.gets = (char *(*)(void*, char*, int))gzgets;
+ 
+     dirnode = n_array_new(64, (t_fn_free)dir_section_free,
+                           (t_fn_cmp)dir_section_cmp);
+@@ -576,10 +576,10 @@
+         }
+         
+         if (fnmatch("*.gz", ent->d_name, 0) == 0) {
+-            if (vf.open != gzopen) {
+-                vf.open  = gzopen;
+-                vf.close = gzclose;
+-                vf.gets  = gzgets;
++            if ((void*)vf.open != (void*)gzopen) {
++                vf.open  = (void *(*)(const char *, const char *))gzopen;
++                vf.close = (int (*)(void*))gzclose;
++                vf.gets  = (char *(*)(void*, char*, int))gzgets;
+             }
+ 
+         } else {
diff --git a/fix-info-dir-string-include.patch b/fix-info-dir-string-include.patch
new file mode 100644
index 0000000..5b1b713
--- /dev/null
+++ b/fix-info-dir-string-include.patch
@@ -0,0 +1,10 @@
+--- fix-info-dir-0.13/trurlib-fid/trurl_die.c.orig	2026-05-21 01:32:17.797234021 +0200
++++ fix-info-dir-0.13/trurlib-fid/trurl_die.c	2026-05-21 01:32:29.166219019 +0200
+@@ -25,6 +25,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include "nassert.h"
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fix-info-dir.git/commitdiff/a723eea2211d7d2c72fd4362a80f8e8122076add



More information about the pld-cvs-commit mailing list