diff options
| author |   Andreas Hüttel <dilfridge@gentoo.org> | 2011-03-08 22:03:41 +0000 |
|---|---|---|
| committer | Andreas Hüttel <dilfridge@gentoo.org> | 2011-03-08 22:03:41 +0000 |
| commit | 661a747acf33296fbb00531ffe81600b231200f3 (patch) | |
| tree | be4f3b56affaacbbc3f36df6f28c661c2140e8b1 /kde-base/kdepim-runtime/files | |
| parent | Update HOMEPAGE. (diff) | |
| download | historical-661a747acf33296fbb00531ffe81600b231200f3.tar.gz historical-661a747acf33296fbb00531ffe81600b231200f3.tar.bz2 historical-661a747acf33296fbb00531ffe81600b231200f3.zip | |
Added fixes for kdeenablefinal problems, bug 350303. Not completely solved yet.
Package-Manager: portage-2.1.9.42/cvs/Linux x86_64
Diffstat (limited to 'kde-base/kdepim-runtime/files')
| -rw-r--r-- | kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-1.patch | 18 | ||||
| -rw-r--r-- | kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-2.patch | 20 |
2 files changed, 38 insertions, 0 deletions
diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-1.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-1.patch new file mode 100644 index 000000000000..cfdaf21a69d7 --- /dev/null +++ b/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-1.patch @@ -0,0 +1,18 @@ +--- libkdepim-copy/calendardiffalgo.cpp.orig 2011-01-01 19:19:25.798000269 +0100 ++++ libkdepim-copy/calendardiffalgo.cpp 2011-01-01 19:14:15.918000268 +0100 +@@ -26,7 +26,6 @@ + + using namespace KPIM; + +-#ifndef KDE_USE_FINAL + static bool compareString( const QString &left, const QString &right ) + { + if ( left.isEmpty() && right.isEmpty() ) +@@ -34,7 +33,6 @@ + else + return left == right; + } +-#endif + + static QString toString( KCal::Attendee *attendee ) + { diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-2.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-2.patch new file mode 100644 index 000000000000..67425fe7c3a4 --- /dev/null +++ b/kde-base/kdepim-runtime/files/kdepim-runtime-4.4.10-enablefinal-2.patch @@ -0,0 +1,20 @@ +--- resources/kolabproxy/distributionlist.cpp.orig 2011-01-01 19:18:41.274000269 +0100 ++++ resources/kolabproxy/distributionlist.cpp 2011-01-01 19:16:44.378000268 +0100 +@@ -39,8 +39,6 @@ + + using namespace Kolab; + +-static const char* s_unhandledTagAppName = "KOLABUNHANDLED"; // no hyphens in appnames! +- + // saving (contactgroup->xml) + DistributionList::DistributionList( const KABC::ContactGroup* contactGroup ) + { +@@ -149,7 +147,7 @@ + // Unhandled tag - save for later storage + //kDebug() <<"Saving unhandled tag" << e.tagName(); + Custom c; +- c.app = s_unhandledTagAppName; ++ c.app = "KOLABUNHANDLED"; + c.name = e.tagName(); + c.value = e.text(); + mCustomList.append( c ); |