aboutsummaryrefslogtreecommitdiff
path: root/x11/kdelibs3/files
diff options
context:
space:
mode:
authorTilman Keskinoz <arved@FreeBSD.org>2004-06-23 18:51:20 +0000
committerTilman Keskinoz <arved@FreeBSD.org>2004-06-23 18:51:20 +0000
commitd0ac1a1bc3a63faa292d27911f7a7ce00a3dd2fe (patch)
tree741397a4df5350467cf5b7bb6793b167fb80c6dd /x11/kdelibs3/files
parentc250e99c46e849334b98abe55829c297ff927f1b (diff)
downloadports-d0ac1a1bc3a63faa292d27911f7a7ce00a3dd2fe.tar.gz
ports-d0ac1a1bc3a63faa292d27911f7a7ce00a3dd2fe.zip
Work around a bug in QString::fromUtf8
This fixes my crashes of Konqueror, Kmix, Kate & ... on AMD64 Submitted by: Frerich Raabe Obtained from: KDE CVS
Notes
Notes: svn path=/head/; revision=112079
Diffstat (limited to 'x11/kdelibs3/files')
-rw-r--r--x11/kdelibs3/files/patch-kdeui-kxmlguifactory.cpp23
1 files changed, 23 insertions, 0 deletions
diff --git a/x11/kdelibs3/files/patch-kdeui-kxmlguifactory.cpp b/x11/kdelibs3/files/patch-kdeui-kxmlguifactory.cpp
new file mode 100644
index 000000000000..a9ae71f61519
--- /dev/null
+++ b/x11/kdelibs3/files/patch-kdeui-kxmlguifactory.cpp
@@ -0,0 +1,23 @@
+Index: kxmlguifactory.cpp
+===================================================================
+RCS file: /home/kde/kdelibs/kdeui/kxmlguifactory.cpp,v
+retrieving revision 1.149
+retrieving revision 1.151
+diff -u -3 -p -r1.149 -r1.151
+--- kxmlguifactory.cpp 19 Jun 2004 21:35:02 -0000 1.149
++++ kdeui/kxmlguifactory.cpp 22 Jun 2004 15:56:16 -0000 1.151
+@@ -124,7 +124,14 @@ QString KXMLGUIFactory::readConfigFile(
+ return QString::null;
+ }
+
++#if QT_VERSION <= 0x030302
++ // Work around bug in QString::fromUtf8 (which calls strlen).
++ QByteArray buffer(file.size() + 1);
++ buffer = file.readAll();
++ buffer[ buffer.size() - 1 ] = '\0';
++#else
+ QByteArray buffer(file.readAll());
++#endif
+ return QString::fromUtf8(buffer.data(), buffer.size());
+ }
+