diff options
| author | Max Brazhnikov <makc@FreeBSD.org> | 2013-02-05 11:36:39 +0000 |
|---|---|---|
| committer | Max Brazhnikov <makc@FreeBSD.org> | 2013-02-05 11:36:39 +0000 |
| commit | 617a653c25aedb0d737a611630cfdf8257df2fe0 (patch) | |
| tree | 309f1c85d8b979eaa5ff9dae4a2ab6b3464b092c /editors/calligra/files | |
| parent | 5106de5039c53a8436ca055a8e631674f0fca76e (diff) | |
| download | ports-617a653c25aedb0d737a611630cfdf8257df2fe0.tar.gz ports-617a653c25aedb0d737a611630cfdf8257df2fe0.zip | |
Merge from area51 repository:
- Update to 2.5.5
- Convert to new options framework
- minor cleanups
Courtesy of: avilla
Notes
Notes:
svn path=/head/; revision=311700
Diffstat (limited to 'editors/calligra/files')
| -rw-r--r-- | editors/calligra/files/patch-git_e5f53594 | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/editors/calligra/files/patch-git_e5f53594 b/editors/calligra/files/patch-git_e5f53594 deleted file mode 100644 index f1e4dca3f7d7..000000000000 --- a/editors/calligra/files/patch-git_e5f53594 +++ /dev/null @@ -1,19 +0,0 @@ -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> |