| 1 |
commit: 3b3cd50825ef2f27b4c2b81cd300728743a321fb |
| 2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 21 12:20:13 2018 +0000 |
| 4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 21 12:20:49 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b3cd508 |
| 7 |
|
| 8 |
Revert "media-libs/libextractor: Fix gcc-8 segfault (#668044 by Toralf Förster)" |
| 9 |
|
| 10 |
This reverts commit 6a2b56c0a796fdb00151ba69fb2c617715307905. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/668044 |
| 13 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/libextractor-1.7-segfault.patch | 19 ------------------- |
| 16 |
media-libs/libextractor/libextractor-1.7.ebuild | 5 ----- |
| 17 |
2 files changed, 24 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/libextractor/files/libextractor-1.7-segfault.patch b/media-libs/libextractor/files/libextractor-1.7-segfault.patch |
| 20 |
deleted file mode 100644 |
| 21 |
index 8b44238bf07..00000000000 |
| 22 |
--- a/media-libs/libextractor/files/libextractor-1.7-segfault.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,19 +0,0 @@ |
| 25 |
-*** a/src/plugins/ole2_extractor.c~ 2018-06-20 15:02:55.000000000 -0500 |
| 26 |
---- b/src/plugins/ole2_extractor.c 2018-07-18 15:21:13.411495048 -0500 |
| 27 |
-*************** |
| 28 |
-*** 336,342 **** |
| 29 |
- (buf[1] != 0x0) || |
| 30 |
- (0 != strncmp (&buf[2], |
| 31 |
- "SfxDocumentInfo", |
| 32 |
-! strlen ("SfxDocumentInfo"))) || |
| 33 |
- (buf[0x11] != 0x0B) || |
| 34 |
- (buf[0x13] != 0x00) || /* pw protected! */ |
| 35 |
- (buf[0x12] != 0x00) ) |
| 36 |
---- 336,342 ---- |
| 37 |
- (buf[1] != 0x0) || |
| 38 |
- (0 != strncmp (&buf[2], |
| 39 |
- "SfxDocumentInfo", |
| 40 |
-! strlen ("SfxDocumentInfo") + 1)) || |
| 41 |
- (buf[0x11] != 0x0B) || |
| 42 |
- (buf[0x13] != 0x00) || /* pw protected! */ |
| 43 |
- (buf[0x12] != 0x00) ) |
| 44 |
|
| 45 |
diff --git a/media-libs/libextractor/libextractor-1.7.ebuild b/media-libs/libextractor/libextractor-1.7.ebuild |
| 46 |
index 76dde5f2ac4..74dc8b4f10b 100644 |
| 47 |
--- a/media-libs/libextractor/libextractor-1.7.ebuild |
| 48 |
+++ b/media-libs/libextractor/libextractor-1.7.ebuild |
| 49 |
@@ -58,11 +58,6 @@ RDEPEND="${DEPEND} |
| 50 |
!sci-biology/glimmer |
| 51 |
" |
| 52 |
|
| 53 |
-PATCHES=( |
| 54 |
- # From Fedora |
| 55 |
- "${FILESDIR}"/${P}-segfault.patch |
| 56 |
-) |
| 57 |
- |
| 58 |
src_prepare() { |
| 59 |
default |
Archives