diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2004-09-03 14:03:32 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2004-09-03 14:03:32 +0000 |
| commit | d35cdb07e0735b463bb5963b4ca5615630ad8a13 (patch) | |
| tree | e388c1f9e7385268bcbeec3577cbd669c93d1498 /kde-base | |
| parent | ppc stable profile update (Manifest recommit) (diff) | |
| download | gentoo-2-d35cdb07e0735b463bb5963b4ca5615630ad8a13.tar.gz gentoo-2-d35cdb07e0735b463bb5963b4ca5615630ad8a13.tar.bz2 gentoo-2-d35cdb07e0735b463bb5963b4ca5615630ad8a13.zip | |
Patch to fix bug #62120
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdesdk/files/3.3.0-kbabel.diff | 55 | ||||
| -rw-r--r-- | kde-base/kdesdk/kdesdk-3.3.0.ebuild | 10 |
2 files changed, 63 insertions, 2 deletions
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 +} |