Defuzz fuzzy quilt patches and/or disable broken quilt patches

diff --git a/debian/patches/series b/debian/patches/series
index 6fdd010f5660f4ba1c2a6ca0528ce7241eef9c92..3caed94d0a70d6db083c6009a980d9844ab93dc5 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-#fix_library_name.patch
 test.patch
 use-fp-with-march.patch

diff --git a/debian/patches/use-fp-with-march.patch b/debian/patches/use-fp-with-march.patch
index 4f58a299769c9b21072d5479ab6a60a9c568d815..b89eab1f34b893c2cb59642274952f056a617e1b 100644 (file)
--- a/debian/patches/use-fp-with-march.patch
+++ b/debian/patches/use-fp-with-march.patch
@@ -3,12 +3,12 @@ Description:  pass -march=armv7+fp when building "armv4" assembler files.
  neon implementations which won't be built if no -march is specified
 Author: Peter Michael Green <plugwash@raspbian.org>
 
-diff --git a/GNUmakefile b/GNUmakefile
-index c0c6916..ae7b8c5 100644
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -1200,11 +1200,7 @@ endif
- # Also see https://www.crypto++.com/wiki/Cryptogams.
+Index: tempdefuzz/GNUmakefile
+===================================================================
+--- tempdefuzz.orig/GNUmakefile
++++ tempdefuzz/GNUmakefile
+@@ -1193,11 +1193,7 @@ endif
+ # Also see https://www.cryptopp.com/wiki/Cryptogams.
  ifeq ($(IS_ARM32)$(IS_LINUX),11)
    ifeq ($(filter -DCRYPTOPP_DISABLE_ASM -DCRYPTOPP_DISABLE_ARM_NEON,$(CRYPTOPP_CPPFLAGS)$(CPPFLAGS)$(CXXFLAGS)),)
 -    # Do not use -march=armv7 if the compiler is already targeting the ISA.