Skip to content

Commit fdf7526

Browse files
committed
Drop upstream patch, refresh remaining.
1 parent 36c63dc commit fdf7526

File tree

3 files changed

+11
-56
lines changed

3 files changed

+11
-56
lines changed

debian/patches/1001-port-to-libfuse3.patch

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,21 @@ From: Unit 193 <[email protected]>
33
Forwarded: https://github.com/veracrypt/VeraCrypt/issues/528
44

55
---
6-
src/Driver/Fuse/Driver.make | 2 +-
76
src/Driver/Fuse/FuseService.cpp | 26 +++++++++-----------------
8-
src/Main/Main.make | 2 +-
9-
3 files changed, 11 insertions(+), 19 deletions(-)
7+
src/Makefile | 2 +-
8+
2 files changed, 10 insertions(+), 18 deletions(-)
109

11-
--- a/src/Main/Main.make
12-
+++ b/src/Main/Main.make
13-
@@ -102,7 +102,7 @@ endif
10+
--- a/src/Makefile
11+
+++ b/src/Makefile
12+
@@ -52,7 +52,7 @@ export LFLAGS :=
1413

15-
#------ FUSE configuration ------
14+
export PKG_CONFIG ?= pkg-config
15+
export PKG_CONFIG_PATH ?= /usr/local/lib/pkgconfig
16+
-export VC_FUSE_PACKAGE := fuse
17+
+export VC_FUSE_PACKAGE := fuse3
18+
export VC_OSX_FUSET ?= 0
1619

17-
-FUSE_LIBS = $(shell $(PKG_CONFIG) fuse --libs)
18-
+FUSE_LIBS = $(shell $(PKG_CONFIG) fuse3 --libs)
19-
20-
#------ Executable ------
21-
22-
--- a/src/Driver/Fuse/Driver.make
23-
+++ b/src/Driver/Fuse/Driver.make
24-
@@ -15,6 +15,6 @@ NAME := Driver
25-
OBJS :=
26-
OBJS += FuseService.o
27-
28-
-CXXFLAGS += $(shell $(PKG_CONFIG) fuse --cflags)
29-
+CXXFLAGS += $(shell $(PKG_CONFIG) fuse3 --cflags)
30-
31-
include $(BUILD_INC)/Makefile.inc
20+
export WX_CONFIG ?= wx-config
3221
--- a/src/Driver/Fuse/FuseService.cpp
3322
+++ b/src/Driver/Fuse/FuseService.cpp
3423
@@ -13,7 +13,7 @@

debian/patches/1002-fix-ftbfs-32bit.patch

Lines changed: 0 additions & 33 deletions
This file was deleted.

debian/patches/series

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
1001-port-to-libfuse3.patch
2-
1002-fix-ftbfs-32bit.patch

0 commit comments

Comments
 (0)