summaryrefslogtreecommitdiff
path: root/editors/calligra/files
diff options
context:
space:
mode:
authorJason E. Hale <jhale@FreeBSD.org>2012-11-08 22:32:31 +0000
committerJason E. Hale <jhale@FreeBSD.org>2012-11-08 22:32:31 +0000
commit5139f3d115f850d8697974524953befb8c202e1c (patch)
tree9a8f613b92eb5c02bd1bd203bde04ef175c768c0 /editors/calligra/files
parent- Update to 2.0.20121103 (diff)
- Add upstream patch to fix build with lcms 2.4
Reported by: pointyhat via beat Approved by: makc, avilla (mentors, implicit) Feature safe: yes
Notes
Notes: svn path=/head/; revision=307208
Diffstat (limited to 'editors/calligra/files')
-rw-r--r--editors/calligra/files/patch-git_e5f5359419
1 files changed, 19 insertions, 0 deletions
diff --git a/editors/calligra/files/patch-git_e5f53594 b/editors/calligra/files/patch-git_e5f53594
new file mode 100644
index 000000000000..f1e4dca3f7d7
--- /dev/null
+++ b/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>