CVS commit: pkgsrc/devel/gperf

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Apr  9 10:43:41 UTC 2025

Modified Files:
        pkgsrc/devel/gperf: Makefile distinfo
Added Files:
        pkgsrc/devel/gperf/patches: patch-src_output.cc

Log Message:
gperf: merge upstream patch improving compatibility with c++ code

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/devel/gperf/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/gperf/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/gperf/patches/patch-src_output.cc

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

Modified files:

Index: pkgsrc/devel/gperf/Makefile
diff -u pkgsrc/devel/gperf/Makefile:1.32 pkgsrc/devel/gperf/Makefile:1.33
--- pkgsrc/devel/gperf/Makefile:1.32    Mon Apr  7 13:26:50 2025
+++ pkgsrc/devel/gperf/Makefile Wed Apr  9 10:43:40 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2025/04/07 13:26:50 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2025/04/09 10:43:40 wiz Exp $
 
 DISTNAME=      gperf-3.2
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=gperf/}
 

Index: pkgsrc/devel/gperf/distinfo
diff -u pkgsrc/devel/gperf/distinfo:1.14 pkgsrc/devel/gperf/distinfo:1.15
--- pkgsrc/devel/gperf/distinfo:1.14    Mon Apr  7 13:26:50 2025
+++ pkgsrc/devel/gperf/distinfo Wed Apr  9 10:43:40 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.14 2025/04/07 13:26:50 wiz Exp $
+$NetBSD: distinfo,v 1.15 2025/04/09 10:43:40 wiz Exp $
 
 BLAKE2s (gperf-3.2.tar.gz) = e19507dc98ec9f50052b89a8e2f36d8e9a4909c233760abdb043a47284b1e90a
 SHA512 (gperf-3.2.tar.gz) = 97addf85e5b6f801f0f7084ec065d0d4a24a07f3fb6e60e2bc57b0f8813bd5db1bb4bed4f51fb96d0a8b278ffde1dfd0e42302cae911a619b95cc3cc46254fb3
 Size (gperf-3.2.tar.gz) = 1268603 bytes
+SHA1 (patch-src_output.cc) = ba817546030fe9364926e748228bcd0fa277801b

Added files:

Index: pkgsrc/devel/gperf/patches/patch-src_output.cc
diff -u /dev/null pkgsrc/devel/gperf/patches/patch-src_output.cc:1.1
--- /dev/null   Wed Apr  9 10:43:41 2025
+++ pkgsrc/devel/gperf/patches/patch-src_output.cc      Wed Apr  9 10:43:40 2025
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_output.cc,v 1.1 2025/04/09 10:43:40 wiz Exp $
+
+From: Bruno Haible <bruno%clisp.org@localhost>
+Date: Wed, 9 Apr 2025 10:29:19 +0000 (+0200)
+Subject: Avoid "-Wundef" warnings in C++ mode on the generated code.
+X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=gperf.git;a=commitdiff_plain;h=3bab6ab7bff26bb444722ff9fc1c58b523e9262d
+
+Avoid "-Wundef" warnings in C++ mode on the generated code.
+
+Reported by Heiko Becker <mail%heiko-becker.de@localhost> in
+<https://lists.gnu.org/archive/html/bug-gperf/2025-04/msg00001.html>
+and by Thomas Klausner <wiz%netbsd.org@localhost>.
+
+* src/output.cc (Output::output_hash_function): Emit a
+'defined __STDC_VERSION__' before the test of __STDC_VERSION__.
+
+--- src/output.cc.orig 2024-11-16 07:11:16.000000000 +0000
++++ src/output.cc
+@@ -953,7 +953,7 @@ Output::output_hash_function () const
+           /* Pseudo-statement or comment that avoids a compiler warning or
+              lint warning.  */
+           const char * const fallthrough_marker =
+-            "#if (defined __cplusplus && (__cplusplus >= 201703L || (__cplusplus >= 201103L && defined __clang__ && __clang_major__ + (__clang_minor__ >= 9) > 3))) || (__STDC_VERSION__ >= 202000L 
&& ((defined __GNUC__ && __GNUC__ >= 10) || (defined __clang__ && __clang_major__ >= 9)))\n"
++            "#if (defined __cplusplus && (__cplusplus >= 201703L || (__cplusplus >= 201103L && defined __clang__ && __clang_major__ + (__clang_minor__ >= 9) > 3))) || (defined __STDC_VERSION__ && 
__STDC_VERSION__ >= 202000L && ((defined __GNUC__ && __GNUC__ >= 10) || (defined __clang__ && __clang_major__ >= 9)))\n"
+             "      [[fallthrough]];\n"
+             "#elif (defined __GNUC__ && __GNUC__ >= 7) || (defined __clang__ && __clang_major__ >= 10)\n"
+             "      __attribute__ ((__fallthrough__));\n"