ooo-build r14487 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Wed Nov 12 12:59:01 2008
New Revision: 14487
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14487&view=rev

Log:
2008-11-12  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply: Move jpegc.c.diff from Fixes to
	LinuxOnly. As its comment says, it is intended only for use with
	an *unpatched* libjpeg. "unpatched" here means that the upstream
	jpeg-6b.patch has not been applied to it. Using jpegc.c.diff on
	Windows corrupts colours in CMYK or YCCK JPEGs, bnc#444106. BTW, I
	wonder what YCCK is? Presumably this patch should not be used on
	MacOS and Solaris either, as I think they use the included patched
	libjpeg, too.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Nov 12 12:59:01 2008
@@ -479,9 +479,11 @@
 # allow other types of signing certs, fix by Jacob Berkman <jberkman novell com>
 xmlsecurity-verify-usages.diff, i#76871, pmladek
 
+[ LinuxOnly ]
 # fix that allows OOo to work with a standard (unpatched) libjpeg,
 jpegc.c.diff, i#80674, n#272574, flr
 
+[ Fixes ]
 # handle hyperlinks to files better
 sw-hyperlinks-relative.diff, n#405712, i#91522, jholesov