svn commit: r307230 - branches/RELENG_9_1_0/editors/calligra/files

[Jason E. Hale]

Author: jhale
Date: Fri Nov  9 09:29:31 2012
New Revision: 307230
URL: http://svnweb.freebsd.org/changeset/ports/307230

Log:
  MFH r307208
  
  - Add upstream patch to fix build with lcms 2.4
  
  Reported by:	pointyhat via beat
  Approved by:	portmgr (beat)
  		makc, avilla (mentors, implicit)
  Feature safe:	yes

Added:
  branches/RELENG_9_1_0/editors/calligra/files/patch-git_e5f53594
     - copied unchanged from r307208, head/editors/calligra/files/patch-git_e5f53594
Modified:
Directory Properties:
  branches/RELENG_9_1_0/   (props changed)

Copied: branches/RELENG_9_1_0/editors/calligra/files/patch-git_e5f53594 (from r307208, head/editors/calligra/files/patch-git_e5f53594)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/RELENG_9_1_0/editors/calligra/files/patch-git_e5f53594	Fri Nov  9 09:29:31 2012	(r307230, copy of r307208, head/editors/calligra/files/patch-git_e5f53594)
@@ -0,0 +1,19 @@
+commit e5f535944132105f9acbe02f1042e1725c515f99
+Author: Boudewijn Rempt <boud at valdyas.org>
+Date:   Tue Sep 4 15:14:51 2012 +0200
+
+    Fix compilation with latest lcms2.4 rc
+
+diff --git a/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h b/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h
+index 8250ea5..62c777f 100644
+--- ./plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h
++++ ./plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h
+@@ -23,6 +23,8 @@
+ #include <LcmsColorSpace.h>
+ #include <KoColorSpaceTraits.h>
+ 
++#define TYPE_XYZA_FLT         (FLOAT_SH(1)|COLORSPACE_SH(PT_XYZ)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(4))
++
+ #include <KoColorModelStandardIds.h>
+ 
+ class XyzF32ColorSpace : public LcmsColorSpace<KoXyzF32Traits>