diff options
| author |   Gregorio Guidi <greg_g@gentoo.org> | 2005-11-16 09:29:31 +0000 |
|---|---|---|
| committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-11-16 09:29:31 +0000 |
| commit | 8d3ad1249519901bbbfc11454d5a2735413535c6 (patch) | |
| tree | a29c188e80424a42a7a6dfb8683ef6f41be2c14b /kde-base | |
| parent | bigendian typo in source (diff) | |
| download | historical-8d3ad1249519901bbbfc11454d5a2735413535c6.tar.gz historical-8d3ad1249519901bbbfc11454d5a2735413535c6.tar.bz2 historical-8d3ad1249519901bbbfc11454d5a2735413535c6.zip | |
Fix compilation with USE=unicode (#112606).
Package-Manager: portage-2.0.51.22-r3
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/superkaramba/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/superkaramba/Manifest | 11 | ||||
| -rw-r--r-- | kde-base/superkaramba/files/kdeutils-3.5_rc1-unicode.patch | 53 | ||||
| -rw-r--r-- | kde-base/superkaramba/superkaramba-3.5.0_rc1.ebuild | 4 |
4 files changed, 67 insertions, 7 deletions
diff --git a/kde-base/superkaramba/ChangeLog b/kde-base/superkaramba/ChangeLog index eea7e05a9f0c..e386d8f6d8c0 100644 --- a/kde-base/superkaramba/ChangeLog +++ b/kde-base/superkaramba/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/superkaramba # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.7 2005/11/12 15:49:36 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.8 2005/11/16 09:29:31 greg_g Exp $ + + 16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/kdeutils-3.5_rc1-unicode.patch, superkaramba-3.5.0_rc1.ebuild: + Fix compilation with USE=unicode (#112606). *superkaramba-3.5.0_rc1 (12 Nov 2005) diff --git a/kde-base/superkaramba/Manifest b/kde-base/superkaramba/Manifest index 944a727409bb..eb3865531db5 100644 --- a/kde-base/superkaramba/Manifest +++ b/kde-base/superkaramba/Manifest @@ -1,8 +1,9 @@ -MD5 b5776a455a11127eba8a0461dca3807d ChangeLog 1087 -MD5 444e9ea16b9f6261077667552887b9bb files/digest-superkaramba-3.5.0_beta2 216 -MD5 ee73652c24b35ea4a7e56120462fc3b9 files/digest-superkaramba-3.5.0_rc1 300 -MD5 ba38338e687742fb5a9e7458de260898 files/digest-superkaramba-3.5_beta1 69 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 MD5 47bcbdb008808143da434e2eede054a7 superkaramba-3.5.0_beta2.ebuild 459 -MD5 1e077540c191b7fb9d8ecc26c779d191 superkaramba-3.5.0_rc1.ebuild 458 MD5 7c0d06874d198f629fff7f90c4fdbbc3 superkaramba-3.5_beta1.ebuild 457 +MD5 7602426a1a874fc7a40c53494672ec7e ChangeLog 1254 +MD5 2f7a21e8cb0b51bffccd3d0b44e463cf superkaramba-3.5.0_rc1.ebuild 527 +MD5 ee73652c24b35ea4a7e56120462fc3b9 files/digest-superkaramba-3.5.0_rc1 300 +MD5 4d4886bdfe9b726be039bfa25d3ced38 files/kdeutils-3.5_rc1-unicode.patch 1236 +MD5 ba38338e687742fb5a9e7458de260898 files/digest-superkaramba-3.5_beta1 69 +MD5 444e9ea16b9f6261077667552887b9bb files/digest-superkaramba-3.5.0_beta2 216 diff --git a/kde-base/superkaramba/files/kdeutils-3.5_rc1-unicode.patch b/kde-base/superkaramba/files/kdeutils-3.5_rc1-unicode.patch new file mode 100644 index 000000000000..c8598310eeeb --- /dev/null +++ b/kde-base/superkaramba/files/kdeutils-3.5_rc1-unicode.patch @@ -0,0 +1,53 @@ +diff -Nur kdeutils-3.5.0.orig/superkaramba/src/meter_python.cpp kdeutils-3.5.0/superkaramba/src/meter_python.cpp +--- kdeutils-3.5.0.orig/superkaramba/src/meter_python.cpp 2005-11-08 23:29:27.000000000 +0100 ++++ kdeutils-3.5.0/superkaramba/src/meter_python.cpp 2005-11-16 10:20:33.000000000 +0100 +@@ -119,22 +119,41 @@ + PyObject *pyString; + + const unsigned short* tmp = string.ucs2(); +- Py_UNICODE *buf = new Py_UNICODE[string.length()]; +- for(unsigned int i = 0; i < string.length(); i++) ++ bool dofree = false; ++ ++ if(tmp) + { +- buf[i] = tmp[i]; ++ #if Py_UNICODE_SIZE == 4 ++ ++ Py_UNICODE* buf = new Py_UNICODE[string.length()]; ++ ++ for(unsigned int i = 0; i < string.length(); i++) ++ { ++ buf[i] = tmp[i]; ++ } ++ dofree = true; ++ ++ #else ++ ++ Py_UNICODE* buf = (Py_UNICODE*) tmp; ++ ++ #endif ++ ++ pyString = PyUnicode_FromUnicode(buf, string.length()); ++ ++ if(dofree) ++ { ++ delete [] buf; ++ } + } +- +- if(tmp) +- pyString = PyUnicode_FromWideChar(buf, string.length()); ++ + else + pyString = PyString_FromString(""); +- +- delete [] buf; + + return pyString; + } + ++ + long getMeter(long widget, char* name) + { + karamba* theme = (karamba*)widget; diff --git a/kde-base/superkaramba/superkaramba-3.5.0_rc1.ebuild b/kde-base/superkaramba/superkaramba-3.5.0_rc1.ebuild index 20d36f0e6ca1..5430688c8c84 100644 --- a/kde-base/superkaramba/superkaramba-3.5.0_rc1.ebuild +++ b/kde-base/superkaramba/superkaramba-3.5.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:36 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-3.5.0_rc1.ebuild,v 1.2 2005/11/16 09:29:31 greg_g Exp $ KMNAME=kdeutils MAXKDEVER=$PV @@ -13,3 +13,5 @@ IUSE="" RDEPEND="!x11-misc/superkaramba" +# Remove for rc2. +PATCHES="${FILESDIR}/kdeutils-3.5_rc1-unicode.patch" |