[debian-edu-commits] debian-edu/ 03/11: d/p/005-fix-ftbfs-gcc-7.diff: Drop, applied upstream.

[Unit 193]

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

unit193-guest pushed a commit to branch master
in repository veracrypt.

commit f5bd0d88ae58d6aab3b235eef0868b1976874afd
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Fri Mar 30 22:31:30 2018 -0400

    d/p/005-fix-ftbfs-gcc-7.diff: Drop, applied upstream.
---
 debian/patches/005-fix-ftbfs-gcc-7.diff | 20 --------------------
 debian/patches/series                   |  1 -
 2 files changed, 21 deletions(-)

diff --git a/debian/patches/005-fix-ftbfs-gcc-7.diff b/debian/patches/005-fix-ftbfs-gcc-7.diff
deleted file mode 100644
index be0ff98..0000000
--- a/debian/patches/005-fix-ftbfs-gcc-7.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix FTBFS with gcc 7.
-Author: Krytarik Raido <krytarik at tuxgarage.com>
-
-Forwarded: https://github.com/veracrypt/VeraCrypt/issues/198
-Reviewed-By: Unit 193 <unit193 at ubuntu.com>
-Last-Update: 2017-11-02
-
---- veracrypt-1.21.orig/src/Makefile
-+++ veracrypt-1.21/src/Makefile
-@@ -180,8 +180,8 @@ ifeq "$(shell uname -s)" "Linux"
- 		CFLAGS += -msse2
- 		CXXFLAGS += -msse2
- 
--		GCC_GTEQ_440 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40400)
--		GCC_GTEQ_430 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40300)
-+		GCC_GTEQ_440 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/' -e 's/^[0-9]\{1,2\}$$/&0000/'` \>= 40400)
-+		GCC_GTEQ_430 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/' -e 's/^[0-9]\{1,2\}$$/&0000/'` \>= 40300)
- 		ifeq "$(GCC_GTEQ_440)" "1"
- 			CFLAGS += -maes
- 			CXXFLAGS += -maes
diff --git a/debian/patches/series b/debian/patches/series
index 283a732..a572334 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 002-build-flags.diff
 003-indicator-support.diff
 004-fixup-install.diff
-005-fix-ftbfs-gcc-7.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/veracrypt.git