CVS commit: pkgsrc/devel/ecore

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Wed Jul 19 01:09:17 UTC 2023

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

Log Message:
devel/ecore: Fix my broken patch that didn't even apply

Pointed out by wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/ecore/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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.8 pkgsrc/devel/ecore/distinfo:1.9
--- pkgsrc/devel/ecore/distinfo:1.8     Fri Jul 14 09:54:08 2023
+++ pkgsrc/devel/ecore/distinfo Wed Jul 19 01:09:17 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2023/07/14 09:54:08 pho Exp $
+$NetBSD: distinfo,v 1.9 2023/07/19 01:09:17 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_dns.h) = bfd268968f770877325d5470e4da3cb738a1e8d4
 SHA1 (patch-src_lib_ecore__con_ecore__con__ssl.c) = cb9e8130092f700f8d8d83a4ddb8a0212a337d5d

Index: pkgsrc/devel/ecore/patches/patch-src_lib_ecore__con_dns.h
diff -u pkgsrc/devel/ecore/patches/patch-src_lib_ecore__con_dns.h:1.1 pkgsrc/devel/ecore/patches/patch-src_lib_ecore__con_dns.h:1.2
--- pkgsrc/devel/ecore/patches/patch-src_lib_ecore__con_dns.h:1.1       Fri Jul 14 09:54:08 2023
+++ pkgsrc/devel/ecore/patches/patch-src_lib_ecore__con_dns.h   Wed Jul 19 01:09:17 2023
@@ -1,20 +1,12 @@
-$NetBSD: patch-src_lib_ecore__con_dns.h,v 1.1 2023/07/14 09:54:08 pho Exp $
+$NetBSD: patch-src_lib_ecore__con_dns.h,v 1.2 2023/07/19 01:09:17 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.orig       2023-07-19 01:04:26.411743509 +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")
+@@ -138,14 +138,6 @@ extern int dns_debug;
  
  #define dns_quietinit(...) \
        DNS_PRAGMA_PUSH DNS_PRAGMA_QUIET __VA_ARGS__ DNS_PRAGMA_POP
@@ -22,7 +14,7 @@ the change was introduced. Better not to
 -#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 })