diff --git a/gnupg-2.2.12-build.patch b/gnupg-2.2.12-build.patch new file mode 100644 index 0000000..7314b86 --- /dev/null +++ b/gnupg-2.2.12-build.patch @@ -0,0 +1,12 @@ +diff -up gnupg-2.2.12/dirmngr/dns.h.build gnupg-2.2.12/dirmngr/dns.h +--- gnupg-2.2.12/dirmngr/dns.h.build 2017-08-28 12:22:54.000000000 +0200 ++++ gnupg-2.2.12/dirmngr/dns.h 2019-02-04 14:46:53.420995232 +0100 +@@ -154,7 +154,7 @@ DNS_PUBLIC int *dns_debug_p(void); + + #define dns_quietinit(...) \ + DNS_PRAGMA_PUSH DNS_PRAGMA_QUIET __VA_ARGS__ DNS_PRAGMA_POP +-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 ++#elif ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4) && __GNUC__ < 9 + #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") diff --git a/gnupg2.spec b/gnupg2.spec index a7732b3..1cafeef 100644 --- a/gnupg2.spec +++ b/gnupg2.spec @@ -21,6 +21,7 @@ Patch5: gnupg-2.1.1-ocsp-keyusage.patch Patch6: gnupg-2.1.1-fips-algo.patch # allow 8192 bit RSA keys in keygen UI with large RSA Patch9: gnupg-2.1.21-large-rsa.patch +Patch10: gnupg-2.2.12-build.patch URL: http://www.gnupg.org/ @@ -97,6 +98,7 @@ to the base GnuPG package %patch5 -p1 -b .keyusage %patch6 -p1 -b .fips %patch9 -p1 -b .large-rsa +%patch10 -p1 -b .build # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper) # Note: this is just the name of the default shared lib to load in scdaemon, @@ -203,8 +205,8 @@ make -k check %changelog -* Thu Jan 31 2019 Fedora Release Engineering - 2.2.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +* Mon Feb 4 2019 Tomáš Mráz - 2.2.12-2 +- make it build with gcc-9 * Tue Jan 8 2019 Tomáš Mráz - 2.2.12-1 - upgrade to 2.2.12