[kdelibs] Rebase the patch.
Kevin Kofler
kkofler at fedoraproject.org
Mon Jul 25 21:22:28 UTC 2011
commit 18c5cc41879c1bb8c13f1f0c7a61626e6d637f84
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Mon Jul 25 23:22:02 2011 +0200
Rebase the patch.
....patch => kdelibs-4.6.95-khtml-kde#277457.patch | 13 ++++++++-----
kdelibs.spec | 2 +-
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/kdelibs-4.6.5-khtml-kde#277457.patch b/kdelibs-4.6.95-khtml-kde#277457.patch
similarity index 73%
rename from kdelibs-4.6.5-khtml-kde#277457.patch
rename to kdelibs-4.6.95-khtml-kde#277457.patch
index 0c88dff..2ce978a 100644
--- a/kdelibs-4.6.5-khtml-kde#277457.patch
+++ b/kdelibs-4.6.95-khtml-kde#277457.patch
@@ -1,5 +1,6 @@
---- kdelibs/khtml/rendering/render_form.cpp
-+++ kdelibs/khtml/rendering/render_form.cpp
+diff -ur kdelibs-4.6.95/khtml/rendering/render_form.cpp kdelibs-4.6.95-khtml-kde#277457/khtml/rendering/render_form.cpp
+--- kdelibs-4.6.95/khtml/rendering/render_form.cpp 2011-05-20 22:24:54.000000000 +0200
++++ kdelibs-4.6.95-khtml-kde#277457/khtml/rendering/render_form.cpp 2011-07-25 22:15:51.000000000 +0200
@@ -1012,11 +1012,11 @@
// -----------------------------------------------------------------------------
@@ -14,7 +15,7 @@
if(element->inputType() == HTMLInputElementImpl::PASSWORD)
edit->setEchoMode( QLineEdit::Password );
-@@ -1142,17 +1142,21 @@
+@@ -1142,9 +1142,11 @@
}
if (element()->value().string() != widget()->text()) {
@@ -26,6 +27,7 @@
}
widget()->setReadOnly(element()->readOnly());
+@@ -1153,8 +1155,10 @@
RenderFormElement::updateFromElement();
}
@@ -37,8 +39,9 @@
// 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
+diff -ur kdelibs-4.6.95/khtml/rendering/render_form.h kdelibs-4.6.95-khtml-kde#277457/khtml/rendering/render_form.h
+--- kdelibs-4.6.95/khtml/rendering/render_form.h 2011-05-20 22:24:54.000000000 +0200
++++ kdelibs-4.6.95-khtml-kde#277457/khtml/rendering/render_form.h 2011-07-25 22:13:41.000000000 +0200
@@ -282,12 +282,13 @@
void setSelectionRange(long start, long end);
public Q_SLOTS:
diff --git a/kdelibs.spec b/kdelibs.spec
index 4729a7e..44ca910 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -105,7 +105,7 @@ Patch51: kdelibs-4.6.2-uri_mimetypes.patch
# Fix for KHTML form completion regression (kde#277457) from bugs.kde.org
# attachment (patch by Andrea Iacovitti)
# https://bugs.kde.org/show_bug.cgi?id=277457#c2
-Patch52: kdelibs-4.6.5-khtml-kde#277457.patch
+Patch52: kdelibs-4.6.95-khtml-kde#277457.patch
## upstream
More information about the scm-commits
mailing list