| 1 |
ssuominen 14/08/29 04:24:38 |
| 2 |
|
| 3 |
Added: libmng-2.0.2-jpeg-9a.patch |
| 4 |
Log: |
| 5 |
Remove old kludge for jpeg-9 which is now unnecessary for jpeg-9a wrt #520906 by Diego Elio Pettenò |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-libs/libmng/files/libmng-2.0.2-jpeg-9a.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmng/files/libmng-2.0.2-jpeg-9a.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmng/files/libmng-2.0.2-jpeg-9a.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libmng-2.0.2-jpeg-9a.patch |
| 16 |
=================================================================== |
| 17 |
http://bugs.gentoo.org/520906 |
| 18 |
|
| 19 |
This kludge is unnecessary with jpeg-9a and is in fact breaking the build... |
| 20 |
|
| 21 |
libmng_jpeg.c:108:10: error: 'FALSE' undeclared (first use in this function) |
| 22 |
libmng_jpeg.c:536:48: error: 'TRUE' undeclared (first use in this function) |
| 23 |
libmng_jpeg_c:890:49: error: 'TRUE' undeclared (first use in this function) |
| 24 |
|
| 25 |
...because jmorecfg.h of jpeg-9a has this: |
| 26 |
|
| 27 |
#ifndef HAVE_BOOLEAN |
| 28 |
#if defined FALSE || defined TRUE || defined QGLOBAL_H |
| 29 |
/* Qt3 defines FALSE and TRUE as "const" variables in qglobal.h */ |
| 30 |
typedef int boolean; |
| 31 |
#ifndef FALSE /* in case these macros already exist */ |
| 32 |
#define FALSE 0 /* values of boolean */ |
| 33 |
#endif |
| 34 |
#ifndef TRUE |
| 35 |
#define TRUE 1 |
| 36 |
#endif |
| 37 |
#else |
| 38 |
typedef enum { FALSE = 0, TRUE = 1 } boolean; |
| 39 |
#endif |
| 40 |
#endif |
| 41 |
|
| 42 |
--- libmng_types.h |
| 43 |
+++ libmng_types.h |
| 44 |
@@ -199,11 +199,6 @@ |
| 45 |
#undef FAR /* possibly defined by zlib or lcms */ |
| 46 |
#endif |
| 47 |
#define JPEG_INTERNAL_OPTIONS /* for RGB_PIXELSIZE */ |
| 48 |
-/* There has been a change in jpeg-9 : */ |
| 49 |
-#ifndef _WIN32 |
| 50 |
-#define HAVE_BOOLEAN |
| 51 |
-typedef int boolean; |
| 52 |
-#endif |
| 53 |
#include <stdio.h> |
| 54 |
#include <jpeglib.h> |
| 55 |
#endif /* MNG_INCLUDE_IJG6B */ |
Archives