Add patch to fix gpgol build with gcc-6
authorAndre Heinecke <aheinecke@gnupg.org>
Tue, 26 Mar 2019 18:54:53 +0000 (19:54 +0100)
committerAndre Heinecke <aheinecke@gnupg.org>
Tue, 26 Mar 2019 18:54:53 +0000 (19:54 +0100)
--

Makefile.am
patches/gpgol-2.3.3/0001-Replace-fancy-attribute-by-comment.patch [new file with mode: 0755]

index c586411..b745b3c 100644 (file)
@@ -46,7 +46,8 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/qtwinextras/support-xp.patch \
         patches/w32pth-2.0.5/workaround-broken-libtool.patch \
         patches/breeze-icons/0001-Make-binary-icons-cross-compilable.patch \
-        patches/gpgme-1.13.0/0001-core-w32-glib-Fix-build-of-w32-glib-io.c.patch
+        patches/gpgme-1.13.0/0001-core-w32-glib-Fix-build-of-w32-glib-io.c.patch \
+        patches/gpgol-2.3.3/0001-Replace-fancy-attribute-by-comment.patch
 
 copy-news:
        cp NEWS doc/website/NEWS.last
diff --git a/patches/gpgol-2.3.3/0001-Replace-fancy-attribute-by-comment.patch b/patches/gpgol-2.3.3/0001-Replace-fancy-attribute-by-comment.patch
new file mode 100755 (executable)
index 0000000..748a409
--- /dev/null
@@ -0,0 +1,37 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+From 9a6c805be0c2552fb38026d8136a8ea7657e187d Mon Sep 17 00:00:00 2001
+From: Andre Heinecke <aheinecke@gnupg.org>
+Date: Tue, 26 Mar 2019 19:46:57 +0100
+Subject: [PATCH] Replace fancy attribute by comment
+
+* src/mailitem-events.cpp: Change attribute fallthrough to magic
+comment.
+
+--
+This fixed build with older gcc versions....
+---
+ src/mailitem-events.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/mailitem-events.cpp b/src/mailitem-events.cpp
+index 5be58e7..c8e7125 100644
+--- a/src/mailitem-events.cpp
++++ b/src/mailitem-events.cpp
+@@ -761,11 +761,10 @@ EVENT_SINK_INVOKE(MailItemEvents)
+           memdbg_dump ();
+           TRETURN S_OK;
+         }
+-      /* Fallthrough */
+       case ReplyAll:
+       case Reply:
+           is_reply = true;
+-          __attribute__ ((fallthrough));
++          /* fall through */
+       case Forward:
+         {
+           log_oom ("%s:%s: %s : %p",
+--
+2.20.1