CVS commit: pkgsrc/graphics/leptonica

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Wed Dec 20 10:31:34 UTC 2023

Modified Files:
        pkgsrc/graphics/leptonica: distinfo
Added Files:
        pkgsrc/graphics/leptonica/patches: patch-src_environ.h

Log Message:
leptonica: fix build for packages that use liptonica with gcc 12 and C++ on Solaris


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/leptonica/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/leptonica/patches/patch-src_environ.h

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

Modified files:

Index: pkgsrc/graphics/leptonica/distinfo
diff -u pkgsrc/graphics/leptonica/distinfo:1.21 pkgsrc/graphics/leptonica/distinfo:1.22
--- pkgsrc/graphics/leptonica/distinfo:1.21     Mon Jan 30 07:53:38 2023
+++ pkgsrc/graphics/leptonica/distinfo  Wed Dec 20 10:31:34 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.21 2023/01/30 07:53:38 adam Exp $
+$NetBSD: distinfo,v 1.22 2023/12/20 10:31:34 nros Exp $
 
 BLAKE2s (leptonica-1.83.1.tar.gz) = 87967c42fd0729eecfb9ad23bfab3e81878a7910bed6cf6f8f415c3b08ce506c
 SHA512 (leptonica-1.83.1.tar.gz) = 14c76b8795e494637cd225982cd27a1cd82d22b34c0c0d6ed061530c0ed8cec87fc1c8482bbda8f56a04f240b9fb50d481b8fffe5df846958cb146f9d2d51553
 Size (leptonica-1.83.1.tar.gz) = 14028566 bytes
+SHA1 (patch-src_environ.h) = 4170fe05038704412cd100c1179397c89ab3a44b

Added files:

Index: pkgsrc/graphics/leptonica/patches/patch-src_environ.h
diff -u /dev/null pkgsrc/graphics/leptonica/patches/patch-src_environ.h:1.1
--- /dev/null   Wed Dec 20 10:31:34 2023
+++ pkgsrc/graphics/leptonica/patches/patch-src_environ.h       Wed Dec 20 10:31:34 2023
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_environ.h,v 1.1 2023/12/20 10:31:34 nros Exp $
+
+* Illumos gcc defines __STDC_VERSION__ in C++ mode,
+  this causes problems for leptonica C++ consumers
+  when gcc 12 is used. In gcc 12 atomic_int is not
+  defined in stdatomic.h in C++ mode. 
+  Make sure this path in not chosen in C++ mode,
+  like gcc on GNU Linux, NetBSD etc. 
+
+--- src/environ.h.orig 2023-01-26 06:12:24.000000000 +0000
++++ src/environ.h
+@@ -65,7 +65,7 @@ typedef unsigned int uintptr_t;
+ 
+ #endif /* _MSC_VER */
+ 
+-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && !defined(__STDC_NO_ATOMICS__)
++#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && !defined(__STDC_NO_ATOMICS__) && !defined(__cplusplus)
+ #include <stdatomic.h>
+ typedef atomic_int l_atomic;
+ #else