<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3be23c8b40ac100a40e7c3b33d795e1b581e117e">https://github.com/macports/macports-ports/commit/3be23c8b40ac100a40e7c3b33d795e1b581e117e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3be23c8 libextractor: Update to 1.4
</span>3be23c8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3be23c8b40ac100a40e7c3b33d795e1b581e117e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Jul 8 03:14:46 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> libextractor: Update to 1.4
</span>---
devel/libextractor/Portfile | 13 +-
devel/libextractor/files/patch-configure.diff | 6 +-
devel/libextractor/files/patch-ffmpeg-3.0.diff | 167 ---------------------
.../files/patch-src-plugins-html_extractor.c.diff | 6 +-
.../files/patch-src-plugins-jpeg_extractor.c.diff | 14 --
5 files changed, 11 insertions(+), 195 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libextractor/Portfile b/devel/libextractor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fd02ef9..68805a9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libextractor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libextractor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,11 +3,10 @@
</span> PortSystem 1.0
name libextractor
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.4
</span> categories devel
license GPL-3+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span>
description A library for extraction af meta-data.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,8 +20,8 @@ homepage http://www.gnu.org/software/libextractor/
</span> master_sites gnu
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b51a1a27c6a6de74fca0630b164017ca114a5af8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 868ad64c9a056d6b923d451d746935bffb1ddf5d89c3eb4f67d786001a3f7b7f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9e72434f395df4e18913bff257c7dba6567771d3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 84128170a4a9aa3a19942dd53fdf30ed17b56d7fae79b5f6e7e17a0d65d1f66c
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,9 +51,7 @@ depends_lib port:bzip2 \
</span> port:zlib
patchfiles patch-configure.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-plugins-html_extractor.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-plugins-jpeg_extractor.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ffmpeg-3.0.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-plugins-html_extractor.c.diff
</span>
configure.args --enable-ffmpeg \
--enable-glib \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libextractor/files/patch-configure.diff b/devel/libextractor/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ef96927..875cbf1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libextractor/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libextractor/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2013-12-23 05:15:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2015-09-19 14:44:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19774,7 +19774,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-06-10 07:15:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-07-08 01:50:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20568,7 +20568,7 @@
</span> LIBS="$LIBS -ltidy"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libextractor/files/patch-ffmpeg-3.0.diff b/devel/libextractor/files/patch-ffmpeg-3.0.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3319385..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libextractor/files/patch-ffmpeg-3.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,167 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ur src/plugins.orig/previewopus_extractor.c src/plugins/previewopus_extractor.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins.orig/previewopus_extractor.c 2016-04-21 14:25:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/previewopus_extractor.c 2016-04-21 14:26:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -296,7 +296,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** Initialize one audio frame for reading from the input file */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int init_input_frame(AVFrame **frame)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!(*frame = avcodec_alloc_frame())) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!(*frame = av_frame_alloc())) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stderr, "Could not allocate input frame\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -655,7 +655,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- av_freep(&converted_input_samples[0]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free(converted_input_samples);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- avcodec_free_frame(&input_frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_frame_free(&input_frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -671,7 +671,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int error;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** Create a new frame to store the audio samples. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!(*frame = avcodec_alloc_frame())) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!(*frame = av_frame_alloc())) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stderr, "Could not allocate output frame\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -702,7 +702,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stderr, "Could allocate output frame samples (error '%s')\n", get_error_text(error));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- avcodec_free_frame(frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_frame_free(frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return error;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -783,17 +783,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stderr, "Could not read data from FIFO\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- avcodec_free_frame(&output_frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_frame_free(&output_frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return AVERROR_EXIT;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** Encode one frame worth of audio samples. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (encode_audio_frame(output_frame, output_format_context,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- output_codec_context, &data_written)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- avcodec_free_frame(&output_frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_frame_free(&output_frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return AVERROR_EXIT;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- avcodec_free_frame(&output_frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_frame_free(&output_frame);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** Write the trailer of the output file container. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -907,7 +907,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (NULL == (frame = avcodec_alloc_frame ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (NULL == (frame = av_frame_alloc ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf (stderr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ur src/plugins.orig/thumbnailffmpeg_extractor.c src/plugins/thumbnailffmpeg_extractor.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins.orig/thumbnailffmpeg_extractor.c 2016-04-21 14:25:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/thumbnailffmpeg_extractor.c 2016-04-21 14:25:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -153,7 +153,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static size_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- create_thumbnail (int src_width, int src_height,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int src_stride[],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- enum PixelFormat src_pixfmt,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ enum AVPixelFormat src_pixfmt,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const uint8_t * const src_data[],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int dst_width, int dst_height,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint8_t **output_data,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -189,7 +189,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (NULL ==
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (scaler_ctx =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sws_getContext (src_width, src_height, src_pixfmt,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dst_width, dst_height, PIX_FMT_RGB24,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dst_width, dst_height, AV_PIX_FMT_RGB24,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SWS_BILINEAR, NULL, NULL, NULL)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -199,7 +199,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (NULL == (dst_frame = avcodec_alloc_frame ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (NULL == (dst_frame = av_frame_alloc ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf (stderr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -209,7 +209,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (NULL == (dst_buffer =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- av_malloc (avpicture_get_size (PIX_FMT_RGB24, dst_width, dst_height))))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_malloc (avpicture_get_size (AV_PIX_FMT_RGB24, dst_width, dst_height))))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf (stderr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -220,7 +220,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- avpicture_fill ((AVPicture *) dst_frame, dst_buffer,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PIX_FMT_RGB24, dst_width, dst_height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AV_PIX_FMT_RGB24, dst_width, dst_height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sws_scale (scaler_ctx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src_data,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src_stride,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -255,7 +255,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- encoder_codec_ctx->width = dst_width;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- encoder_codec_ctx->height = dst_height;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- encoder_codec_ctx->pix_fmt = PIX_FMT_RGB24;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ encoder_codec_ctx->pix_fmt = AV_PIX_FMT_RGB24;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opts = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (avcodec_open2 (encoder_codec_ctx, encoder_codec, &opts) < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -283,7 +283,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- err = pkt.size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memcpy(encoder_output_buffer,pkt.data, pkt.size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- av_free_packet(&pkt);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_packet_unref(&pkt);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -410,7 +410,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- av_dict_free (&opts);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (NULL == (frame = avcodec_alloc_frame ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (NULL == (frame = av_frame_alloc ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf (stderr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -563,7 +563,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (NULL == (frame = avcodec_alloc_frame ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (NULL == (frame = av_frame_alloc ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf (stderr,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -603,11 +603,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &packet);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (frame_finished && frame->key_frame)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- av_free_packet (&packet);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_packet_unref (&packet);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- av_free_packet (&packet);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_packet_unref (&packet);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (! frame_finished)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libextractor/files/patch-src-plugins-html_extractor.c.diff b/devel/libextractor/files/patch-src-plugins-html_extractor.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d747a00..7e5588a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libextractor/files/patch-src-plugins-html_extractor.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libextractor/files/patch-src-plugins-html_extractor.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/html_extractor.c.orig 2012-08-27 14:09:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/html_extractor.c 2015-09-19 14:38:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/html_extractor.c.orig 2017-06-10 07:09:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/html_extractor.c 2017-07-08 02:58:23.000000000 -0500
</span> @@ -26,8 +26,8 @@
#include "platform.h"
#include "extractor.h"
#include <magic.h>
-#include <tidy/tidy.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <tidy/buffio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <tidy/tidybuffio.h>
</span> +#include <tidy.h>
+#include <tidybuffio.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libextractor/files/patch-src-plugins-jpeg_extractor.c.diff b/devel/libextractor/files/patch-src-plugins-jpeg_extractor.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3f950f6d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libextractor/files/patch-src-plugins-jpeg_extractor.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build failure with jpeg 9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gnunet.org/bugs/view.php?id=4436
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/jpeg_extractor.c.orig 2013-12-22 16:10:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/jpeg_extractor.c 2016-04-19 20:10:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "platform.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "extractor.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if WINDOWS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if WINDOWS || DARWIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef int boolean;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define HAVE_BOOLEAN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <jpeglib.h>
</span></pre><pre style='margin:0'>
</pre>