summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Tennis <caleb@gentoo.org>2004-09-03 14:03:32 +0000
committerCaleb Tennis <caleb@gentoo.org>2004-09-03 14:03:32 +0000
commit5527c231fb3611f0a2dfcaccfd549609f69be918 (patch)
tree16e7f57b4793210dd26c6172dcbe300d3757ec76 /kde-base/kdesdk
parentppc stable profile update (diff)
downloadhistorical-5527c231fb3611f0a2dfcaccfd549609f69be918.tar.gz
historical-5527c231fb3611f0a2dfcaccfd549609f69be918.tar.bz2
historical-5527c231fb3611f0a2dfcaccfd549609f69be918.zip
Patch to fix bug #62120
Diffstat (limited to 'kde-base/kdesdk')
-rw-r--r--kde-base/kdesdk/Manifest3
-rw-r--r--kde-base/kdesdk/files/3.3.0-kbabel.diff55
-rw-r--r--kde-base/kdesdk/kdesdk-3.3.0.ebuild10
3 files changed, 65 insertions, 3 deletions
diff --git a/kde-base/kdesdk/Manifest b/kde-base/kdesdk/Manifest
index 0d8aa65db006..0d2549da62ef 100644
--- a/kde-base/kdesdk/Manifest
+++ b/kde-base/kdesdk/Manifest
@@ -2,7 +2,7 @@ MD5 d05156b83ce91f997074889649bf2b5c kdesdk-3.1.5.ebuild 311
MD5 8c434bc928f59f32464fef4a84dc8924 kdesdk-3.2.3.ebuild 459
MD5 06318d9022a383324dee5c0051e5590c kdesdk-3.2.0.ebuild 454
MD5 d0727671a975eab8bf73250c811c3d15 kdesdk-3.2.2.ebuild 454
-MD5 854ca5886c240675fe9cadc365eade86 kdesdk-3.3.0.ebuild 448
+MD5 c5f62fcabff73fd8a02ba271a10f60bc kdesdk-3.3.0.ebuild 527
MD5 dcf3f4e982994f12c6a44ce6fb585231 kdesdk-3.3.0_rc2.ebuild 427
MD5 ca04b787cb9e2e07c53acd8ced5c7893 ChangeLog 8716
MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
@@ -13,4 +13,5 @@ MD5 987fda649492ff31b91ea57bf0992c3a files/digest-kdesdk-3.2.1 66
MD5 37c02f7f880e015c0c12dfd29e22dde1 files/digest-kdesdk-3.2.2 66
MD5 5d548fa64f7fd6d2883d96488a8615c2 files/digest-kdesdk-3.2.3 66
MD5 6050534265e5c3716d79ae87f4fe04d7 files/digest-kdesdk-3.3.0 66
+MD5 006a1f456d150861b08ccc85d659b692 files/3.3.0-kbabel.diff 2194
MD5 336212e1ccf8972f633e6075ad1a3988 files/digest-kdesdk-3.3.0_rc2 70
diff --git a/kde-base/kdesdk/files/3.3.0-kbabel.diff b/kde-base/kdesdk/files/3.3.0-kbabel.diff
new file mode 100644
index 000000000000..5b1c8cdeba24
--- /dev/null
+++ b/kde-base/kdesdk/files/3.3.0-kbabel.diff
@@ -0,0 +1,55 @@
+diff -ur kdesdk-3.3.0/kbabel/kbabel/kbhighlighting.cpp kdesdk-3.3.0_patched/kbabel/kbabel/kbhighlighting.cpp
+--- kdesdk-3.3.0/kbabel/kbabel/kbhighlighting.cpp 2004-08-05 21:27:09.000000000 +0200
++++ kdesdk-3.3.0_patched/kbabel/kbabel/kbhighlighting.cpp 2004-08-29 18:06:57.000000000 +0200
+@@ -67,6 +67,7 @@
+
+ void KBabelHighlighter::highlight( )
+ {
++ kdDebug(KBABEL) << this << ": Highlight started" << endl;
+ // no updates while we're highlighting
+ _edit->blockSignals( true );
+ _edit->setUpdatesEnabled( false );
+@@ -140,6 +141,8 @@
+ _edit->blockSignals( false );
+ _edit->updateContents( );
+ _edit->ensureCursorVisible();
++
++ kdDebug(KBABEL) << this << ": Highlight finished" << endl;
+ }
+
+ void KBabelHighlighter::doHighlighting( HighlightType type, int pos, int length )
+diff -ur kdesdk-3.3.0/kbabel/kbabel/mymultilineedit.cpp kdesdk-3.3.0_patched/kbabel/kbabel/mymultilineedit.cpp
+--- kdesdk-3.3.0/kbabel/kbabel/mymultilineedit.cpp 2004-05-22 22:58:49.000000000 +0200
++++ kdesdk-3.3.0_patched/kbabel/kbabel/mymultilineedit.cpp 2004-08-29 18:08:53.000000000 +0200
+@@ -561,6 +561,7 @@
+ _diffAddColor(Qt::darkGreen),
+ _diffDelColor(Qt::darkRed),
+ _currentUnicodeNumber(0),
++ highlighter(0),
+ _tagStartPara(0), _tagStartIndex(0), _tagEndPara(0), _tagEndIndex(0)
+ {
+ diffPos.setAutoDelete(true);
+@@ -594,6 +595,12 @@
+ connect( this, SIGNAL( textChanged() ), this, SLOT( emittedTextChanged() ) );
+ }
+
++MsgMultiLineEdit::~MsgMultiLineEdit ()
++{
++ if(highlighter)
++ delete highlighter;
++}
++
+ void MsgMultiLineEdit::setText(const QString& s)
+ {
+ QString str = s;
+diff -ur kdesdk-3.3.0/kbabel/kbabel/mymultilineedit.h kdesdk-3.3.0_patched/kbabel/kbabel/mymultilineedit.h
+--- kdesdk-3.3.0/kbabel/kbabel/mymultilineedit.h 2004-05-22 22:58:49.000000000 +0200
++++ kdesdk-3.3.0_patched/kbabel/kbabel/mymultilineedit.h 2004-08-29 18:09:31.000000000 +0200
+@@ -144,6 +144,7 @@
+ enum TextColor { NormalColor, ErrorColor };
+
+ MsgMultiLineEdit(int ID, KSpell* spell=0, QWidget* parent=0,const char* name=0);
++ virtual ~MsgMultiLineEdit();
+
+ /** is displaying surrounding quotes enabled? */
+ bool quotes() const { return _quotes;}
diff --git a/kde-base/kdesdk/kdesdk-3.3.0.ebuild b/kde-base/kdesdk/kdesdk-3.3.0.ebuild
index dc1907b5adc4..cf4ea6b8de0f 100644
--- a/kde-base/kdesdk/kdesdk-3.3.0.ebuild
+++ b/kde-base/kdesdk/kdesdk-3.3.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.3.0.ebuild,v 1.4 2004/09/03 13:37:52 caleb Exp $
-inherit kde-dist
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.3.0.ebuild,v 1.5 2004/09/03 14:03:32 caleb Exp $
+inherit eutils kde-dist
IUSE=""
DESCRIPTION="KDE SDK: kbabel, ..."
@@ -14,3 +14,9 @@ DEPEND="!dev-util/kcachegrind
RDEPEND="$DEPEND
dev-util/cvs"
+
+src_unpack()
+{
+ kde_src_unpack
+ epatch ${FILESDIR}/3.3.0-kbabel.diff
+}