diff --git a/kdelibs-4.5.1-knewstuff_gpg2.patch b/kdelibs-4.5.1-knewstuff_gpg2.patch deleted file mode 100644 index 4244642..0000000 --- a/kdelibs-4.5.1-knewstuff_gpg2.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -up kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp.gpg2 kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp ---- kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp.gpg2 2009-11-30 18:27:20.000000000 -0600 -+++ kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp 2010-08-27 10:49:10.619703933 -0500 -@@ -61,7 +61,7 @@ void Security::readKeys() - m_runMode = List; - m_keys.clear(); - m_process = new KProcess(); -- *m_process << "gpg" -+ *m_process << "gpg2" - << "--no-secmem-warning" - << "--no-tty" - << "--with-colon" -@@ -87,7 +87,7 @@ void Security::readSecretKeys() - } - m_runMode = ListSecret; - m_process = new KProcess(); -- *m_process << "gpg" -+ *m_process << "gpg2" - << "--no-secmem-warning" - << "--no-tty" - << "--with-colon" -@@ -258,7 +258,7 @@ void Security::slotCheckValidity() - - //verify the signature - m_process = new KProcess(); -- *m_process << "gpg" -+ *m_process << "gpg2" - << "--no-secmem-warning" - << "--status-fd=2" - << "--command-fd=0" -@@ -340,7 +340,7 @@ void Security::slotSignFile() - - //verify the signature - m_process = new KProcess(); -- *m_process << "gpg" -+ *m_process << "gpg2" - << "--no-secmem-warning" - << "--status-fd=2" - << "--command-fd=0" -diff -up kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp.gpg2 kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp ---- kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp.gpg2 2009-11-30 18:27:19.000000000 -0600 -+++ kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp 2010-08-27 10:49:50.493454042 -0500 -@@ -61,7 +61,7 @@ void Security::readKeys() - m_runMode = List; - m_keys.clear(); - m_process = new KProcess(); -- *m_process << "gpg" -+ *m_process << "gpg2" - << "--no-secmem-warning" - << "--no-tty" - << "--with-colon" -@@ -87,7 +87,7 @@ void Security::readSecretKeys() - } - m_runMode = ListSecret; - m_process = new KProcess(); -- *m_process << "gpg" -+ *m_process << "gpg2" - << "--no-secmem-warning" - << "--no-tty" - << "--with-colon" -@@ -258,7 +258,7 @@ void Security::slotCheckValidity() - - //verify the signature - m_process = new KProcess(); -- *m_process << "gpg" -+ *m_process << "gpg2" - << "--no-secmem-warning" - << "--status-fd=2" - << "--command-fd=0" -@@ -340,7 +340,7 @@ void Security::slotSignFile() - - //verify the signature - m_process = new KProcess(); -- *m_process << "gpg" -+ *m_process << "gpg2" - << "--no-secmem-warning" - << "--status-fd=2" - << "--command-fd=0" diff --git a/kdelibs-4.6.90-kate.patch b/kdelibs-4.6.90-kate.patch deleted file mode 100644 index e6b8b6d..0000000 --- a/kdelibs-4.6.90-kate.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up kdelibs-4.6.90/CMakeLists.txt.kate kdelibs-4.6.90/CMakeLists.txt ---- kdelibs-4.6.90/CMakeLists.txt.kate 2011-06-23 16:49:05.000000000 +0200 -+++ kdelibs-4.6.90/CMakeLists.txt 2011-06-28 09:37:02.000000000 +0200 -@@ -327,6 +327,7 @@ endif(NOT WINCE) - add_subdirectory( kunitconversion ) - add_subdirectory( kdewebkit ) - add_subdirectory( includes ) -+add_subdirectory( kate ) - - add_subdirectory( experimental ) - macro_optional_add_subdirectory( doc ) -diff -up kdelibs-4.6.90/kate/script/katescriptconsole.cpp.kate kdelibs-4.6.90/kate/script/katescriptconsole.cpp ---- kdelibs-4.6.90/kate/script/katescriptconsole.cpp.kate 2011-05-21 01:07:31.000000000 +0200 -+++ kdelibs-4.6.90/kate/script/katescriptconsole.cpp 2011-06-28 09:35:59.000000000 +0200 -@@ -27,8 +27,8 @@ - #include - - // KDE --#include --#include -+#include -+#include - - // Kate - #include "katescriptconsole.h" diff --git a/kdelibs-4.6.95-khtml-kde#277457.patch b/kdelibs-4.6.95-khtml-kde#277457.patch deleted file mode 100644 index 2ce978a..0000000 --- a/kdelibs-4.6.95-khtml-kde#277457.patch +++ /dev/null @@ -1,59 +0,0 @@ -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 @@ - // ----------------------------------------------------------------------------- - - 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,9 +1142,11 @@ - } - - 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()); - -@@ -1153,8 +1155,10 @@ - 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; -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: - 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; - }; - - // ------------------------------------------------------------------------- diff --git a/kdelibs-4.7.0-knewstuff2_gpg2.patch b/kdelibs-4.7.0-knewstuff2_gpg2.patch new file mode 100644 index 0000000..35a5e8e --- /dev/null +++ b/kdelibs-4.7.0-knewstuff2_gpg2.patch @@ -0,0 +1,60 @@ +diff -up kdelibs-4.7.0/knewstuff/knewstuff2/core/security.cpp.knewstuff2_gpg2 kdelibs-4.7.0/knewstuff/knewstuff2/core/security.cpp +--- kdelibs-4.7.0/knewstuff/knewstuff2/core/security.cpp.knewstuff2_gpg2 2011-05-20 15:24:54.000000000 -0500 ++++ kdelibs-4.7.0/knewstuff/knewstuff2/core/security.cpp 2011-09-06 11:29:18.939251150 -0500 +@@ -36,9 +36,20 @@ + #include + #include + #include ++#include + + using namespace KNS; + ++static QString gpgExecutable() ++{ ++ QString gpgExe = KStandardDirs::findExe( "gpg" ); ++ if ( gpgExe.isEmpty() ) ++ gpgExe = KStandardDirs::findExe( "gpg2" ); ++ if ( gpgExe.isEmpty() ) ++ return QLatin1String( "gpg" ); ++ return gpgExe; ++} ++ + Security::Security() + { + m_keysRead = false; +@@ -61,7 +72,7 @@ void Security::readKeys() + m_runMode = List; + m_keys.clear(); + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << gpgExecutable() + << "--no-secmem-warning" + << "--no-tty" + << "--with-colon" +@@ -87,7 +98,7 @@ void Security::readSecretKeys() + } + m_runMode = ListSecret; + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << gpgExecutable() + << "--no-secmem-warning" + << "--no-tty" + << "--with-colon" +@@ -260,7 +271,7 @@ void Security::slotCheckValidity() + + //verify the signature + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << gpgExecutable() + << "--no-secmem-warning" + << "--status-fd=2" + << "--command-fd=0" +@@ -342,7 +353,7 @@ void Security::slotSignFile() + + //verify the signature + m_process = new KProcess(); +- *m_process << "gpg" ++ *m_process << gpgExecutable() + << "--no-secmem-warning" + << "--status-fd=2" + << "--command-fd=0" diff --git a/kdelibs.spec b/kdelibs.spec index 863a942..a5b2ba2 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -113,20 +113,14 @@ Patch42: 0003-Implement-automatic-scanning-of-source-code-for-requ.patch Patch43: 0004-Bugfix-Plasma-PackageMetadata-read-Match-the-behavio.patch ## upstreamable -# add gpg2 support to knewstuff, rough first try s/gpg/gpg2/ -# reverting to our past gnupg2-only setup. -# TODO: try to use either gpg or gpg2, whichever is available -Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch +# knewstuff2 variant of: +# https://git.reviewboard.kde.org/r/102439/ +Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch # https://bugs.kde.org/show_bug.cgi?id=269045 # https://git.reviewboard.kde.org/r/101231/ 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.95-khtml-kde#277457.patch - ## upstream ## security fix @@ -314,9 +308,8 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %endif # upstreamable patches -%patch50 -p1 -b .knewstuff_gpg2 +%patch50 -p1 -b .knewstuff2_gpg2 %patch51 -p1 -b .uri_mimetypes -%patch52 -p1 -b .khtml-kde#277457 # upstream patches