From owner-svn-ports-all@freebsd.org  Thu Nov 12 19:36:39 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 B80D9A2DFA8;
 Thu, 12 Nov 2015 19:36:39 +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 7F9C511DC;
 Thu, 12 Nov 2015 19:36:39 +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 tACJacDu044229;
 Thu, 12 Nov 2015 19:36:38 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tACJaccv044228;
 Thu, 12 Nov 2015 19:36:38 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201511121936.tACJaccv044228@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 19:36:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r401392 - head/graphics/gnash/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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Nov 2015 19:36:39 -0000

Author: antoine
Date: Thu Nov 12 19:36:38 2015
New Revision: 401392
URL: https://svnweb.freebsd.org/changeset/ports/401392

Log:
  Allow building with giflib 5.1
  
  PR:		204492

Modified:
  head/graphics/gnash/files/patch-libbase_GnashImageGif.cpp

Modified: head/graphics/gnash/files/patch-libbase_GnashImageGif.cpp
==============================================================================
--- head/graphics/gnash/files/patch-libbase_GnashImageGif.cpp	Thu Nov 12 19:20:25 2015	(r401391)
+++ head/graphics/gnash/files/patch-libbase_GnashImageGif.cpp	Thu Nov 12 19:36:38 2015	(r401392)
@@ -1,6 +1,18 @@
 --- libbase/GnashImageGif.cpp.orig	2012-01-19 19:17:48 UTC
 +++ libbase/GnashImageGif.cpp
-@@ -269,7 +269,11 @@ GifInput::processRecord(GifRecordType re
+@@ -121,7 +121,11 @@ GifInput::GifInput(boost::shared_ptr<IOC
+ GifInput::~GifInput()
+ {
+     // Clean up allocated data.
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++    DGifCloseFile(_gif, NULL);
++#else
+     DGifCloseFile(_gif);
++#endif
+ }
+ 
+ size_t
+@@ -269,7 +273,11 @@ GifInput::processRecord(GifRecordType re
  void
  GifInput::read()
  {