summaryrefslogtreecommitdiff
path: root/extra/kdelibs
diff options
context:
space:
mode:
authorParabola <dev@list.parabolagnulinux.org>2011-08-03 04:50:40 +0000
committerParabola <dev@list.parabolagnulinux.org>2011-08-03 04:50:40 +0000
commit991d38faccf4e1fb27f31f236ad58ee840103734 (patch)
tree38dd960b48df86472b58d3904caa122aaf06da41 /extra/kdelibs
parentbf35116f9d203dcafce808a6c7b3dd5a0db8afbc (diff)
Wed Aug 3 04:50:40 UTC 2011
Diffstat (limited to 'extra/kdelibs')
-rw-r--r--extra/kdelibs/abs-syntax-highlight.patch12
-rw-r--r--extra/kdelibs/fix-lineedit-clear-button.patch30
-rw-r--r--extra/kdelibs/fix-lineedit-completion-tab.patch56
3 files changed, 0 insertions, 98 deletions
diff --git a/extra/kdelibs/abs-syntax-highlight.patch b/extra/kdelibs/abs-syntax-highlight.patch
deleted file mode 100644
index 477479a9b..000000000
--- a/extra/kdelibs/abs-syntax-highlight.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nura kdelibs-4.3.0.orig/kate/syntax/data/bash.xml kdelibs-4.3.0/kate/syntax/data/bash.xml
---- kdelibs-4.3.0.orig/kate/syntax/data/bash.xml 2009-04-15 12:26:37.000000000 +0200
-+++ kdelibs-4.3.0/kate/syntax/data/bash.xml 2009-07-30 13:24:01.000000000 +0200
-@@ -8,7 +8,7 @@
- <!ENTITY noword "(?![\w$+-])"> <!-- no word, $, + or - following -->
- <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )"> <!-- valid character in a file name -->
- ]>
--<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-+<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;*.install" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-
- <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
- Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
diff --git a/extra/kdelibs/fix-lineedit-clear-button.patch b/extra/kdelibs/fix-lineedit-clear-button.patch
deleted file mode 100644
index 315892940..000000000
--- a/extra/kdelibs/fix-lineedit-clear-button.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 0b7201c1fe4f12dc7b17abbf19047864d1cca302
-Author: Andrea Iacovitti <aiacovitti@libero.it>
-Date: Sat Jul 9 19:51:40 2011 +0200
-
- Fix regression about input text clearButton stopping to work on khtml forms
- BUG: 246513
- FIXED-IN: 4.7.0
-
-diff --git a/kdeui/widgets/klineedit.cpp b/kdeui/widgets/klineedit.cpp
-index 7382806..8f1c8a4 100644
---- a/kdeui/widgets/klineedit.cpp
-+++ b/kdeui/widgets/klineedit.cpp
-@@ -1116,7 +1116,7 @@ void KLineEdit::mousePressEvent( QMouseEvent* e )
- if ( (e->button() == Qt::LeftButton ||
- e->button() == Qt::MidButton ) &&
- d->clearButton ) {
-- d->clickInClear = d->clearButton == childAt( e->pos() );
-+ d->clickInClear = ( d->clearButton == childAt(e->pos()) || d->clearButton->underMouse() );
-
- if ( d->clickInClear ) {
- d->possibleTripleClick = false;
-@@ -1145,7 +1145,7 @@ void KLineEdit::mousePressEvent( QMouseEvent* e )
- void KLineEdit::mouseReleaseEvent( QMouseEvent* e )
- {
- if ( d->clickInClear ) {
-- if ( d->clearButton == childAt( e->pos() ) ) {
-+ if ( d->clearButton == childAt(e->pos()) || d->clearButton->underMouse() ) {
- QString newText;
- if ( e->button() == Qt::MidButton ) {
- newText = QApplication::clipboard()->text( QClipboard::Selection );
diff --git a/extra/kdelibs/fix-lineedit-completion-tab.patch b/extra/kdelibs/fix-lineedit-completion-tab.patch
deleted file mode 100644
index 0c88dffc9..000000000
--- a/extra/kdelibs/fix-lineedit-completion-tab.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- kdelibs/khtml/rendering/render_form.cpp
-+++ kdelibs/khtml/rendering/render_form.cpp
-@@ -1012,11 +1012,11 @@
- // -----------------------------------------------------------------------------
-
- RenderLineEdit::RenderLineEdit(HTMLInputElementImpl *element)
-- : RenderFormElement(element)
-+ : RenderFormElement(element), m_blockElementUpdates(false)
- {
- LineEditWidget *edit = new LineEditWidget(element, view(), view()->widget());
- connect(edit,SIGNAL(returnPressed()), this, SLOT(slotReturnPressed()));
-- connect(edit,SIGNAL(textEdited(QString)),this,SLOT(slotTextEdited(QString)));
-+ connect(edit,SIGNAL(textChanged(QString)),this,SLOT(slotTextChanged(QString)));
-
- if(element->inputType() == HTMLInputElementImpl::PASSWORD)
- edit->setEchoMode( QLineEdit::Password );
-@@ -1142,17 +1142,21 @@
- }
-
- if (element()->value().string() != widget()->text()) {
-+ m_blockElementUpdates = true;
- int pos = widget()->cursorPosition();
- widget()->setText(element()->value().string());
- widget()->setCursorPosition(pos);
-+ m_blockElementUpdates = false;
- }
- widget()->setReadOnly(element()->readOnly());
-
- RenderFormElement::updateFromElement();
- }
-
--void RenderLineEdit::slotTextEdited(const QString &string)
-+void RenderLineEdit::slotTextChanged(const QString &string)
- {
-+ if (m_blockElementUpdates) return;
-+
- // don't use setValue here!
- element()->m_value = string;
- element()->m_unsubmittedFormChange = true;
---- kdelibs/khtml/rendering/render_form.h
-+++ kdelibs/khtml/rendering/render_form.h
-@@ -282,12 +282,13 @@
- void setSelectionRange(long start, long end);
- public Q_SLOTS:
- void slotReturnPressed();
-- void slotTextEdited(const QString &string);
-+ void slotTextChanged(const QString &string);
- protected:
-
- private:
- virtual bool isEditable() const { return true; }
- virtual bool canHaveBorder() const { return true; }
-+ bool m_blockElementUpdates;
- };
-
- // -------------------------------------------------------------------------