diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-09-20 19:56:04 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-28 14:40:49 +0000 |
| commit | 36bedbe5c162bab9e7ef702f353ae399fdfd0518 (patch) | |
| tree | fb2926eee09fe0714683074758276739e9e5cda9 /nixpkgs/pkgs/development/libraries/libextractor | |
| parent | 47852a9ef0e62a2d565f9ec0fba2a3ae77c44221 (diff) | |
| parent | 262b328b0bad0c4b97ed495679208e4a2eb87704 (diff) | |
| download | nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.gz nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.bz2 nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.lz nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.xz nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.zst nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.zip | |
Merge commit '262b328b0bad0c4b97ed495679208e4a2eb87704'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libextractor')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libextractor/default.nix | 1 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libextractor/fix-gcc8-build.patch | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libextractor/default.nix b/nixpkgs/pkgs/development/libraries/libextractor/default.nix index 43e6abe1a39f..8fd01dbd506a 100644 --- a/nixpkgs/pkgs/development/libraries/libextractor/default.nix +++ b/nixpkgs/pkgs/development/libraries/libextractor/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { }; patches = [ + ./fix-gcc8-build.patch # Fixes build with exiv2 0.27 (fetchpatch { name = "libextractor-exiv2-0.27.patch"; diff --git a/nixpkgs/pkgs/development/libraries/libextractor/fix-gcc8-build.patch b/nixpkgs/pkgs/development/libraries/libextractor/fix-gcc8-build.patch new file mode 100644 index 000000000000..e04d09be8998 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libextractor/fix-gcc8-build.patch @@ -0,0 +1,16 @@ +diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c +index 072ffc5..a105840 100644 +--- a/src/plugins/ole2_extractor.c ++++ b/src/plugins/ole2_extractor.c +@@ -345,9 +345,8 @@ process_star_office (GsfInput *src, + gsf_input_read (src, size, (unsigned char*) buf); + if ( (buf[0] != 0x0F) || + (buf[1] != 0x0) || +- (0 != strncmp (&buf[2], +- "SfxDocumentInfo", +- strlen ("SfxDocumentInfo"))) || ++ (0 != strcmp (&buf[2], ++ "SfxDocumentInfo")) || + (buf[0x11] != 0x0B) || + (buf[0x13] != 0x00) || /* pw protected! */ + (buf[0x12] != 0x00) ) |