commit:     3b3cd50825ef2f27b4c2b81cd300728743a321fb
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 21 12:20:13 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Oct 21 12:20:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b3cd508

Revert "media-libs/libextractor: Fix gcc-8 segfault (#668044 by Toralf Förster)"

This reverts commit 6a2b56c0a796fdb00151ba69fb2c617715307905.

Bug: https://bugs.gentoo.org/668044
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 .../files/libextractor-1.7-segfault.patch             | 19 -------------------
 media-libs/libextractor/libextractor-1.7.ebuild       |  5 -----
 2 files changed, 24 deletions(-)

diff --git a/media-libs/libextractor/files/libextractor-1.7-segfault.patch 
b/media-libs/libextractor/files/libextractor-1.7-segfault.patch
deleted file mode 100644
index 8b44238bf07..00000000000
--- a/media-libs/libextractor/files/libextractor-1.7-segfault.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** a/src/plugins/ole2_extractor.c~    2018-06-20 15:02:55.000000000 -0500
---- b/src/plugins/ole2_extractor.c     2018-07-18 15:21:13.411495048 -0500
-***************
-*** 336,342 ****
-        (buf[1] != 0x0) ||
-        (0 != strncmp (&buf[2],
-                       "SfxDocumentInfo",
-!                      strlen ("SfxDocumentInfo"))) ||
-        (buf[0x11] != 0x0B) ||
-        (buf[0x13] != 0x00) || /* pw protected! */
-        (buf[0x12] != 0x00) )
---- 336,342 ----
-        (buf[1] != 0x0) ||
-        (0 != strncmp (&buf[2],
-                       "SfxDocumentInfo",
-!                      strlen ("SfxDocumentInfo") + 1)) ||
-        (buf[0x11] != 0x0B) ||
-        (buf[0x13] != 0x00) || /* pw protected! */
-        (buf[0x12] != 0x00) )

diff --git a/media-libs/libextractor/libextractor-1.7.ebuild 
b/media-libs/libextractor/libextractor-1.7.ebuild
index 76dde5f2ac4..74dc8b4f10b 100644
--- a/media-libs/libextractor/libextractor-1.7.ebuild
+++ b/media-libs/libextractor/libextractor-1.7.ebuild
@@ -58,11 +58,6 @@ RDEPEND="${DEPEND}
        !sci-biology/glimmer
 "
 
-PATCHES=(
-       # From Fedora
-       "${FILESDIR}"/${P}-segfault.patch
-)
-
 src_prepare() {
        default
 

Reply via email to