diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2010-05-11 14:41:11 +0000 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2010-05-11 14:41:11 +0000 |
| commit | 7c52c73acccea7bce92165c8e41e34829b844736 (patch) | |
| tree | 30dc8472ab8eb706041c39a9f5a176edf7893aa9 /editors/calligra/files | |
| parent | - Note kdelibs4-experimental removal (diff) | |
- Update KOffice to 2.1.2 release
- Add ca@valencia localization for KOffice
With hat on: kde@
Notes
Notes:
svn path=/head/; revision=254140
Diffstat (limited to 'editors/calligra/files')
3 files changed, 33 insertions, 3 deletions
diff --git a/editors/calligra/files/patch-cmake__modules__FindWPD.cmake b/editors/calligra/files/patch-cmake__modules__FindWPD.cmake new file mode 100644 index 000000000000..2d61de1342dd --- /dev/null +++ b/editors/calligra/files/patch-cmake__modules__FindWPD.cmake @@ -0,0 +1,16 @@ +--- ./cmake/modules/FindWPD.cmake.orig 2010-03-30 13:10:16.507260418 +1100 ++++ ./cmake/modules/FindWPD.cmake 2010-03-30 13:09:54.253774780 +1100 +@@ -25,9 +25,10 @@ + endif(NOT WIN32) + + FIND_PATH(WPD_INCLUDE_DIR libwpd/libwpd.h +- ${_WPDIncDir} +- /usr/include/libwpd-0.8 +- ) ++ PATHS ++ ${_WPDIncDir} ++ PATH_SUFFIXES libwpd-0.8 ++ ) + + FIND_LIBRARY(WPD_LIBRARIES NAMES wpd-0.8 + PATHS diff --git a/editors/calligra/files/patch-cmake__modules__FindWPG.cmake b/editors/calligra/files/patch-cmake__modules__FindWPG.cmake new file mode 100644 index 000000000000..6fea1669f8d5 --- /dev/null +++ b/editors/calligra/files/patch-cmake__modules__FindWPG.cmake @@ -0,0 +1,15 @@ +--- ./cmake/modules/FindWPG.cmake.orig 2010-03-30 00:05:52.000000000 +1100 ++++ ./cmake/modules/FindWPG.cmake 2010-03-30 13:07:46.392743489 +1100 +@@ -22,10 +22,10 @@ + SET(LIBWPG_DEFINITIONS ${_LibWpgCflags}) + ENDIF (NOT WIN32) + +- FIND_PATH(LIBWPG_INCLUDE_DIR libwpg-0.1/libwpg/libwpg.h ++ FIND_PATH(LIBWPG_INCLUDE_DIR libwpg/libwpg.h + PATHS + ${_LibWpgIncDir} +- PATH_SUFFIXES libwpg ++ PATH_SUFFIXES libwpg-0.1 + ) + + FIND_LIBRARY(LIBWPG_LIBRARIES NAMES wpg-0.1 libwpg-0.1 diff --git a/editors/calligra/files/patch-krita_ui_kis_png_converter.cpp b/editors/calligra/files/patch-krita_ui_kis_png_converter.cpp index fb2ec70cf2bc..494d4e335ff8 100644 --- a/editors/calligra/files/patch-krita_ui_kis_png_converter.cpp +++ b/editors/calligra/files/patch-krita_ui_kis_png_converter.cpp @@ -1,6 +1,5 @@ - ---- krita/ui/kis_png_converter.cpp.orig 2009-11-20 22:45:35.000000000 +0200 -+++ krita/ui/kis_png_converter.cpp 2010-03-29 08:23:02.980338247 +0300 +--- ./krita/ui/kis_png_converter.cpp.orig 2009-11-20 22:45:35.000000000 +0200 ++++ ./krita/ui/kis_png_converter.cpp 2010-03-29 08:23:02.980338247 +0300 @@ -404,7 +404,7 @@ png_byte signature[8]; |