[Pkg-crosswire-commits] [sword] 03/04: add testblocks to compiler warning patch

Daniel Glassey wdg at moszumanska.debian.org
Wed Sep 16 18:46:56 UTC 2015 

This is an automated email from the git hooks/post-receive script.

wdg pushed a commit to branch master
in repository sword.

commit 4295595d181ef69a266287232ed71a42fd445403
Author: Daniel Glassey <wdg at debian.org>
Date:   Wed Sep 16 18:26:25 2015 +0100

    add testblocks to compiler warning patch
---
 debian/changelog                                   |  1 +
 .../selectively_disable_compiler_warnings.patch    | 77 ++++++++++++----------
 2 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b4170ef..4e08c47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 sword (1.7.3+dfsg-7) UNRELEASED; urgency=medium
 
   * d/rules: default dh_auto_test to actually run the tests
+  * add tests/testblocks.cpp to selectively compiling patch
 
  -- Daniel Glassey <wdg at debian.org>  Wed, 16 Sep 2015 18:22:14 +0100
 
diff --git a/debian/patches/selectively_disable_compiler_warnings.patch b/debian/patches/selectively_disable_compiler_warnings.patch
index e403171..3025939 100644
--- a/debian/patches/selectively_disable_compiler_warnings.patch
+++ b/debian/patches/selectively_disable_compiler_warnings.patch
@@ -1,10 +1,8 @@
 Description: use pragmas to disable unused-result warnings in utilities
 Author: Daniel Glassey <wdg at debian.org>
 
-Index: sword-1.7.3+dfsg/utilities/cipherraw.cpp
-===================================================================
---- sword-1.7.3+dfsg.orig/utilities/cipherraw.cpp	2015-09-02 12:12:33.683898357 +0100
-+++ sword-1.7.3+dfsg/utilities/cipherraw.cpp	2015-09-02 12:34:06.918311161 +0100
+--- a/utilities/cipherraw.cpp
++++ b/utilities/cipherraw.cpp
 @@ -25,6 +25,7 @@
  	#pragma warning( disable: 4996 )
  #endif
@@ -30,10 +28,8 @@ Index: sword-1.7.3+dfsg/utilities/cipherraw.cpp
 +#ifdef __GNUC__
 +#pragma GCC diagnostic pop
 +#endif
-Index: sword-1.7.3+dfsg/utilities/gbfidx.cpp
-===================================================================
---- sword-1.7.3+dfsg.orig/utilities/gbfidx.cpp	2015-09-02 12:12:33.599897951 +0100
-+++ sword-1.7.3+dfsg/utilities/gbfidx.cpp	2015-09-02 12:38:36.703648984 +0100
+--- a/utilities/gbfidx.cpp
++++ b/utilities/gbfidx.cpp
 @@ -30,6 +30,8 @@
  #ifndef __GNUC__
  #include <io.h>
@@ -51,10 +47,8 @@ Index: sword-1.7.3+dfsg/utilities/gbfidx.cpp
 +#ifdef __GNUC__
 +#pragma GCC diagnostic pop
 +#endif
-Index: sword-1.7.3+dfsg/utilities/genbookutil.cpp
-===================================================================
---- sword-1.7.3+dfsg.orig/utilities/genbookutil.cpp	2015-09-02 12:12:33.583897879 +0100
-+++ sword-1.7.3+dfsg/utilities/genbookutil.cpp	2015-09-02 12:43:29.149099117 +0100
+--- a/utilities/genbookutil.cpp
++++ b/utilities/genbookutil.cpp
 @@ -30,6 +30,11 @@
  #include <treekeyidx.h>
  #include <rawgenbook.h>
@@ -75,10 +69,8 @@ Index: sword-1.7.3+dfsg/utilities/genbookutil.cpp
 +#ifdef __GNUC__
 +#pragma GCC diagnostic pop
 +#endif
-Index: sword-1.7.3+dfsg/utilities/installmgr.cpp
-===================================================================
---- sword-1.7.3+dfsg.orig/utilities/installmgr.cpp	2015-09-02 12:12:33.635898127 +0100
-+++ sword-1.7.3+dfsg/utilities/installmgr.cpp	2015-09-02 12:49:00.910744237 +0100
+--- a/utilities/installmgr.cpp
++++ b/utilities/installmgr.cpp
 @@ -34,6 +34,11 @@
  #include <stdio.h>
  #include <swlog.h>
@@ -99,10 +91,8 @@ Index: sword-1.7.3+dfsg/utilities/installmgr.cpp
 +#ifdef __GNUC__
 +#pragma GCC diagnostic pop
 +#endif
-Index: sword-1.7.3+dfsg/utilities/lexdump.c
-===================================================================
---- sword-1.7.3+dfsg.orig/utilities/lexdump.c	2015-09-02 12:12:33.691898417 +0100
-+++ sword-1.7.3+dfsg/utilities/lexdump.c	2015-09-02 12:53:42.452140319 +0100
+--- a/utilities/lexdump.c
++++ b/utilities/lexdump.c
 @@ -36,6 +36,8 @@
  #ifndef __GNUC__
  #include <io.h>
@@ -120,10 +110,8 @@ Index: sword-1.7.3+dfsg/utilities/lexdump.c
 +#ifdef __GNUC__
 +#pragma GCC diagnostic pop
 +#endif
-Index: sword-1.7.3+dfsg/utilities/step2vpl.cpp
-===================================================================
---- sword-1.7.3+dfsg.orig/utilities/step2vpl.cpp	2015-09-02 12:12:33.703898461 +0100
-+++ sword-1.7.3+dfsg/utilities/step2vpl.cpp	2015-09-02 12:59:22.501826538 +0100
+--- a/utilities/step2vpl.cpp
++++ b/utilities/step2vpl.cpp
 @@ -35,6 +35,8 @@
  #ifndef __GNUC__
  #include <io.h>
@@ -141,10 +129,8 @@ Index: sword-1.7.3+dfsg/utilities/step2vpl.cpp
 +#ifdef __GNUC__
 +#pragma GCC diagnostic pop
 +#endif
-Index: sword-1.7.3+dfsg/utilities/stepdump.cpp
-===================================================================
---- sword-1.7.3+dfsg.orig/utilities/stepdump.cpp	2015-09-02 12:12:33.671898307 +0100
-+++ sword-1.7.3+dfsg/utilities/stepdump.cpp	2015-09-02 13:02:52.718868954 +0100
+--- a/utilities/stepdump.cpp
++++ b/utilities/stepdump.cpp
 @@ -35,6 +35,8 @@
  #ifndef __GNUC__
  #include <io.h>
@@ -162,10 +148,8 @@ Index: sword-1.7.3+dfsg/utilities/stepdump.cpp
 +#ifdef __GNUC__
 +#pragma GCC diagnostic pop
 +#endif
-Index: sword-1.7.3+dfsg/utilities/treeidxutil.cpp
-===================================================================
---- sword-1.7.3+dfsg.orig/utilities/treeidxutil.cpp	2015-09-02 12:12:33.615898023 +0100
-+++ sword-1.7.3+dfsg/utilities/treeidxutil.cpp	2015-09-02 13:07:44.488315755 +0100
+--- a/utilities/treeidxutil.cpp
++++ b/utilities/treeidxutil.cpp
 @@ -30,6 +30,11 @@
  #include <stdio.h>
  #include <treekeyidx.h>
@@ -186,10 +170,8 @@ Index: sword-1.7.3+dfsg/utilities/treeidxutil.cpp
 +#ifdef __GNUC__
 +#pragma GCC diagnostic pop
 +#endif
-Index: sword-1.7.3+dfsg/utilities/vpl2mod.cpp
-===================================================================
---- sword-1.7.3+dfsg.orig/utilities/vpl2mod.cpp	2015-09-02 12:12:33.659898252 +0100
-+++ sword-1.7.3+dfsg/utilities/vpl2mod.cpp	2015-09-02 13:12:05.117608148 +0100
+--- a/utilities/vpl2mod.cpp
++++ b/utilities/vpl2mod.cpp
 @@ -36,6 +36,8 @@
  #include <io.h>
  #else
@@ -207,3 +189,26 @@ Index: sword-1.7.3+dfsg/utilities/vpl2mod.cpp
 +#ifdef __GNUC__
 +#pragma GCC diagnostic pop
 +#endif
+--- a/tests/testblocks.cpp
++++ b/tests/testblocks.cpp
+@@ -26,6 +26,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
++#ifdef __GNUC__
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wunused-result"
++#endif
++
+ using namespace std;
+ #ifndef NO_SWORD_NAMESPACE
+ using namespace sword;
+@@ -109,3 +114,8 @@
+ 
+ 	return 0;
+ }
++
++#ifdef __GNUC__
++#pragma GCC diagnostic pop
++#endif
++

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-crosswire/sword.git

More information about the Pkg-crosswire-commits mailing list