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 | e4400456a51db7549f4694dd1e88339a237522bc (patch) | |
| tree | 4e1d474362b9c02cd819f8c168e557016cb67b78 /kde-base/superkaramba | |
| parent | Reduced the amount of output during the build slightly to work around bug #11... (diff) | |
| download | gentoo-2-e4400456a51db7549f4694dd1e88339a237522bc.tar.gz gentoo-2-e4400456a51db7549f4694dd1e88339a237522bc.tar.bz2 gentoo-2-e4400456a51db7549f4694dd1e88339a237522bc.zip | |
Fix compilation with USE=unicode (#112606).
(Portage version: 2.0.51.22-r3)
Diffstat (limited to 'kde-base/superkaramba')
| -rw-r--r-- | kde-base/superkaramba/ChangeLog | 6 | ||||
| -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 |
3 files changed, 61 insertions, 2 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/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" |