diff options
| author | jhale <jhale@FreeBSD.org> | 2012-09-13 21:03:48 +0800 |
|---|---|---|
| committer | jhale <jhale@FreeBSD.org> | 2012-09-13 21:03:48 +0800 |
| commit | 05926a7d703a33edc056e5670e536e4b28af6e34 (patch) | |
| tree | b5fb5cc83cb3048edbde1c85d2b7bac042d46510 /finance/kmymoney-kde4/files | |
| parent | cf1c0433c7a98b7bdac5fba0ffaf39c301045e8e (diff) | |
| download | freebsd-ports-gnome-05926a7d703a33edc056e5670e536e4b28af6e34.tar.gz freebsd-ports-gnome-05926a7d703a33edc056e5670e536e4b28af6e34.tar.zst freebsd-ports-gnome-05926a7d703a33edc056e5670e536e4b28af6e34.zip | |
- Update to 4.6.3
- Make COMMENT more concise
- Make NLS optional
Approved by: avilla (mentor)
Diffstat (limited to 'finance/kmymoney-kde4/files')
| -rw-r--r-- | finance/kmymoney-kde4/files/patch-CMakeLists.txt | 26 | ||||
| -rw-r--r-- | finance/kmymoney-kde4/files/patch-libkdchart__src__KDChartBackgroundAttributes.cpp | 30 |
2 files changed, 20 insertions, 36 deletions
diff --git a/finance/kmymoney-kde4/files/patch-CMakeLists.txt b/finance/kmymoney-kde4/files/patch-CMakeLists.txt index 8aab30dadc4d..94350740859d 100644 --- a/finance/kmymoney-kde4/files/patch-CMakeLists.txt +++ b/finance/kmymoney-kde4/files/patch-CMakeLists.txt @@ -1,8 +1,8 @@ ---- ./CMakeLists.txt.orig 2010-08-16 06:55:14.000000000 -0400 -+++ ./CMakeLists.txt 2010-08-23 03:51:38.000000000 -0400 -@@ -78,13 +78,6 @@ - ADD_CUSTOM_TARGET(apidoc ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/kmymoney.doxygen) - ENDIF(DOXYGEN_FOUND) +--- ./CMakeLists.txt.orig 2012-08-31 09:48:09.000000000 -0400 ++++ ./CMakeLists.txt 2012-09-09 19:17:33.000000000 -0400 +@@ -94,13 +94,6 @@ + FIND_PACKAGE(GMP REQUIRED) + FIND_PACKAGE(LibAlkimia 4.3.1 REQUIRED) -# check for PkgConfig -FIND_PACKAGE(PkgConfig) @@ -14,7 +14,7 @@ # check some functions INCLUDE (CheckFunctionExists) CHECK_FUNCTION_EXISTS(atoll HAVE_ATOLL) -@@ -113,7 +106,6 @@ +@@ -129,7 +122,6 @@ CHECK_TYPE_SIZE(short SIZEOF_SHORT) CHECK_TYPE_SIZE(size_t SIZEOF_SIZE_T) CHECK_TYPE_SIZE("unsigned long" SIZEOF_UNSIGNED_LONG) @@ -22,3 +22,17 @@ MARK_AS_ADVANCED( KDE4_KCFGC_EXECUTABLE KDE4_KDECORE_LIBRARY KDECONFIG_EXECUTABLE) +@@ -411,7 +403,10 @@ + message("Good - your configure finished. + Now type 'make' to build KMyMoney. For more help, consult README.cmake + ") +-find_package(Msgfmt REQUIRED) +-find_package(Gettext REQUIRED) +-add_subdirectory( po ) ++option(ENABLE_NLS "NLS Support" ON) ++if(ENABLE_NLS) ++ find_package(Msgfmt REQUIRED) ++ find_package(Gettext REQUIRED) ++ add_subdirectory( po ) ++endif(ENABLE_NLS) + add_subdirectory( doc-translations ) diff --git a/finance/kmymoney-kde4/files/patch-libkdchart__src__KDChartBackgroundAttributes.cpp b/finance/kmymoney-kde4/files/patch-libkdchart__src__KDChartBackgroundAttributes.cpp deleted file mode 100644 index 7b15df7bbb4b..000000000000 --- a/finance/kmymoney-kde4/files/patch-libkdchart__src__KDChartBackgroundAttributes.cpp +++ /dev/null @@ -1,30 +0,0 @@ -commit 8324cfb9657d8c03f83691402386e8c5bfb29981 -Author: Christoph Feck <christoph@maxiom.de> -Date: Thu Nov 10 12:34:20 2011 +0100 - - Fix compile with Qt 4.8 - - Sideported commits f42a0a3d878afebb298609c9886851858c56cc15 and - fe74b25bf3b78c42e95569fe467a397876bc9c04 from massif-visualizer - -diff --git a/libkdchart/src/KDChartBackgroundAttributes.cpp b/libkdchart/src/KDChartBackgroundAttributes.cpp -index f9f1520..3b86000 100644 ---- ./libkdchart/src/KDChartBackgroundAttributes.cpp -+++ ./libkdchart/src/KDChartBackgroundAttributes.cpp -@@ -22,6 +22,7 @@ - - #include "KDChartBackgroundAttributes.h" - #include <QPixmap> -+#include <QVariant> - - #include <KDABLibFakes> - -@@ -150,7 +151,7 @@ QDebug operator<<(QDebug dbg, const KDChart::BackgroundAttributes& ba) - << "visible="<<ba.isVisible() - << "brush="<<ba.brush() - << "pixmapmode="<<ba.pixmapMode() -- << "pixmap="<<ba.pixmap() -+ << "pixmap="<<QVariant(ba.pixmap()) - << ")"; - return dbg; - } |