CVS commit: pkgsrc/devel/ecore

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Jul 14 09:54:08 UTC 2023

Modified Files:
        pkgsrc/devel/ecore: distinfo
Added Files:
        pkgsrc/devel/ecore/patches: patch-src_lib_ecore__con_dns.h

Log Message:
devel/ecore: Fix build with GCC 10


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ecore/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/ecore/patches/patch-src_lib_ecore__con_dns.h

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

Modified files:

Index: pkgsrc/devel/ecore/distinfo
diff -u pkgsrc/devel/ecore/distinfo:1.7 pkgsrc/devel/ecore/distinfo:1.8
--- pkgsrc/devel/ecore/distinfo:1.7     Tue Oct 26 10:14:34 2021
+++ pkgsrc/devel/ecore/distinfo Fri Jul 14 09:54:08 2023
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:14:34 nia Exp $
+$NetBSD: distinfo,v 1.8 2023/07/14 09:54:08 pho Exp $
 
 BLAKE2s (ecore-1.7.10.tar.bz2) = 88d142e459d98f1c48d217b1415e9dea79fb415efdd4a246d48724a81d6bc9ff
 SHA512 (ecore-1.7.10.tar.bz2) = 24fbe064913c566f885a2e51185b1f1d37c62c0d03ba0d549e9715ba516fb6b3f630ad331f89f66e91de1401b06b01b16916650448dda11d5e1efa24e52eaf39
 Size (ecore-1.7.10.tar.bz2) = 3455136 bytes
 SHA1 (patch-src_lib_ecore_Ecore.h) = 26b030d863d601db8287c02d1ec2dd193f73929c
+SHA1 (patch-src_lib_ecore__con_dns.h) = bf0cede3e32f4bec05692ea22c7e351587460b5a
 SHA1 (patch-src_lib_ecore__con_ecore__con__ssl.c) = cb9e8130092f700f8d8d83a4ddb8a0212a337d5d

Added files:

Index: pkgsrc/devel/ecore/patches/patch-src_lib_ecore__con_dns.h
diff -u /dev/null pkgsrc/devel/ecore/patches/patch-src_lib_ecore__con_dns.h:1.1
--- /dev/null   Fri Jul 14 09:54:08 2023
+++ pkgsrc/devel/ecore/patches/patch-src_lib_ecore__con_dns.h   Fri Jul 14 09:54:08 2023
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_lib_ecore__con_dns.h,v 1.1 2023/07/14 09:54:08 pho Exp $
+
+Fix build with GCC 10. It seems GCC changed how it parses _Pragma()
+operators. Now it appears to be compatible with Clang but I don't know when
+the change was introduced. Better not to use _Pragma() on GCC.
+
+--- src/lib/ecore_con/dns.h.orig       2023-07-14 09:33:19.288248573 +0000
++++ src/lib/ecore_con/dns.h
+@@ -131,21 +131,14 @@ extern int dns_debug;
+  *
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
+-#if defined(__clang__) || __GNUC__ >= 10
++#if defined(__clang__)
+ #define DNS_PRAGMA_PUSH _Pragma("clang diagnostic push")
+ #define DNS_PRAGMA_QUIET _Pragma("clang diagnostic ignored \"-Winitializer-overrides\"")
+ #define DNS_PRAGMA_POP _Pragma("clang diagnostic pop")
+ 
+ #define dns_quietinit(...) \
+       DNS_PRAGMA_PUSH DNS_PRAGMA_QUIET __VA_ARGS__ DNS_PRAGMA_POP
+-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4
+-#define DNS_PRAGMA_PUSH _Pragma("GCC diagnostic push")
+-#define DNS_PRAGMA_QUIET _Pragma("GCC diagnostic ignored \"-Woverride-init\"")
+-#define DNS_PRAGMA_POP _Pragma("GCC diagnostic pop")
+ 
+-/* GCC parses the _Pragma operator less elegantly than clang. */
+-#define dns_quietinit(...) \
+-      ({ DNS_PRAGMA_PUSH DNS_PRAGMA_QUIET __VA_ARGS__; DNS_PRAGMA_POP })
+ #else
+ #define DNS_PRAGMA_PUSH
+ #define DNS_PRAGMA_QUIET