summaryrefslogtreecommitdiff
path: root/editors/calligra/files
diff options
context:
space:
mode:
authorRaphael Kubo da Costa <rakuco@FreeBSD.org>2015-12-21 18:10:32 +0000
committerRaphael Kubo da Costa <rakuco@FreeBSD.org>2015-12-21 18:10:32 +0000
commit978b5a598dfebdef2d5c1d63b0e5aa997dfa4b22 (patch)
treedb2d3e7a69c54067eac16018d9e3d294e33a5883 /editors/calligra/files
parentdeve/fpc-bfd: remove the useless options (diff)
Update Calligra to 2.9.10.
This is the latest Calligra release, and the 2.9 series will be the last KDE4-based release series. As usual, huge thanks to Tobias Berner <tcberner@gmail.com> for working on this in kde@'s area51 experimental repository (including previous Calligra releases between 2.7.5 and 2.9.10). Notable changes from a packaging perspective: - Several dependencies have been updated to use more recent ports versions. - Old translations not shipped by the current Calligra release have been removed. - The dependency on sysutils/nepomuk-core has been dropped, following what upstream has done. - The dependency on Qt3-compatibility Qt4 ports has been dropped, following upstream. - CONFLICTS with ancient ports have been removed. - Support for G'MIC (GREYC's Magic for Image Computing), introduced after 2.7.5, is disabled by default, as building the code with clang requires insane (>24GB) amounts of memory. We reported this bug to the LLVM developers (bug 22199) almost a year ago, but there has been no activity upstream. - Stopped depending on graphics/pstoedit in an unorthodox way: just follow what every major Linux distribution does and unconditionally depend on it. I could not figure out why we were originally depending on the port if it was already installed. - Stop playing tricks with PACKAGE_BUILDING: we do not package Vc (https://github.com/VcDevel/Vc) so it does not make sense to turn on support for it when building packages. Not only that, but the CMake option name was wrong (it should be PACKAGERS_BUILD, not WITH_PACKAGERS_BUILD).
Notes
Notes: svn path=/head/; revision=404140
Diffstat (limited to 'editors/calligra/files')
-rw-r--r--editors/calligra/files/patch-cmake__modules__FindWPG.cmake20
-rw-r--r--editors/calligra/files/patch-git_3f2bf6c25
-rw-r--r--editors/calligra/files/patch-krita__plugins__extensions__CMakeLists.txt22
3 files changed, 0 insertions, 67 deletions
diff --git a/editors/calligra/files/patch-cmake__modules__FindWPG.cmake b/editors/calligra/files/patch-cmake__modules__FindWPG.cmake
deleted file mode 100644
index 3f710c4401cd..000000000000
--- a/editors/calligra/files/patch-cmake__modules__FindWPG.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./cmake/modules/FindWPG.cmake.orig 2012-07-17 01:34:40.838916621 +0200
-+++ ./cmake/modules/FindWPG.cmake 2012-07-17 01:36:33.058951606 +0200
-@@ -28,7 +28,7 @@
-
- FIND_LIBRARY(LIBWPG_STREAM_LIBRARY
- NAMES
-- libwpd-stream-0.9 wpd-stream-0.9 libwpd-stream wpd-stream
-+ libwpd-stream-0.9 wpd-stream-0.9
- PATHS
- ${LIBWPG_LIBRARIES}
- )
-@@ -36,7 +36,7 @@
- FIND_PATH(LIBWPG_INCLUDE_DIR libwpg/libwpg.h
- PATHS
- ${LIBWPG_INCLUDE_DIRS}
-- PATH_SUFFIXES libwpg-0.2 libwpg
-+ PATH_SUFFIXES libwpg-0.2
- )
-
- SET(LIBWPG_LIBRARIES ${LIBWPG_LIBRARY} ${LIBWPG_STREAM_LIBRARY})
diff --git a/editors/calligra/files/patch-git_3f2bf6c b/editors/calligra/files/patch-git_3f2bf6c
deleted file mode 100644
index 662bacab9291..000000000000
--- a/editors/calligra/files/patch-git_3f2bf6c
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 3f2bf6cf65a280b449e3ad854d3a6c4ce92208bc
-Author: Yue Liu <yue.liu@mail.com>
-Date: Sat Oct 12 12:10:40 2013 -0400
-
- fix osx compile issue
-
---- filters/words/msword-odf/wv2/src/word97_helper.cpp
-+++ filters/words/msword-odf/wv2/src/word97_helper.cpp
-@@ -31,6 +31,7 @@
- #include <string.h> // memcpy
- #include <algorithm>
- #include <functional> // std::bind2nd for gcc 2.9x
-+#include <cstdlib>
-
- #include "wvlog.h"
-
-@@ -730,7 +731,7 @@ namespace
- {
- m_center = readS16( ptr + index * sizeof( S16 ) );
- // A negative value doesn't make sense here, right? Hmmm
-- m_plusMinus = std::abs( readS16( ptr + itbdDelMax * sizeof( S16 ) + index * sizeof( S16 ) ) );
-+ m_plusMinus = std::abs( (int)( readS16( ptr + itbdDelMax * sizeof( S16 ) + index * sizeof( S16 ) ) ) );
- }
-
- bool contains( S16 position ) const { return m_center - m_plusMinus <= position && m_center + m_plusMinus >= position; }
diff --git a/editors/calligra/files/patch-krita__plugins__extensions__CMakeLists.txt b/editors/calligra/files/patch-krita__plugins__extensions__CMakeLists.txt
deleted file mode 100644
index 1a2e0d3131d4..000000000000
--- a/editors/calligra/files/patch-krita__plugins__extensions__CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./krita/plugins/extensions/CMakeLists.txt.orig 2013-11-24 05:49:21.000000000 -0800
-+++ ./krita/plugins/extensions/CMakeLists.txt 2013-12-05 15:07:18.472809577 -0800
-@@ -14,13 +14,13 @@
- add_subdirectory( dockers )
- add_subdirectory( layergroupswitcher )
-
--find_package(OpenShiva)
--find_package(QtShiva )
-+macro_optional_find_package(OpenShiva)
-+macro_optional_find_package(QtShiva )
-
--if(HAVE_OPENSHIVA AND HAVE_QTSHIVA)
-+if(OPENSHIVA_FOUND AND QTSHIVA_FOUND)
- add_subdirectory(shiva)
--endif(HAVE_OPENSHIVA AND HAVE_QTSHIVA)
-+endif(OPENSHIVA_FOUND AND QTSHIVA_FOUND)
-
--macro_log_feature(HAVE_OPENSHIVA "OpenShiva" "OpenShiva interpreter for the Shiva Kernel Language (part of OpenGTL)" "http://www.opengtl.org" FALSE "" "Required for Shiva based Generators and Filters")
--macro_log_feature(HAVE_QTSHIVA "QtShiva" "Qt bindings for the OpenShiva interpreter (part of libQtGTL)" "http://www.opengtl.org" FALSE "" "Required for Shiva based Generators and Filters")
-+macro_log_feature(OPENSHIVA_FOUND "OpenShiva" "OpenShiva interpreter for the Shiva Kernel Language (part of OpenGTL)" "http://www.opengtl.org" FALSE "" "Required for Shiva based Generators and Filters")
-+macro_log_feature(QTSHIVA_FOUND "QtShiva" "Qt bindings for the OpenShiva interpreter (part of libQtGTL)" "http://www.opengtl.org" FALSE "" "Required for Shiva based Generators and Filters")
-