add a patch which removes a trailing comma in an enum in a header file. qtparted and other C++ programs don't like this...
svn path=/nixpkgs/trunk/; revision=3494
This commit is contained in:
parent
73cb069dd8
commit
4d4425467e
|
@ -7,4 +7,5 @@ stdenv.mkDerivation {
|
|||
md5 = "7e46a32def60ea355c193d9225691742";
|
||||
};
|
||||
buildInputs = [e2fsprogs ncurses readline];
|
||||
patches = [./parted-trailingcomma.patch];
|
||||
}
|
||||
|
|
21
pkgs/tools/misc/parted/parted-trailingcomma.patch
Normal file
21
pkgs/tools/misc/parted/parted-trailingcomma.patch
Normal file
|
@ -0,0 +1,21 @@
|
|||
diff -ruN parted-1.6.23/include/parted/exception.h parted-1.6.23.new/include/parted/exception.h
|
||||
--- parted-1.6.23/include/parted/exception.h 2001-12-27 01:26:09.000000000 +0100
|
||||
+++ parted-1.6.23.new/include/parted/exception.h 2005-08-01 11:28:38.000000000 +0200
|
||||
@@ -28,7 +28,7 @@
|
||||
PED_EXCEPTION_ERROR=3,
|
||||
PED_EXCEPTION_FATAL=4,
|
||||
PED_EXCEPTION_BUG=5,
|
||||
- PED_EXCEPTION_NO_FEATURE=6,
|
||||
+ PED_EXCEPTION_NO_FEATURE=6
|
||||
};
|
||||
typedef enum _PedExceptionType PedExceptionType;
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
PED_EXCEPTION_OK=8,
|
||||
PED_EXCEPTION_RETRY=16,
|
||||
PED_EXCEPTION_IGNORE=32,
|
||||
- PED_EXCEPTION_CANCEL=64,
|
||||
+ PED_EXCEPTION_CANCEL=64
|
||||
};
|
||||
typedef enum _PedExceptionOption PedExceptionOption;
|
||||
#define PED_EXCEPTION_OK_CANCEL (PED_EXCEPTION_OK + PED_EXCEPTION_CANCEL)
|
Loading…
Reference in a new issue