commit: 11cf916d0190e629a28df0872174a336de462274
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 21:49:13 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu May 26 07:28:00 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11cf916d
kde-apps: Cleanup KDE Applications 4.14.3
Package-Manager: portage-2.3.0_rc1
kde-apps/ark/files/ark-4.14.3-crash.patch | 81 ---------
.../files/kdebase-data-4.14.3-lithuania-euro.patch | 40 -----
.../files/kdebase-kioslaves-CVE-2014-8600.patch | 29 ----
kde-apps/kmix/kmix-4.14.3.ebuild | 30 ----
kde-apps/krdc/files/krdc-4.13.1-freerdp.patch | 184 ---------------------
....14.0-CVE-2014-4607-unbundle-libvncserver.patch | 133 ---------------
.../kstars/files/kstars-4.14.3-indilib100.patch | 26 ---
.../files/libkdcraw-4.14.3-libraw-0.16.1.patch | 18 --
8 files changed, 541 deletions(-)
diff --git a/kde-apps/ark/files/ark-4.14.3-crash.patch
b/kde-apps/ark/files/ark-4.14.3-crash.patch
deleted file mode 100644
index 5eccf82..0000000
--- a/kde-apps/ark/files/ark-4.14.3-crash.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From cd8ad2761d41d1ec0a18cff7f4d166b53c899fc2 Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <rak...@freebsd.org>
-Date: Mon, 24 Nov 2014 01:37:06 +0200
-Subject: [PATCH] Stop crashing on exit when being used solely as a KPart.
-
-This change fixes a crash introduced by commit 3b981ca ("Remove Part
-from KXMLGUIFactory on exit").
-
-Part::~Part() is the wrong place to call KXMLGUIFactory::removeClient(),
-as it assumes addClient() had been called in the first place.
-
-This is only true if Ark is called as a standalone program, since that
-is done in MainWindow::loadPart()'s call to KXMLGuiWindow::createGUI().
-
-Conversely, if the Ark KPart is being used as an embedded viewer in,
-say, Konqueror or to preview an archive inside an archive (ie. Ark
-inside Ark) that does not hold true and we try to access a
-KXMLGUIFactory that does not exist.
-
-Instead, call KXMLGuiWindow::removeClient() in MainWindow's destructor,
-since in this case we are certain that addClient() was been called
-before.
-
-CCBUG: 341187
-
-(cherry picked from commit 9c30f30b38c36a31e6fcb3aa047a0247ac5a22fb)
-This was committed for completeness, as there will be no additional
-releases from the KDE/4.14 branch.
-
-Conflicts:
- part/part.cpp
----
- app/mainwindow.cpp | 3 +++
- part/part.cpp | 3 ---
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
-index aee8231..181fe76 100644
---- a/app/mainwindow.cpp
-+++ b/app/mainwindow.cpp
-@@ -38,6 +38,7 @@
- #include <KDebug>
- #include <KEditToolBar>
- #include <KShortcutsDialog>
-+#include <KXMLGUIFactory>
-
- #include <QDragEnterEvent>
- #include <QDragMoveEvent>
-@@ -69,6 +70,8 @@ MainWindow::~MainWindow()
- if (m_recentFilesAction) {
- m_recentFilesAction->saveEntries(KGlobal::config()->group("Recent
Files"));
- }
-+
-+ guiFactory()->removeClient(m_part);
- delete m_part;
- m_part = 0;
- }
-diff --git a/part/part.cpp b/part/part.cpp
-index bae4882..09fe1cb 100644
---- a/part/part.cpp
-+++ b/part/part.cpp
-@@ -53,7 +53,6 @@
- #include <KStandardGuiItem>
- #include <KTempDir>
- #include <KToggleAction>
--#include <KXMLGUIFactory>
-
- #include <QAction>
- #include <QCursor>
-@@ -138,8 +137,6 @@ Part::Part(QWidget *parentWidget, QObject *parent, const
QVariantList& args)
-
- Part::~Part()
- {
-- factory()->removeClient(this);
--
- saveSplitterSizes();
-
- m_extractFilesAction->menu()->deleteLater();
---
-2.0.5
-
diff --git
a/kde-apps/kdebase-data/files/kdebase-data-4.14.3-lithuania-euro.patch
b/kde-apps/kdebase-data/files/kdebase-data-4.14.3-lithuania-euro.patch
deleted file mode 100644
index 503ed91..0000000
--- a/kde-apps/kdebase-data/files/kdebase-data-4.14.3-lithuania-euro.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 9236eedec44b58434fdcc7d398e32909a80207ff
-Author: Albert Astals Cid <aa...@kde.org>
-Date: Thu Jan 1 15:41:24 2015 +0100
-
- Welcome Lithuania to the euro users
-
-diff --git a/localization/currency/eur.desktop
b/localization/currency/eur.desktop
-index 2ffb763..09ed064 100644
---- a/localization/currency/eur.desktop
-+++ b/localization/currency/eur.desktop
-@@ -91,4 +91,4 @@ CurrencyIntroducedDate=1999,01,01
- #CurrencySubunitsInCirculation=true
- #CurrencySubunitsPerUnit=100
- #CurrencyDecimalPlacesDisplay=2
--CurrencyCountriesInUse=AT,BE,CY,FI,FR,DE,EE,GR,IE,IT,LU,LV,MT,NL,PT,SK,SI,ES,MC,SM,VA,AD,ME,ZW
-+CurrencyCountriesInUse=AT,BE,CY,FI,FR,DE,EE,GR,IE,IT,LT,LU,LV,MT,NL,PT,SK,SI,ES,MC,SM,VA,AD,ME,ZW
-
-commit d8e2b2cecaf5fed5e965534eacff35324bebd4fa
-Author: Albert Astals Cid <aa...@kde.org>
-Date: Thu Jan 1 15:59:17 2015 +0100
-
- Lats cirulation ended on 14 Jan 2014
-
-diff --git a/localization/currency/lvl.desktop
b/localization/currency/lvl.desktop
-index 076bb8e..158c68c 100644
---- a/localization/currency/lvl.desktop
-+++ b/localization/currency/lvl.desktop
-@@ -83,9 +83,9 @@ CurrencySubunitSingular=santims
- CurrencySubunitPlural=santimi
- CurrencyIntroducedDate=1993,01,01
- #CurrencySuspendedDate=
--#CurrencyWithdrawnDate=
-+CurrencyWithdrawnDate=2014,01,14
- #CurrencySubunits=1
- #CurrencySubunitsInCirculation=true
- #CurrencySubunitsPerUnit=100
- #CurrencyDecimalPlacesDisplay=2
--CurrencyCountriesInUse=LV
-+CurrencyCountriesInUse=
-
diff --git
a/kde-apps/kdebase-kioslaves/files/kdebase-kioslaves-CVE-2014-8600.patch
b/kde-apps/kdebase-kioslaves/files/kdebase-kioslaves-CVE-2014-8600.patch
deleted file mode 100644
index dcb20f8..0000000
--- a/kde-apps/kdebase-kioslaves/files/kdebase-kioslaves-CVE-2014-8600.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Martin Sandsmark <martin.sandsm...@kde.org>
-Date: Thu, 13 Nov 2014 12:29:01 +0000
-Subject: Sanitize path
-X-Git-Url:
http://quickgit.kde.org/?p=kde-runtime.git&a=commitdiff&h=d68703900edc8416fbcd2550cd336cbbb76decb9
----
-Sanitize path
----
-
-
---- a/kioslave/bookmarks/kio_bookmarks.cpp
-+++ b/kioslave/bookmarks/kio_bookmarks.cpp
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
-
- #include <qregexp.h>
-+#include <qtextdocument.h>
-
- #include <kapplication.h>
- #include <kcmdlineargs.h>
-@@ -197,7 +198,7 @@
- echoImage(regexp.cap(1), regexp.cap(2), url.queryItem("size"));
- } else {
- echoHead();
-- echo("<p class=\"message\">" + i18n("Wrong request: %1",path) + "</p>");
-+ echo("<p class=\"message\">" + i18n("Bad request: %1",
Qt::escape(Qt::escape(url.prettyUrl()))) + "</p>");
- }
- finished();
- }
-
diff --git a/kde-apps/kmix/kmix-4.14.3.ebuild b/kde-apps/kmix/kmix-4.14.3.ebuild
deleted file mode 100644
index 92f73d6..0000000
--- a/kde-apps/kmix/kmix-4.14.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE mixer gui"
-HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/";
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="alsa debug canberra pulseaudio"
-
-DEPEND="
- alsa? ( >=media-libs/alsa-lib-1.0.14a )
- canberra? ( media-libs/libcanberra )
- pulseaudio? ( >=media-sound/pulseaudio-0.9.12 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with alsa)
- $(cmake-utils_use_with canberra)
- $(cmake-utils_use_with pulseaudio PulseAudio)
- )
-
- kde4-base_src_configure
-}
diff --git a/kde-apps/krdc/files/krdc-4.13.1-freerdp.patch
b/kde-apps/krdc/files/krdc-4.13.1-freerdp.patch
deleted file mode 100644
index 75b5146..0000000
--- a/kde-apps/krdc/files/krdc-4.13.1-freerdp.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-Support >=free-rdp-1.1.0.
-
-https://git.reviewboard.kde.org/r/115059/
-
-diff --git a/rdp/rdpview.cpp b/rdp/rdpview.cpp
-index
0d14e04691549e084b58501cd10ca2382ef25c63..9062ba5fa060284a679f0c9bc211ab7dd6972c0a
100644
---- a/rdp/rdpview.cpp
-+++ b/rdp/rdpview.cpp
-@@ -158,71 +158,58 @@ bool RdpView::start()
- width = this->parentWidget()->size().width();
- height = this->parentWidget()->size().height();
- }
-- arguments << "-g" << QString::number(width) + 'x' +
QString::number(height);
-+ arguments << "-decorations"; // put this option first so we can detect
xfreerdp < 1.1
-+ arguments << "/w:" + QString::number(width);
-+ arguments << "/h:" + QString::number(height);
-
-- arguments << "-k" <<
keymapToXfreerdp(m_hostPreferences->keyboardLayout());
-+ arguments << "/kbd:" +
keymapToXfreerdp(m_hostPreferences->keyboardLayout());
-
- if (!m_url.userName().isEmpty()) {
- // if username contains a domain, it needs to be set with another
parameter
- if (m_url.userName().contains('\\')) {
- const QStringList splittedName = m_url.userName().split('\\');
-- arguments << "-d" << splittedName.at(0);
-- arguments << "-u" << splittedName.at(1);
-+ arguments << "/d:" + splittedName.at(0);
-+ arguments << "/u:" + splittedName.at(1);
- } else {
-- arguments << "-u" << m_url.userName();
-+ arguments << "/u:" + m_url.userName();
- }
- } else {
-- arguments << "-u" << "";
-+ arguments << "-u:";
- }
-
-- if (!m_url.password().isNull())
-- arguments << "-p" << m_url.password();
--
-- arguments << "-D"; // request the window has no decorations
-- arguments << "-X" << QString::number(m_container->winId());
-- arguments << "-a" << QString::number((m_hostPreferences->colorDepth() +
1) * 8);
--
-- switch (m_hostPreferences->sound()) {
-- case 1:
-- arguments << "-o";
-- break;
-- case 0:
-- arguments << "--plugin" << "rdpsnd";
-- break;
-- case 2:
-- default:
-- break;
-- }
-+ arguments << "/parent-window:" + QString::number(m_container->winId());
-+ arguments << "/bpp:" + QString::number((m_hostPreferences->colorDepth() +
1) * 8);
-+ arguments << "/audio-mode:" + m_hostPreferences->sound();
-
- if (!m_hostPreferences->shareMedia().isEmpty()) {
- QStringList shareMedia;
-- shareMedia << "--plugin" << "rdpdr" << "--data" << "disk:media:" +
m_hostPreferences->shareMedia() << "--";
-+ shareMedia << "/drive:media," + m_hostPreferences->shareMedia();
- arguments += shareMedia;
- }
-
- QString performance;
- switch (m_hostPreferences->performance()) {
- case 0:
-- performance = 'm';
-+ performance = "modem";
- break;
- case 1:
-- performance = 'b';
-+ performance = "broadband";
- break;
- case 2:
-- performance = 'l';
-+ performance = "lan";
- break;
- default:
- break;
- }
-
-- arguments << "-x" << performance;
-+ arguments << "/network:" + performance;
-
- if (m_hostPreferences->console()) {
-- arguments << "-0";
-+ arguments << "/admin";
- }
-
- if (m_hostPreferences->remoteFX()) {
-- arguments << "--rfx";
-+ arguments << "/rfx";
- }
-
- if (!m_hostPreferences->extraOptions().isEmpty()) {
-@@ -233,16 +220,21 @@ bool RdpView::start()
- // krdc has no support for certificate management yet; it would not be
possbile to connect to any host:
- // "The host key for example.com has changed" ...
- // "Add correct host key in ~/.freerdp/known_hosts to get rid of this
message."
-- arguments << "--ignore-certificate";
-+ arguments << "/cert-ignore";
-
- // clipboard sharing is activated in KRDC; user can disable it at runtime
-- arguments << "--plugin" << "cliprdr";
-+ arguments << "/clipboard";
-
-- arguments << "-t" << QString::number(m_port);
-- arguments << m_host;
-+ arguments << "/port:" + QString::number(m_port);
-+ arguments << "/v:" + m_host;
-
- kDebug(5012) << "Starting xfreerdp with arguments:" << arguments;
-
-+ //avoid printing the password in debug
-+ if (!m_url.password().isNull()) {
-+ arguments << "/p:" + m_url.password();
-+ }
-+
- setStatus(Connecting);
-
- connect(m_process, SIGNAL(error(QProcess::ProcessError)),
SLOT(processError(QProcess::ProcessError)));
-@@ -302,7 +294,7 @@ void RdpView::connectionError()
-
- void RdpView::processError(QProcess::ProcessError error)
- {
-- kDebug(5012) << "processError:" << error;
-+ kDebug(5012) << error;
- if (m_quitFlag) // do not try to show error messages while quitting
(prevent crashes)
- return;
-
-@@ -319,33 +311,13 @@ void RdpView::processError(QProcess::ProcessError error)
- void RdpView::receivedStandardError()
- {
- const QString output(m_process->readAllStandardError());
-- kDebug(5012) << "receivedStandardError:" << output;
-- QString line;
-- int i = 0;
-- while (!(line = output.section('\n', i, i)).isEmpty()) {
--
-- // the following error is issued by freerdp because of a bug in
freerdp 1.0.1 and below;
-- // see: https://github.com/FreeRDP/FreeRDP/pull/576
-- //"X Error of failed request: BadWindow (invalid Window parameter)
-- // Major opcode of failed request: 7 (X_ReparentWindow)
-- // Resource id in failed request: 0x71303348
-- // Serial number of failed request: 36
-- // Current serial number in output stream: 36"
-- if (line.contains(QLatin1String("X_ReparentWindow"))) {
-- KMessageBox::error(0, i18n("The version of \"xfreerdp\" you are
using is too old.\n"
-- "xfreerdp 1.0.2 or greater is
required."),
-- i18n("RDP Failure"));
-- connectionError();
-- return;
-- }
-- i++;
-- }
-+ kDebug(5012) << output;
- }
-
- void RdpView::receivedStandardOutput()
- {
- const QString output(m_process->readAllStandardOutput());
-- kDebug(5012) << "receivedStandardOutput:" << output;
-+ kDebug(5012) << output;
- QString line;
- int i = 0;
- while (!(line = output.section('\n', i, i)).isEmpty()) {
-@@ -373,6 +345,14 @@ void RdpView::receivedStandardOutput()
- return;
- }
-
-+ // we no longer support freerdp < 1.1, we only support versions with
the new interface
-+ if (line.contains(QLatin1String("invalid option: -decorations"))) {
-+ KMessageBox::error(0, i18n("The version of \"xfreerdp\" you are
using is too old.\n"
-+ "xfreerdp 1.1 or greater is
required."),
-+ i18n("RDP Failure"));
-+ connectionError();
-+ return;
-+ }
- i++;
- }
- }
diff --git
a/kde-apps/krfb/files/krfb-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch
b/kde-apps/krfb/files/krfb-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch
deleted file mode 100644
index 202519b..0000000
--- a/kde-apps/krfb/files/krfb-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 766fc7694a58b7e01c003356db94276f07b791b5 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <j...@gentoo.org>
-Date: Thu, 31 Jul 2014 19:41:01 +0200
-Subject: [PATCH] CVE-2014-4607: Unbundle libvncserver
-
-http://seclists.org/oss-sec/2014/q2/676
-
-REVIEW: 119548
----
- CMakeLists.txt | 7 +++---
- cmake/modules/FindLibVNCServer.cmake | 41 ++++++++++++++++++++++++++++++++++++
- krfb/CMakeLists.txt | 2 ++
- krfb/rfb.h | 2 +-
- 4 files changed, 47 insertions(+), 5 deletions(-)
- create mode 100644 cmake/modules/FindLibVNCServer.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4aa24dd..0b29da0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,6 +32,8 @@ set(CMAKE_MODULE_PATH
- ${CMAKE_MODULE_PATH}
- )
-
-+find_package(LibVNCServer REQUIRED)
-+
- macro_optional_find_package(TelepathyQt4)
- macro_log_feature(TelepathyQt4_FOUND "telepathy-qt" "Telepathy Qt Bindings"
"http://telepathy.freedesktop.org"; FALSE "0.9" "Needed to build Telepathy Tubes
support.")
-
-@@ -44,8 +46,6 @@ macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM)
- include_directories ("${CMAKE_CURRENT_BINARY_DIR}/krfb"
- "${CMAKE_CURRENT_SOURCE_DIR}/krfb"
- "${CMAKE_CURRENT_SOURCE_DIR}/krfb/ui"
-- "${CMAKE_CURRENT_SOURCE_DIR}/libvncserver/"
-- "${CMAKE_CURRENT_BINARY_DIR}/libvncserver/"
- )
-
- if(Q_WS_X11)
-@@ -54,9 +54,8 @@ if(Q_WS_X11)
- endif(NOT X11_XTest_FOUND)
- endif(Q_WS_X11)
-
--add_subdirectory(libvncserver)
- add_subdirectory(krfb)
--add_subdirectory (framebuffers)
-+add_subdirectory(framebuffers)
- add_subdirectory(doc)
-
- if (NOT INSIDE_KDENETWORK)
-diff --git a/cmake/modules/FindLibVNCServer.cmake
b/cmake/modules/FindLibVNCServer.cmake
-new file mode 100644
-index 0000000..5927ab2
---- /dev/null
-+++ b/cmake/modules/FindLibVNCServer.cmake
-@@ -0,0 +1,41 @@
-+# cmake macro to test LIBVNCSERVER LIB
-+
-+# Copyright (c) 2006, Alessandro Praduroux <pr...@pradu.it>
-+# Copyright (c) 2007, Urs Wolfer <uwolfer @ kde.org>
-+#
-+# Redistribution and use is allowed according to the terms of the BSD license.
-+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-+
-+INCLUDE(CheckPointerMember)
-+
-+IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
-+ # Already in cache, be silent
-+ SET(LIBVNCSERVER_FIND_QUIETLY TRUE)
-+ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
-+
-+FIND_PATH(LIBVNCSERVER_INCLUDE_DIR rfb/rfb.h)
-+
-+FIND_LIBRARY(LIBVNCSERVER_LIBRARIES NAMES vncserver libvncserver)
-+
-+# libvncserver and libvncclient are in the same package, so it does
-+# not make sense to add a new cmake script for finding libvncclient.
-+# instead just find the libvncclient also in this file.
-+FIND_PATH(LIBVNCCLIENT_INCLUDE_DIR rfb/rfbclient.h)
-+FIND_LIBRARY(LIBVNCCLIENT_LIBRARIES NAMES vncclient libvncclient)
-+
-+IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
-+ SET(CMAKE_REQUIRED_INCLUDES "${LIBVNCSERVER_INCLUDE_DIR}"
"${CMAKE_REQUIRED_INCLUDES}")
-+ CHECK_POINTER_MEMBER(rfbClient* GotXCutText rfb/rfbclient.h
LIBVNCSERVER_FOUND)
-+ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
-+
-+IF (LIBVNCSERVER_FOUND)
-+ IF (NOT LIBVNCSERVER_FIND_QUIETLY)
-+ MESSAGE(STATUS "Found LibVNCServer: ${LIBVNCSERVER_LIBRARIES}")
-+ ENDIF (NOT LIBVNCSERVER_FIND_QUIETLY)
-+ELSE (LIBVNCSERVER_FOUND)
-+ IF (LIBVNCSERVER_FIND_REQUIRED)
-+ MESSAGE(FATAL_ERROR "Could NOT find acceptable version of LibVNCServer
(version 0.9 or later required).")
-+ ENDIF (LIBVNCSERVER_FIND_REQUIRED)
-+ENDIF (LIBVNCSERVER_FOUND)
-+
-+MARK_AS_ADVANCED(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARIES)
-\ No newline at end of file
-diff --git a/krfb/CMakeLists.txt b/krfb/CMakeLists.txt
-index a65eea8..100b49b 100644
---- a/krfb/CMakeLists.txt
-+++ b/krfb/CMakeLists.txt
-@@ -20,6 +20,7 @@ target_link_libraries (krfbprivate
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${X11_X11_LIB}
-+ ${LIBVNCSERVER_LIBRARIES}
- )
-
- set_target_properties (krfbprivate PROPERTIES
-@@ -103,6 +104,7 @@ target_link_libraries (krfb
- ${QT_QTNETWORK_LIBRARY}
- ${KDE4_KDNSSD_LIBS}
- ${KDE4_KDEUI_LIBS}
-+ ${LIBVNCSERVER_LIBRARIES}
- )
-
- if(TelepathyQt4_FOUND)
-diff --git a/krfb/rfb.h b/krfb/rfb.h
-index 40308a2..fa94eda 100644
---- a/krfb/rfb.h
-+++ b/krfb/rfb.h
-@@ -6,7 +6,7 @@
- #ifndef KRFB_RFB_H
- #define KRFB_RFB_H
-
--#include "../libvncserver/rfb/rfb.h"
-+#include "rfb/rfb.h"
-
- #undef TRUE
- #undef FALSE
---
-2.0.2
-
diff --git a/kde-apps/kstars/files/kstars-4.14.3-indilib100.patch
b/kde-apps/kstars/files/kstars-4.14.3-indilib100.patch
deleted file mode 100644
index 9b26cec..0000000
--- a/kde-apps/kstars/files/kstars-4.14.3-indilib100.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 97c3d53af2998420f7646b3a482417d00c291ec8 Mon Sep 17 00:00:00 2001
-From: Jasem Mutlaq <mutla...@ikarustech.com>
-Date: Mon, 1 Dec 2014 00:50:27 +0300
-Subject: [PATCH] use std::string from libindi
-
----
- kstars/indi/indidevice.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/kstars/indi/indidevice.cpp b/kstars/indi/indidevice.cpp
-index f52decc..2a05ca6 100644
---- a/kstars/indi/indidevice.cpp
-+++ b/kstars/indi/indidevice.cpp
-@@ -268,7 +268,8 @@ void INDI_D::updateMessageLog(INDI::BaseDevice *idv, int
messageID)
- return;
-
- msgST_w->ensureCursorVisible();
-- msgST_w->insertPlainText(dv->messageQueue(messageID) + QString("\n"));
-+
msgST_w->insertPlainText(QString::fromStdString(dv->messageQueue(messageID)));
-+ msgST_w->insertPlainText("\n");
- QTextCursor c = msgST_w->textCursor();
- c.movePosition(QTextCursor::Start);
- msgST_w->setTextCursor(c);
---
-2.0.5
-
diff --git a/kde-apps/libkdcraw/files/libkdcraw-4.14.3-libraw-0.16.1.patch
b/kde-apps/libkdcraw/files/libkdcraw-4.14.3-libraw-0.16.1.patch
deleted file mode 100644
index a55ef87..0000000
--- a/kde-apps/libkdcraw/files/libkdcraw-4.14.3-libraw-0.16.1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 46898ec97a0462eb08a5b6d09999450a86b27aae
-Author: Gilles Caulier <caulier.gil...@gmail.com>
-Date: Thu May 14 22:54:16 2015 +0200
-
-libraw 0.16.1 needs C++ exceptions rules while compilation
-BUGS: 347728
-FIXED-IN: 4.11.0
---- libkdcraw/CMakeLists.txt
-+++ libkdcraw/CMakeLists.txt
-@@ -22,6 +22,8 @@
- #
- # ============================================================
-
-+add_definitions (${KDE4_ENABLE_EXCEPTIONS})
-+
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/version.h)
-
- SET(kdcraw_LIB_SRCS kdcraw.cpp
