From c877190cf867c9b0ad20b47026b77ae8695e29d9 Mon Sep 17 00:00:00 2001
From: Teus Benschop <teusjannette@gmail.com>
Date: Sun, 28 Oct 2018 11:57:04 +0100
Subject: remove already applied patches

---
 .../selectively_disable_compiler_warnings.patch    | 214 ---------------------
 debian/patches/series                              |   1 -
 2 files changed, 215 deletions(-)
 delete mode 100644 debian/patches/selectively_disable_compiler_warnings.patch

(limited to 'debian/patches')

diff --git a/debian/patches/selectively_disable_compiler_warnings.patch b/debian/patches/selectively_disable_compiler_warnings.patch
deleted file mode 100644
index 3025939..0000000
--- a/debian/patches/selectively_disable_compiler_warnings.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-Description: use pragmas to disable unused-result warnings in utilities
-Author: Daniel Glassey <wdg@debian.org>
-
---- a/utilities/cipherraw.cpp
-+++ b/utilities/cipherraw.cpp
-@@ -25,6 +25,7 @@
- 	#pragma warning( disable: 4996 )
- #endif
- 
-+
- #include <ctype.h>
- #include <stdio.h>
- #include <fcntl.h>
-@@ -36,6 +37,8 @@
- #ifndef __GNUC__
- #include <io.h>
- #else
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wunused-result"
- #include <unistd.h>
- #endif
- 
-@@ -129,3 +132,7 @@
- 	close(oxfd[1]);
- 	return 0;
- }
-+
-+#ifdef __GNUC__
-+#pragma GCC diagnostic pop
-+#endif
---- a/utilities/gbfidx.cpp
-+++ b/utilities/gbfidx.cpp
-@@ -30,6 +30,8 @@
- #ifndef __GNUC__
- #include <io.h>
- #else
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wunused-result"
- #include <unistd.h>
- #endif
- 
-@@ -305,3 +307,7 @@
- 		key1 = key2 = key3 = "Matthew 1:1";
- 	else	key1 = key2 = key3 = "Genesis 1:1";
- }
-+
-+#ifdef __GNUC__
-+#pragma GCC diagnostic pop
-+#endif
---- a/utilities/genbookutil.cpp
-+++ b/utilities/genbookutil.cpp
-@@ -30,6 +30,11 @@
- #include <treekeyidx.h>
- #include <rawgenbook.h>
- 
-+#ifdef __GNUC__
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wunused-result"
-+#endif
-+
- #ifndef NO_SWORD_NAMESPACE
- using namespace sword;
- #endif
-@@ -226,3 +231,7 @@
- 
- 	return 0;
- }
-+
-+#ifdef __GNUC__
-+#pragma GCC diagnostic pop
-+#endif
---- a/utilities/installmgr.cpp
-+++ b/utilities/installmgr.cpp
-@@ -34,6 +34,11 @@
- #include <stdio.h>
- #include <swlog.h>
- 
-+#ifdef __GNUC__
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wunused-result"
-+#endif
-+
- using namespace sword;
- using std::cout;
- using std::cerr;
-@@ -408,3 +413,7 @@
- 
- 	return 0;
- }
-+
-+#ifdef __GNUC__
-+#pragma GCC diagnostic pop
-+#endif
---- a/utilities/lexdump.c
-+++ b/utilities/lexdump.c
-@@ -36,6 +36,8 @@
- #ifndef __GNUC__
- #include <io.h>
- #else
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wunused-result"
- #include <unistd.h>
- #endif
- 
-@@ -76,3 +78,7 @@
- 	return 0;
- 
- }
-+
-+#ifdef __GNUC__
-+#pragma GCC diagnostic pop
-+#endif
---- a/utilities/step2vpl.cpp
-+++ b/utilities/step2vpl.cpp
-@@ -35,6 +35,8 @@
- #ifndef __GNUC__
- #include <io.h>
- #else
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wunused-result"
- #include <unistd.h>
- #endif
- 
-@@ -454,3 +456,7 @@
- 	}
- 	*to = 0;
- }
-+
-+#ifdef __GNUC__
-+#pragma GCC diagnostic pop
-+#endif
---- a/utilities/stepdump.cpp
-+++ b/utilities/stepdump.cpp
-@@ -35,6 +35,8 @@
- #ifndef __GNUC__
- #include <io.h>
- #else
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wunused-result"
- #include <unistd.h>
- #endif
- 
-@@ -280,3 +282,7 @@
- 
- 	cout << "headerControlWordArea:\n" << *buf << "\n";
- }
-+
-+#ifdef __GNUC__
-+#pragma GCC diagnostic pop
-+#endif
---- a/utilities/treeidxutil.cpp
-+++ b/utilities/treeidxutil.cpp
-@@ -30,6 +30,11 @@
- #include <stdio.h>
- #include <treekeyidx.h>
- 
-+#ifdef __GNUC__
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wunused-result"
-+#endif
-+
- #ifndef NO_SWORD_NAMESPACE
- using namespace sword;
- #endif
-@@ -169,3 +174,7 @@
- 
- 	return 0;
- }
-+
-+#ifdef __GNUC__
-+#pragma GCC diagnostic pop
-+#endif
---- a/utilities/vpl2mod.cpp
-+++ b/utilities/vpl2mod.cpp
-@@ -36,6 +36,8 @@
- #include <io.h>
- #else
- #include <unistd.h>
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wunused-result"
- #endif
- 
- #include <filemgr.h>
-@@ -288,3 +290,7 @@
- 	if (buffer)
- 		delete [] buffer;
- }
-+
-+#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
-+
diff --git a/debian/patches/series b/debian/patches/series
index b5e6c07..6dcf689 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 13_curl.diff
 abicompare.patch
-selectively_disable_compiler_warnings.patch
 runtests.patch
 sword-ppc64.patch
 template-depth.patch
-- 
cgit v1.2.3