[med-svn] [plink1.9] 02/03: Refresh patches

[Dylan Aïssi]

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

bob.dybian-guest pushed a commit to branch master
in repository plink1.9.

commit db168309939d54ee964924689b433d03ede32e24
Author: Dylan Aïssi <bob.dybian at gmail.com>
Date:   Mon Oct 24 00:13:52 2016 +0200

    Refresh patches
---
 debian/patches/02_Activate_Stable_Build.patch |  2 +-
 debian/patches/03_Fix_FTBFS_GCC6.patch        | 27 ---------------------------
 debian/patches/series                         |  1 -
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/debian/patches/02_Activate_Stable_Build.patch b/debian/patches/02_Activate_Stable_Build.patch
index 047a807..a8da1db 100644
--- a/debian/patches/02_Activate_Stable_Build.patch
+++ b/debian/patches/02_Activate_Stable_Build.patch
@@ -5,7 +5,7 @@ Forwarded: No
 
 --- a/plink_common.h
 +++ b/plink_common.h
-@@ -18,7 +18,7 @@
+@@ -37,7 +37,7 @@
  
  // Uncomment this to prevent all unstable features from being accessible from
  // the command line.
diff --git a/debian/patches/03_Fix_FTBFS_GCC6.patch b/debian/patches/03_Fix_FTBFS_GCC6.patch
deleted file mode 100644
index c5b49cb..0000000
--- a/debian/patches/03_Fix_FTBFS_GCC6.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Christopher Chang
-Description: Fix FTBFS with GCC6 for non_amd64 builds.
-Last-Update: 2016-08-30
-Oirigin: https://github.com/chrchang/plink-ng/commit/5930c26c8db829ffb3397fd4a50bf75d574fc8a8
-
---- a/plink_common.h
-+++ b/plink_common.h
-@@ -108,11 +108,14 @@
-   #define CTZLU __builtin_ctzl
-   #define CLZLU __builtin_clzl
-   #ifndef __LP64__
--    #ifndef uintptr_t
--      #define uintptr_t unsigned long
--    #endif
--    #ifndef intptr_t
--      #define intptr_t long
-+    // attempt to patch GCC 6 build failure
-+    #if (__GNUC__ <= 4) && (__GNUC_MINOR__ < 8)
-+      #ifndef uintptr_t
-+        #define uintptr_t unsigned long
-+      #endif
-+      #ifndef intptr_t
-+        #define intptr_t long
-+      #endif
-     #endif
-   #endif
- #endif
diff --git a/debian/patches/series b/debian/patches/series
index b3e1683..e25033f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_Fix_use_dynamic_linking.patch
 02_Activate_Stable_Build.patch
-03_Fix_FTBFS_GCC6.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/plink1.9.git