CVS commit: pkgsrc/textproc/xmlto

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Jun 18 09:19:14 UTC 2024

Modified Files:
        pkgsrc/textproc/xmlto: distinfo
Added Files:
        pkgsrc/textproc/xmlto/patches: patch-xmlif_xmlif.l

Log Message:
xmlto: fix implicit-int issues - via fedora.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/xmlto/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/xmlto/patches/patch-xmlif_xmlif.l

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/xmlto/distinfo
diff -u pkgsrc/textproc/xmlto/distinfo:1.16 pkgsrc/textproc/xmlto/distinfo:1.17
--- pkgsrc/textproc/xmlto/distinfo:1.16 Tue Oct 26 11:23:40 2021
+++ pkgsrc/textproc/xmlto/distinfo      Tue Jun 18 09:19:14 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 11:23:40 nia Exp $
+$NetBSD: distinfo,v 1.17 2024/06/18 09:19:14 markd Exp $
 
 BLAKE2s (xmlto-0.0.28.tar.bz2) = 57302e4193959fe4de8f145fd259268ab89dadad1f63ce4dceb4fb9a95bfc590
 SHA512 (xmlto-0.0.28.tar.bz2) = 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
@@ -8,4 +8,5 @@ SHA1 (patch-format_docbook_txt) = 8d4502
 SHA1 (patch-format_fo_dvi) = 4f47dc2e0b3b94ed2ddf2701d27c8813d0d38465
 SHA1 (patch-format_fo_pdf) = 301b96bf0f8b711cc115306d1b47f04cc6cd2d79
 SHA1 (patch-format_xhtml1_txt) = 6025023e7700375adbabee96dab99e6260b6e707
+SHA1 (patch-xmlif_xmlif.l) = 5571afdd3cbb4943ed9085b63a0a490dd5fa2317
 SHA1 (patch-xmlto_in) = 4064e13bd53ddfc9a18f618d171d8b26bf182943

Added files:

Index: pkgsrc/textproc/xmlto/patches/patch-xmlif_xmlif.l
diff -u /dev/null pkgsrc/textproc/xmlto/patches/patch-xmlif_xmlif.l:1.1
--- /dev/null   Tue Jun 18 09:19:14 2024
+++ pkgsrc/textproc/xmlto/patches/patch-xmlif_xmlif.l   Tue Jun 18 09:19:14 2024
@@ -0,0 +1,60 @@
+$NetBSD: patch-xmlif_xmlif.l,v 1.1 2024/06/18 09:19:14 markd Exp $
+
+via Fedora
+commit 1375e2df75530cd198bd16ac3de38e2b0d126276
+Author: Thomas Kuehne <thomas%kuehne.cn@localhost>
+Date:   Sat Dec 11 21:10:41 2021 +0100
+
+    fix -Wimplicit-int for ifsense
+    
+    fixes:
+    xmlif/xmlif.l:46:8: warning: type defaults to ‘int’ in declaration of ‘ifsense’ [-Wimplicit-int]
+       46 | static ifsense;                 /* sense of last `if' or unless seen */
+          |        ^~~~~~~
+    
+    Signed-off-by: Thomas Kuehne <thomas%kuehne.cn@localhost>
+
+commit 8e34f087bf410bcc5fe445933d6ad9bae54f24b5
+Author: Thomas Kuehne <thomas%kuehne.cn@localhost>
+Date:   Sat Dec 11 21:54:50 2021 +0100
+
+    Fix return type of main function
+    
+    Fixes:
+    xmlif/xmlif.l:242:1: warning: return type defaults to ‘int’ [-Wimplicit-int]
+      242 | main(int argc, char *argv[])
+          | ^~~~
+    
+    Signed-off-by: Thomas Kuehne <thomas%kuehne.cn@localhost>
+
+diff --git a/xmlif/xmlif.l b/xmlif/xmlif.l
+index ac421367d47a2cd4..6e5970e147be21b1 100644
+--- xmlif/xmlif.l
++++ xmlif/xmlif.l
+@@ -43,7 +43,7 @@
+ 
+ static char **selections;     /* selection tokens */
+ static int nselections;               /* number of selections */
+-static ifsense;                       /* sense of last `if' or unless seen */
++static int ifsense;           /* sense of last `if' or unless seen */
+ static char *attribute;               /* last attribute scanned */
+ 
+ struct stack_t {
+@@ -239,7 +239,7 @@ WS         [ \t\n]*
+ 
+ int yywrap() {exit(0);};
+ 
+-main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+     int i;
+ 
+@@ -265,7 +265,7 @@ main(int argc, char *argv[])
+           exit(1);
+       }
+ 
+-    yylex();
++    return yylex();
+ }
+ 
+ /*