Gentoo Archives: gentoo-commits

From: "Julian Ospald (hasufell)" <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/xpaint/files: xpaint-2.9.10.2-tiff.patch xpaint-2.9.10-version.patch
Date: Fri, 20 Jun 2014 14:31:45
Message-Id: 20140620143142.446932004F@flycatcher.gentoo.org
1 hasufell 14/06/20 14:31:42
2
3 Added: xpaint-2.9.10.2-tiff.patch
4 Removed: xpaint-2.9.10-version.patch
5 Log:
6 fix build with tiff disabled wrt #513968, rm old
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
9
10 Revision Changes Path
11 1.1 media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch?rev=1.1&content-type=text/plain
15
16 Index: xpaint-2.9.10.2-tiff.patch
17 ===================================================================
18 From: Julian Ospald <hasufell@g.o>
19 Date: Fri Jun 20 13:52:42 UTC 2014
20 Subject: fix tiff build switch
21
22 --- xpaint-2.9.10.2/configure.ac
23 +++ xpaint-2.9.10.2/configure.ac
24 @@ -125,9 +125,11 @@
25 with_libtiff="yes"
26 tiff_header_found="no"
27 #
28 -AC_ARG_ENABLE(tiff,
29 +AC_ARG_ENABLE([tiff],
30 [ --enable-tiff[=[yes|no]] Build with TIFF support [ [default=yes] ]],
31 -test "$enable_tiff" = "no" && with_libtiff="no")
32 + [with_libtiff=$enableval],
33 + [with_libtiff=yes]
34 +)
35 #
36 if test "x$with_libtiff" = xyes ; then
37 #TIFF compiled with JPEG and JBIG support?
38 --- xpaint-2.9.10.2/rw/readWriteTIFF.c
39 +++ xpaint-2.9.10.2/rw/readWriteTIFF.c
40 @@ -14,6 +14,8 @@
41
42 /* $Id: xpaint-2.9.10.2-tiff.patch,v 1.1 2014/06/20 14:31:42 hasufell Exp $ */
43
44 +#ifdef HAVE_TIFF
45 +
46 #include <stdio.h>
47 #include <stdlib.h>
48 #include "tiffio.h"
49 @@ -527,3 +529,5 @@ int WriteTIFF(char *file, Image * image)
50
51 return 0;
52 }
53 +
54 +#endif /* HAVE_TIFF */