From owner-svn-ports-all@FreeBSD.ORG  Fri Nov  9 09:29:31 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9E873E23;
 Fri,  9 Nov 2012 09:29:31 +0000 (UTC)
 (envelope-from jhale@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 695558FC12;
 Fri,  9 Nov 2012 09:29:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA99TV1K041016;
 Fri, 9 Nov 2012 09:29:31 GMT (envelope-from jhale@svn.freebsd.org)
Received: (from jhale@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA99TVfR041015;
 Fri, 9 Nov 2012 09:29:31 GMT (envelope-from jhale@svn.freebsd.org)
Message-Id: <201211090929.qA99TVfR041015@svn.freebsd.org>
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Fri, 9 Nov 2012 09:29:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r307230 - branches/RELENG_9_1_0/editors/calligra/files
X-SVN-Group: ports-branches
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Nov 2012 09:29:31 -0000

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@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>