diff options
author | Unit 193 <unit193@ubuntu.com> | 2018-09-15 17:00:43 -0400 |
---|---|---|
committer | Unit 193 <unit193@ubuntu.com> | 2018-09-15 17:00:43 -0400 |
commit | d1233e277f3db6ab2698caf67818a8aa690557c8 (patch) | |
tree | c1b6e6311d8fe82bb73007ec86705518116f26cc | |
parent | 2b5405df01deb733623b77591a1b6c2e9575c2ce (diff) | |
download | veracrypt-d1233e277f3db6ab2698caf67818a8aa690557c8.tar.bz2 veracrypt-d1233e277f3db6ab2698caf67818a8aa690557c8.tar.xz veracrypt-d1233e277f3db6ab2698caf67818a8aa690557c8.tar.zst |
Refresh patches.
-rw-r--r-- | debian/patches/001-user-guide-location.diff | 2 | ||||
-rw-r--r-- | debian/patches/002-build-flags.diff | 4 | ||||
-rw-r--r-- | debian/patches/003-indicator-support.diff | 4 | ||||
-rw-r--r-- | debian/patches/004-fixup-install.diff | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches/001-user-guide-location.diff b/debian/patches/001-user-guide-location.diff index 3294321..e7bddf2 100644 --- a/debian/patches/001-user-guide-location.diff +++ b/debian/patches/001-user-guide-location.diff @@ -11,7 +11,7 @@ Index: veracrypt/src/Main/GraphicUserInterface.cpp =================================================================== --- a/src/Main/GraphicUserInterface.cpp 2017-06-29 17:10:39.000000000 -0400 +++ b/src/Main/GraphicUserInterface.cpp 2017-06-30 16:30:20.842509262 -0400 -@@ -1232,7 +1232,7 @@ +@@ -1309,7 +1309,7 @@ #elif defined (TC_MACOSX) htmlPath += L"/../Resources/doc/HTML/"; #elif defined (TC_UNIX) diff --git a/debian/patches/002-build-flags.diff b/debian/patches/002-build-flags.diff index ac8c426..20c8362 100644 --- a/debian/patches/002-build-flags.diff +++ b/debian/patches/002-build-flags.diff @@ -1,5 +1,5 @@ From: Stefan Sundin <stefan@stefansundin.com> -Date: Fri, 12 Sept 2013 +Date: Fri, 12 Sept 2013 Subject: Add build flags Forwarded: no @@ -8,7 +8,7 @@ Index: veracrypt/src/Makefile =================================================================== --- veracrypt.orig/src/Makefile +++ veracrypt/src/Makefile -@@ -56,6 +56,10 @@ export WXCONFIG_CFLAGS := +@@ -57,6 +57,10 @@ export WXCONFIG_CFLAGS := export WXCONFIG_CXXFLAGS := WX_ROOT ?= .. diff --git a/debian/patches/003-indicator-support.diff b/debian/patches/003-indicator-support.diff index c79ceb9..858f3af 100644 --- a/debian/patches/003-indicator-support.diff +++ b/debian/patches/003-indicator-support.diff @@ -155,7 +155,7 @@ Index: veracrypt/src/Main/GraphicUserInterface.cpp =================================================================== --- veracrypt.orig/src/Main/GraphicUserInterface.cpp +++ veracrypt/src/Main/GraphicUserInterface.cpp -@@ -1677,6 +1677,10 @@ namespace VeraCrypt +@@ -1754,6 +1754,10 @@ namespace VeraCrypt } BackgroundMode = state; @@ -170,7 +170,7 @@ Index: veracrypt/src/Makefile =================================================================== --- veracrypt.orig/src/Makefile +++ veracrypt/src/Makefile -@@ -60,6 +60,15 @@ CPPFLAGS+=$(shell dpkg-buildflags --get +@@ -61,6 +61,15 @@ CPPFLAGS+=$(shell dpkg-buildflags --get CFLAGS+=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -Wno-sequence-point CXXFLAGS+=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) -Wno-narrowing LFLAGS+=$(shell dpkg-buildflags --get LDFLAGS) diff --git a/debian/patches/004-fixup-install.diff b/debian/patches/004-fixup-install.diff index 6673d2d..8257d10 100644 --- a/debian/patches/004-fixup-install.diff +++ b/debian/patches/004-fixup-install.diff @@ -11,7 +11,7 @@ Last-Update: 2017-07-10 --- veracrypt-1.21.orig/src/Main/Main.make +++ veracrypt-1.21/src/Main/Main.make -@@ -223,25 +223,25 @@ endif +@@ -236,25 +236,25 @@ endif ifeq "$(PLATFORM)" "Linux" prepare: $(APPNAME) |