From owner-svn-ports-head@freebsd.org  Thu Nov 12 15:01:09 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 037A7A2C7F5;
 Thu, 12 Nov 2015 15:01:09 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BE5B11363;
 Thu, 12 Nov 2015 15:01:08 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tACF173S061552;
 Thu, 12 Nov 2015 15:01:07 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tACF17ST061551;
 Thu, 12 Nov 2015 15:01:07 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201511121501.tACF17ST061551@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Thu, 12 Nov 2015 15:01:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r401355 - head/textproc/libextractor/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Nov 2015 15:01:09 -0000

Author: antoine
Date: Thu Nov 12 15:01:07 2015
New Revision: 401355
URL: https://svnweb.freebsd.org/changeset/ports/401355

Log:
  Allow building with giflib 5.1
  
  PR:		204492

Added:
  head/textproc/libextractor/files/patch-src_plugins_gif__extractor.c   (contents, props changed)

Added: head/textproc/libextractor/files/patch-src_plugins_gif__extractor.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/libextractor/files/patch-src_plugins_gif__extractor.c	Thu Nov 12 15:01:07 2015	(r401355)
@@ -0,0 +1,26 @@
+--- src/plugins/gif_extractor.c.orig	2013-06-21 16:00:16 UTC
++++ src/plugins/gif_extractor.c
+@@ -78,7 +78,11 @@ EXTRACTOR_gif_extract_method (struct EXT
+   if (gif_file == NULL || gif_error != 0)
+   {
+     if (gif_file != NULL)
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++      EGifCloseFile (gif_file, NULL);
++#else
+       EGifCloseFile (gif_file);
++#endif
+     return; /* not a GIF */
+   }
+ #endif
+@@ -133,7 +137,11 @@ EXTRACTOR_gif_extract_method (struct EXT
+ 	       DGifGetExtensionNext(gif_file, &ext)) &&
+ 	      (NULL != ext) ) ; /* keep going */
+     }
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++  DGifCloseFile (gif_file, NULL);
++#else
+   DGifCloseFile (gif_file);
++#endif
+ }
+ 
+ /* end of gif_extractor.c */