On Thu, 01 Nov 2018 14:04:12 -0300 Lisandro
=?ISO-8859-1?Q?Dami=E1n_Nicanor_P=E9rez?= Meyer <perezme...@gmail.com> wrote:
> On Wed, 17 Oct 2018 15:57:25 +0200 Ivo De Decker <iv...@debian.org> wrote:
> > Hi,
> >
> > On Fri, Nov 24, 2017 at 04:59:58PM -0300, Lisandro Damián Nicanor Pérez
> Meyer wrote:
> > > Control: tag -1 patch
> > >
> > > There is patch available for this at
<https://git.archlinux.org/svntogit/
> > > packages.git/tree/trunk/kdelibs-no-kdewebkit.patch?h=packages/kdelibs>
> > >
> > > We might want to wait for the last tandem of KF5 apps though.
> >
> > Is there anything still blocking this?
>
> Yes, at least one co maintainer believes the kde-runtime patch is not
> appropriate.
That patch no longer seems to be available, so I made my own. Patches for
kde4libs and kde-runtime attached. I looked at the KDE4 packages still in
Buster and I don't believe this interferes with anything. This also fixes the
FTBFS with Samba 4.9 by dropping the KDE4 kio_smb.
I think we should move forward on these (or some improved version if someone
has suggestions).
Even though there are separate bugs for kde-runtime, since the patch for it
was already discussed in this bug, I thought we might as well keep them
together.
Scott K
diff -Nru kde4libs-4.14.38/debian/changelog kde4libs-4.14.38/debian/changelog
--- kde4libs-4.14.38/debian/changelog 2018-12-01 08:29:23.000000000 -0500
+++ kde4libs-4.14.38/debian/changelog 2019-01-14 06:15:38.000000000 -0500
@@ -1,3 +1,17 @@
+kde4libs (4:4.14.38-4) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Drop support for Qt4 WebKit (Closes: #784479)
+ - Drop build-depends
+ - Add d/p/no_kdewebkit.patch to patch out building kdewebkit, kdewebkit
+ widgets, private/animablegraphicswebview, and widgets/webview
+ - Drop libkdewebkit5 binary package
+ - Build plasma3 without webkit
+ - Update install files (verified header files that are no longer shipped
+ are not used elsewhere in Debian)
+
+ -- Scott Kitterman <sc...@kitterman.com> Mon, 14 Jan 2019 02:14:35 -0500
+
kde4libs (4:4.14.38-3) unstable; urgency=medium
* Team upload
diff -Nru kde4libs-4.14.38/debian/control kde4libs-4.14.38/debian/control
--- kde4libs-4.14.38/debian/control 2018-12-01 08:29:07.000000000 -0500
+++ kde4libs-4.14.38/debian/control 2019-01-14 06:11:58.000000000 -0500
@@ -37,7 +37,6 @@
libqca2-dev (>= 2.0.0),
libqt4-dev (>= 4:4.8.0),
libqt4-opengl-dev (>= 4:4.8.0),
- libqtwebkit-dev,
libsm-dev,
libssl-dev (>= 1.1),
libudev-dev [linux-any],
@@ -374,14 +372,6 @@
.
This library is part of the KDE Development Platform libraries module.
-Package: libkdewebkit5
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: KDE WebKit Library
- This library provides KDE integration of the QtWebKit library.
- .
- This package is part of the KDE Development Platform libraries module.
-
Package: libkcmutils4
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
diff -Nru kde4libs-4.14.38/debian/kdelibs5-dev.install kde4libs-4.14.38/debian/kdelibs5-dev.install
--- kde4libs-4.14.38/debian/kdelibs5-dev.install 2018-12-01 04:19:39.000000000 -0500
+++ kde4libs-4.14.38/debian/kdelibs5-dev.install 2019-01-14 05:32:55.000000000 -0500
@@ -1175,7 +1175,6 @@
usr/include/kdeui_export.h
usr/include/kdeversion.h
usr/include/kdevicelistmodel.h
-usr/include/kdewebkit_export.h
usr/include/kdialog.h
usr/include/kdialogbuttonbox.h
usr/include/kdialogjobuidelegate.h
@@ -1246,7 +1245,6 @@
usr/include/kglobalsettings.h
usr/include/kglobalshortcutinfo.h
usr/include/kglobalshortcutinfo_p.h
-usr/include/kgraphicswebview.h
usr/include/kguiitem.h
usr/include/khbox.h
usr/include/khelpmenu.h
@@ -1640,10 +1638,6 @@
usr/include/kviewstatemaintainer.h
usr/include/kviewstatesaver.h
usr/include/kwallet.h
-usr/include/kwebpage.h
-usr/include/kwebpluginfactory.h
-usr/include/kwebview.h
-usr/include/kwebwallet.h
usr/include/kwidgetitemdelegate.h
usr/include/kwidgetjobtracker.h
usr/include/kwindowinfo.h
@@ -1748,7 +1742,6 @@
usr/include/plasma/widgets/toolbutton.h
usr/include/plasma/widgets/treeview.h
usr/include/plasma/widgets/videowidget.h
-usr/include/plasma/widgets/webview.h
usr/include/plasma/windoweffects.h
usr/include/predicateproperties.h
usr/include/qtest_kde.h
@@ -1816,7 +1809,6 @@
usr/lib/libkdefakes.so
usr/lib/libkdesu.so
usr/lib/libkdeui.so
-usr/lib/libkdewebkit.so
usr/lib/libkdnssd.so
usr/lib/libkemoticons.so
usr/lib/libkfile.so
diff -Nru kde4libs-4.14.38/debian/kdelibs5-plugins.install kde4libs-4.14.38/debian/kdelibs5-plugins.install
--- kde4libs-4.14.38/debian/kdelibs5-plugins.install 2018-12-01 04:19:39.000000000 -0500
+++ kde4libs-4.14.38/debian/kdelibs5-plugins.install 2019-01-14 05:29:54.000000000 -0500
@@ -1,6 +1,5 @@
usr/lib/*/qt4/plugins/designer/kde3supportwidgets.so
usr/lib/*/qt4/plugins/designer/kdedeprecated.so
-usr/lib/*/qt4/plugins/designer/kdewebkitwidgets.so
usr/lib/*/qt4/plugins/designer/kdewidgets.so
usr/lib/kconf_update_bin/migrate_from_kde3_icon_theme
usr/lib/kde4/emoticonstheme_adium.so
diff -Nru kde4libs-4.14.38/debian/libkdewebkit5.install kde4libs-4.14.38/debian/libkdewebkit5.install
--- kde4libs-4.14.38/debian/libkdewebkit5.install 2018-12-01 04:19:39.000000000 -0500
+++ kde4libs-4.14.38/debian/libkdewebkit5.install 1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-usr/lib/libkdewebkit.so.5
-usr/lib/libkdewebkit.so.5.*
diff -Nru kde4libs-4.14.38/debian/libkdewebkit5.symbols kde4libs-4.14.38/debian/libkdewebkit5.symbols
--- kde4libs-4.14.38/debian/libkdewebkit5.symbols 2018-12-01 04:19:39.000000000 -0500
+++ kde4libs-4.14.38/debian/libkdewebkit5.symbols 1969-12-31 19:00:00.000000000 -0500
@@ -1,134 +0,0 @@
-# SymbolsHelper-Confirmed: 4:4.11.5 kfreebsd-i386
-libkdewebkit.so.5 libkdewebkit5 #MINVER#
-* Build-Depends-Package: kdelibs5-dev
- _ZN10KWebWallet11fillWebFormERK4KUrlRK5QListINS_7WebFormEE@Base 4:4.4.0
- _ZN10KWebWallet11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.4.0
- _ZN10KWebWallet11qt_metacastEPKc@Base 4:4.4.0
- _ZN10KWebWallet12fillFormDataEP9QWebFrameb@Base 4:4.4.0
- _ZN10KWebWallet12saveFormDataEP9QWebFramebb@Base 4:4.4.0
- _ZN10KWebWallet12walletClosedEv@Base 4:4.4.0
- _ZN10KWebWallet14removeFormDataEP9QWebFrameb@Base 4:4.4.0
- _ZN10KWebWallet14removeFormDataERK5QListINS_7WebFormEE@Base 4:4.4.0
- _ZN10KWebWallet16staticMetaObjectE@Base 4:4.4.0
- _ZN10KWebWallet17KWebWalletPrivate10openWalletEv@Base 4:4.7.4
- _ZN10KWebWallet17KWebWalletPrivate13parseFormDataEP9QWebFramebb@Base 4:4.4.0
- _ZN10KWebWallet17KWebWalletPrivate15_k_walletClosedEv@Base 4:4.4.0
- _ZN10KWebWallet17KWebWalletPrivate15saveDataToCacheERK7QString@Base 4:4.4.0
- _ZN10KWebWallet17KWebWalletPrivate17_k_openWalletDoneEb@Base 4:4.4.0
- _ZN10KWebWallet17KWebWalletPrivate17fillDataFromCacheER5QListINS_7WebFormEE@Base 4:4.4.0
- _ZN10KWebWallet17KWebWalletPrivate19removeDataFromCacheERK5QListINS_7WebFormEE@Base 4:4.4.0
- _ZN10KWebWallet17KWebWalletPrivateC1EPS_@Base 4:4.4.0
- _ZN10KWebWallet17KWebWalletPrivateC2EPS_@Base 4:4.4.0
- _ZN10KWebWallet19saveFormDataToCacheERK7QString@Base 4:4.4.0
- _ZN10KWebWallet21fillFormDataFromCacheERKN4KUrl4ListE@Base 4:4.4.0
- _ZN10KWebWallet21saveFormDataCompletedERK4QUrlb@Base 4:4.4.0
- _ZN10KWebWallet21saveFormDataRequestedERK7QStringRK4QUrl@Base 4:4.4.0
- _ZN10KWebWallet23removeFormDataFromCacheERK5QListINS_7WebFormEE@Base 4:4.4.0
- _ZN10KWebWallet24fillFormRequestCompletedEb@Base 4:4.4.95
- _ZN10KWebWallet25acceptSaveFormDataRequestERK7QString@Base 4:4.4.0
- _ZN10KWebWallet25rejectSaveFormDataRequestERK7QString@Base 4:4.4.0
- _ZN10KWebWalletC1EP7QObjectm@Base 4:4.4.0
- _ZN10KWebWalletC2EP7QObjectm@Base 4:4.4.0
- _ZN10KWebWalletD0Ev@Base 4:4.4.0
- _ZN10KWebWalletD1Ev@Base 4:4.4.0
- _ZN10KWebWalletD2Ev@Base 4:4.4.0
- _ZN16KGraphicsWebView10wheelEventEP24QGraphicsSceneWheelEvent@Base 4:4.4.0
- _ZN16KGraphicsWebView11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.4.0
- _ZN16KGraphicsWebView11qt_metacastEPKc@Base 4:4.4.0
- _ZN16KGraphicsWebView15mousePressEventEP24QGraphicsSceneMouseEvent@Base 4:4.4.0
- _ZN16KGraphicsWebView16linkShiftClickedERK4KUrl@Base 4:4.4.0
- _ZN16KGraphicsWebView16staticMetaObjectE@Base 4:4.4.0
- _ZN16KGraphicsWebView17mouseReleaseEventEP24QGraphicsSceneMouseEvent@Base 4:4.4.0
- _ZN16KGraphicsWebView23linkMiddleOrCtrlClickedERK4KUrl@Base 4:4.4.0
- _ZN16KGraphicsWebView23setAllowExternalContentEb@Base 4:4.4.0
- _ZN16KGraphicsWebView27selectionClipboardUrlPastedERK4KUrl@Base 4:4.4.0
- _ZN16KGraphicsWebView27selectionClipboardUrlPastedERK4KUrlRK7QString@Base 4:4.5.86
- _ZN16KGraphicsWebViewC1EP13QGraphicsItemb@Base 4:4.4.0
- _ZN16KGraphicsWebViewC2EP13QGraphicsItemb@Base 4:4.4.0
- _ZN16KGraphicsWebViewD0Ev@Base 4:4.4.0
- _ZN16KGraphicsWebViewD1Ev@Base 4:4.4.0
- _ZN16KGraphicsWebViewD2Ev@Base 4:4.4.0
- _ZN17KWebPluginFactory11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.4.0
- _ZN17KWebPluginFactory11qt_metacastEPKc@Base 4:4.4.0
- _ZN17KWebPluginFactory16staticMetaObjectE@Base 4:4.4.0
- _ZN17KWebPluginFactoryC1EP7QObject@Base 4:4.4.0
- _ZN17KWebPluginFactoryC2EP7QObject@Base 4:4.4.0
- _ZN17KWebPluginFactoryD0Ev@Base 4:4.4.0
- _ZN17KWebPluginFactoryD1Ev@Base 4:4.4.0
- _ZN17KWebPluginFactoryD2Ev@Base 4:4.4.0
- _ZN8KWebPage11downloadUrlERK4KUrl@Base 4:4.4.0
- _ZN8KWebPage11handleReplyEP13QNetworkReplyP7QStringPN3KIO8MetaDataE@Base 4:4.7.0
- _ZN8KWebPage11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.4.0
- _ZN8KWebPage11qt_metacastEPKc@Base 4:4.4.0
- _ZN8KWebPage15downloadRequestERK15QNetworkRequest@Base 4:4.4.0
- _ZN8KWebPage16downloadResponseEP13QNetworkReply@Base 4:4.4.95
- _ZN8KWebPage16staticMetaObjectE@Base 4:4.4.0
- _ZN8KWebPage18setRequestMetaDataERK7QStringS2_@Base 4:4.4.0
- _ZN8KWebPage18setSessionMetaDataERK7QStringS2_@Base 4:4.4.0
- _ZN8KWebPage21removeRequestMetaDataERK7QString@Base 4:4.4.0
- _ZN8KWebPage21removeSessionMetaDataERK7QString@Base 4:4.4.0
- _ZN8KWebPage23acceptNavigationRequestEP9QWebFrameRK15QNetworkRequestN8QWebPage14NavigationTypeE@Base 4:4.4.0
- _ZN8KWebPage23setAllowExternalContentEb@Base 4:4.4.0
- _ZN8KWebPage9setWalletEP10KWebWallet@Base 4:4.4.0
- _ZN8KWebPageC1EP7QObject6QFlagsINS_16IntegrationFlagsEE@Base 4:4.4.0
- _ZN8KWebPageC2EP7QObject6QFlagsINS_16IntegrationFlagsEE@Base 4:4.4.0
- _ZN8KWebPageD0Ev@Base 4:4.4.0
- _ZN8KWebPageD1Ev@Base 4:4.4.0
- _ZN8KWebPageD2Ev@Base 4:4.4.0
- _ZN8KWebView10wheelEventEP11QWheelEvent@Base 4:4.4.0
- _ZN8KWebView11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.4.0
- _ZN8KWebView11qt_metacastEPKc@Base 4:4.4.0
- _ZN8KWebView15mousePressEventEP11QMouseEvent@Base 4:4.4.0
- _ZN8KWebView16linkShiftClickedERK4KUrl@Base 4:4.4.0
- _ZN8KWebView16staticMetaObjectE@Base 4:4.4.0
- _ZN8KWebView17mouseReleaseEventEP11QMouseEvent@Base 4:4.4.0
- _ZN8KWebView23linkMiddleOrCtrlClickedERK4KUrl@Base 4:4.4.0
- _ZN8KWebView23setAllowExternalContentEb@Base 4:4.4.0
- _ZN8KWebView27selectionClipboardUrlPastedERK4KUrl@Base 4:4.4.0
- _ZN8KWebView27selectionClipboardUrlPastedERK4KUrlRK7QString@Base 4:4.5.86
- _ZN8KWebViewC1EP7QWidgetb@Base 4:4.4.0
- _ZN8KWebViewC2EP7QWidgetb@Base 4:4.4.0
- _ZN8KWebViewD0Ev@Base 4:4.4.0
- _ZN8KWebViewD1Ev@Base 4:4.4.0
- _ZN8KWebViewD2Ev@Base 4:4.4.0
- _ZNK10KWebWallet10metaObjectEv@Base 4:4.4.0
- _ZNK10KWebWallet11formsToFillERK4KUrl@Base 4:4.4.0
- _ZNK10KWebWallet11formsToSaveERK7QString@Base 4:4.4.0
- _ZNK10KWebWallet17hasCachedFormDataERKNS_7WebFormE@Base 4:4.4.0
- _ZNK10KWebWallet19formsWithCachedDataEP9QWebFrameb@Base 4:4.4.0
- _ZNK16KGraphicsWebView10metaObjectEv@Base 4:4.4.0
- _ZNK16KGraphicsWebView24isExternalContentAllowedEv@Base 4:4.4.0
- _ZNK17KWebPluginFactory10metaObjectEv@Base 4:4.4.0
- _ZNK17KWebPluginFactory16excludedMimeTypeERK7QString@Base 4:4.8.3
- _ZNK17KWebPluginFactory22createPartInstanceFromERK7QStringRK11QStringListS5_P7QWidgetP7QObject@Base 4:4.8.3
- _ZNK17KWebPluginFactory22extractGuessedMimeTypeERK4QUrlP7QString@Base 4:4.8.3
- _ZNK17KWebPluginFactory6createERK7QStringRK4QUrlRK11QStringListS8_@Base 4:4.4.0
- _ZNK17KWebPluginFactory7pluginsEv@Base 4:4.4.0
- _ZNK8KWebPage10metaObjectEv@Base 4:4.4.0
- _ZNK8KWebPage15requestMetaDataERK7QString@Base 4:4.4.0
- _ZNK8KWebPage15sessionMetaDataERK7QString@Base 4:4.4.0
- _ZNK8KWebPage15userAgentForUrlERK4QUrl@Base 4:4.4.0
- _ZNK8KWebPage24isExternalContentAllowedEv@Base 4:4.4.0
- _ZNK8KWebPage6walletEv@Base 4:4.4.0
- _ZNK8KWebView10metaObjectEv@Base 4:4.4.0
- _ZNK8KWebView24isExternalContentAllowedEv@Base 4:4.4.0
- _ZTI10KWebWallet@Base 4:4.4.0
- _ZTI16KGraphicsWebView@Base 4:4.4.0
- _ZTI17KWebPluginFactory@Base 4:4.4.0
- _ZTI8KWebPage@Base 4:4.4.0
- _ZTI8KWebView@Base 4:4.4.0
- _ZTS10KWebWallet@Base 4:4.4.0
- _ZTS16KGraphicsWebView@Base 4:4.4.0
- _ZTS17KWebPluginFactory@Base 4:4.4.0
- _ZTS8KWebPage@Base 4:4.4.0
- _ZTS8KWebView@Base 4:4.4.0
- _ZTV10KWebWallet@Base 4:4.4.0
- _ZTV16KGraphicsWebView@Base 4:4.4.0
- _ZTV17KWebPluginFactory@Base 4:4.4.0
- _ZTV8KWebPage@Base 4:4.4.0
- _ZTV8KWebView@Base 4:4.4.0
- (c++)"non-virtual thunk to KGraphicsWebView::mousePressEvent(QGraphicsSceneMouseEvent*)@Base" 4:4.4.0
- (c++)"non-virtual thunk to KGraphicsWebView::mouseReleaseEvent(QGraphicsSceneMouseEvent*)@Base" 4:4.4.0
- (c++)"non-virtual thunk to KGraphicsWebView::wheelEvent(QGraphicsSceneWheelEvent*)@Base" 4:4.4.0
- (c++)"non-virtual thunk to KGraphicsWebView::~KGraphicsWebView()@Base" 4:4.4.0
- (c++)"non-virtual thunk to KWebView::~KWebView()@Base" 4:4.4.0
diff -Nru kde4libs-4.14.38/debian/patches/no_kdewebkit.patch kde4libs-4.14.38/debian/patches/no_kdewebkit.patch
--- kde4libs-4.14.38/debian/patches/no_kdewebkit.patch 1969-12-31 19:00:00.000000000 -0500
+++ kde4libs-4.14.38/debian/patches/no_kdewebkit.patch 2019-01-14 06:09:13.000000000 -0500
@@ -0,0 +1,109 @@
+Author: Scott Kitterman <sc...@kitterman.com>
+
+Index: kde4libs-4.14.38/CMakeLists.txt
+===================================================================
+--- kde4libs-4.14.38.orig/CMakeLists.txt 2019-01-14 02:19:00.000000000 -0500
++++ kde4libs-4.14.38/CMakeLists.txt 2019-01-14 02:19:00.000000000 -0500
+@@ -356,7 +356,7 @@
+ add_subdirectory( plasma )
+ endif(NOT WINCE)
+ add_subdirectory( kunitconversion )
+-add_subdirectory( kdewebkit )
++#add_subdirectory( kdewebkit )
+ add_subdirectory( includes )
+
+ add_subdirectory( experimental )
+Index: kde4libs-4.14.38/kdewidgets/CMakeLists.txt
+===================================================================
+--- kde4libs-4.14.38.orig/kdewidgets/CMakeLists.txt 2019-01-14 02:10:22.000000000 -0500
++++ kde4libs-4.14.38/kdewidgets/CMakeLists.txt 2019-01-14 03:38:23.729921172 -0500
+@@ -88,36 +88,36 @@
+
+
+ # kdewebkit widgets
+- include_directories(
+- ${CMAKE_SOURCE_DIR}/kdewebkit
+- )
++ #include_directories(
++ # ${CMAKE_SOURCE_DIR}/kdewebkit
++ #)
+
+- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
+- COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit.widgets
+- MAIN_DEPENDENCY kdewebkit.widgets DEPENDS makekdewidgets)
++ # add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
++ # COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit.widgets
++ # MAIN_DEPENDENCY kdewebkit.widgets DEPENDS makekdewidgets)
+
+- set(kdewebkitwidgets_PART_SRCS
+- classpreviews.cpp
+- ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
+- )
++ # set(kdewebkitwidgets_PART_SRCS
++ # classpreviews.cpp
++ # ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
++ # )
+
+- qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.moc)
++ # qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.moc)
+
+
+- qt4_add_resources(kdewebkitwidgets_PART_SRCS kdewebkitwidgets.qrc)
++ # qt4_add_resources(kdewebkitwidgets_PART_SRCS kdewebkitwidgets.qrc)
+
+- kde4_add_plugin(kdewebkitwidgets ${kdewebkitwidgets_PART_SRCS})
++ # kde4_add_plugin(kdewebkitwidgets ${kdewebkitwidgets_PART_SRCS})
+
+- target_link_libraries(kdewebkitwidgets ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY})
+- if(NOT WIN32)
+- set_target_properties(kdewebkitwidgets PROPERTIES
+- INSTALL_RPATH_USE_LINK_PATH TRUE
+- SKIP_BUILD_RPATH TRUE
+- BUILD_WITH_INSTALL_RPATH TRUE
+- )
+- endif(NOT WIN32)
++ # target_link_libraries(kdewebkitwidgets ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY})
++ # if(NOT WIN32)
++ # set_target_properties(kdewebkitwidgets PROPERTIES
++ # INSTALL_RPATH_USE_LINK_PATH TRUE
++ # SKIP_BUILD_RPATH TRUE
++ # BUILD_WITH_INSTALL_RPATH TRUE
++ # )
++ # endif(NOT WIN32)
+
+- install(TARGETS kdewebkitwidgets DESTINATION /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt4/plugins/designer )
++ # install(TARGETS kdewebkitwidgets DESTINATION /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt4/plugins/designer )
+
+
+ if (QT_QT3SUPPORT_FOUND)
+Index: kde4libs-4.14.38/plasma/CMakeLists.txt
+===================================================================
+--- kde4libs-4.14.38.orig/plasma/CMakeLists.txt 2019-01-14 04:54:26.366018505 -0500
++++ kde4libs-4.14.38/plasma/CMakeLists.txt 2019-01-14 04:55:02.738019281 -0500
+@@ -121,7 +121,7 @@
+ framesvg.cpp
+ plasma.cpp
+ popupapplet.cpp
+- private/animablegraphicswebview.cpp
++ #private/animablegraphicswebview.cpp
+ private/applethandle.cpp
+ private/associatedapplicationmanager.cpp
+ private/componentinstaller.cpp
+@@ -211,7 +211,7 @@
+ widgets/textbrowser.cpp
+ widgets/treeview.cpp
+ widgets/textedit.cpp
+- widgets/webview.cpp
++ #widgets/webview.cpp
+
+ #Temporary QtJolie branch
+ private/qtjolie-branch/qtjolie/abstractadaptor.cpp
+@@ -418,7 +418,7 @@
+ widgets/textbrowser.h
+ widgets/treeview.h
+ widgets/textedit.h
+- widgets/webview.h
++ #widgets/webview.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/widgets COMPONENT Devel)
+
+ install(FILES
diff -Nru kde4libs-4.14.38/debian/patches/series kde4libs-4.14.38/debian/patches/series
--- kde4libs-4.14.38/debian/patches/series 2018-12-01 08:25:25.000000000 -0500
+++ kde4libs-4.14.38/debian/patches/series 2019-01-14 02:19:00.000000000 -0500
@@ -35,3 +35,4 @@
test_image-x-compressed-xcf.diff
add_missing_cast.diff
kdelibs-4.14.38-openssl-1.1.patch
+no_kdewebkit.patch
diff -Nru kde4libs-4.14.38/debian/rules kde4libs-4.14.38/debian/rules
--- kde4libs-4.14.38/debian/rules 2018-12-01 04:19:39.000000000 -0500
+++ kde4libs-4.14.38/debian/rules 2019-01-14 02:13:37.000000000 -0500
@@ -14,7 +14,8 @@
-DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg \
-DLIB_INSTALL_DIR=/usr/lib \
-DSYSCONF_INSTALL_DIR=/etc \
- -DLIBKDEINIT_INSTALL_DIR:PATH=/usr/lib/kde4/libkdeinit
+ -DLIBKDEINIT_INSTALL_DIR:PATH=/usr/lib/kde4/libkdeinit \
+ -DPLASMA_NO_KDEWEBKIT=TRUE
override_dh_auto_test:
# Disable auto tests at build time
diff -Nru kde-runtime-17.08.3/debian/changelog kde-runtime-17.08.3/debian/changelog
--- kde-runtime-17.08.3/debian/changelog 2018-05-30 16:01:56.000000000 -0400
+++ kde-runtime-17.08.3/debian/changelog 2019-01-14 05:57:13.000000000 -0500
@@ -1,3 +1,16 @@
+kde-runtime (4:17.08.3-3) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Remove Qt4 WebKit support (Closes: #784477)
+ - Drop from build-depends
+ - d/p/drop_thumbnail.patch to stop building thumbmails (which requires
+ WebKit) - did not identify any packages still needing thisin Buster
+ - Update install files
+ * Drop kio_smb support since kde4libs version does not work with Samba 4.9
+ (Closes: #915319)
+
+ -- Scott Kitterman <sc...@kitterman.com> Mon, 14 Jan 2019 00:44:02 -0500
+
kde-runtime (4:17.08.3-2) unstable; urgency=medium
* Team upload.
diff -Nru kde-runtime-17.08.3/debian/control kde-runtime-17.08.3/debian/control
--- kde-runtime-17.08.3/debian/control 2018-05-30 15:40:58.000000000 -0400
+++ kde-runtime-17.08.3/debian/control 2019-01-14 00:45:12.000000000 -0500
@@ -29,7 +29,6 @@
libopenexr-dev,
libphonon-dev (>= 4:4.6.0really4.4.3),
libpulse-dev (>= 0.9.16),
- libqtwebkit-dev,
libsmbclient-dev [!hurd-any],
libssh-gcrypt-dev (>= 0.4.0),
libwebp-dev,
@@ -38,6 +37,7 @@
pkg-config,
pkg-kde-tools (>= 0.12),
shared-mime-info,
+Build-Conflicts: libqtwebkit-dev
Standards-Version: 4.1.4
Homepage: http://www.kde.org/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kde-runtime
diff -Nru kde-runtime-17.08.3/debian/kde-runtime-data.install kde-runtime-17.08.3/debian/kde-runtime-data.install
--- kde-runtime-17.08.3/debian/kde-runtime-data.install 2018-03-06 01:29:01.000000000 -0500
+++ kde-runtime-17.08.3/debian/kde-runtime-data.install 2019-01-14 03:24:26.000000000 -0500
@@ -383,8 +383,6 @@
usr/share/kde4/apps/libphonon/hardwaredatabase
usr/share/kde4/apps/phonon/phonon.notifyrc
usr/share/kde4/apps/remoteview/network.desktop
-usr/share/kde4/apps/remoteview/smb-network.desktop
-usr/share/kde4/config.kcfg/jpegcreatorsettings.kcfg
usr/share/kde4/config/emoticons.knsrc
usr/share/kde4/config/icons.knsrc
usr/share/kde4/config/khotnewstuff.knsrc
@@ -397,27 +395,18 @@
usr/share/kde4/services/bzip.protocol
usr/share/kde4/services/bzip2.protocol
usr/share/kde4/services/cgi.protocol
-usr/share/kde4/services/comicbookthumbnail.desktop
usr/share/kde4/services/componentchooser.desktop
-usr/share/kde4/services/cursorthumbnail.desktop
usr/share/kde4/services/desktop.protocol
-usr/share/kde4/services/desktopthumbnail.desktop
usr/share/kde4/services/device_automounter_kcm.desktop
-usr/share/kde4/services/directorythumbnail.desktop
-usr/share/kde4/services/djvuthumbnail.desktop
usr/share/kde4/services/emoticons.desktop
-usr/share/kde4/services/exrthumbnail.desktop
usr/share/kde4/services/filetypes.desktop
usr/share/kde4/services/finger.protocol
usr/share/kde4/services/fish.protocol
usr/share/kde4/services/fixhosturifilter.desktop
usr/share/kde4/services/floppy.protocol
usr/share/kde4/services/gzip.protocol
-usr/share/kde4/services/htmlthumbnail.desktop
usr/share/kde4/services/icons.desktop
-usr/share/kde4/services/imagethumbnail.desktop
usr/share/kde4/services/info.protocol
-usr/share/kde4/services/jpegthumbnail.desktop
usr/share/kde4/services/kcm_attica.desktop
usr/share/kde4/services/kcm_kdnssd.desktop
usr/share/kde4/services/kcm_phonon.desktop
@@ -463,22 +452,15 @@
usr/share/kde4/services/searchproviders/
usr/share/kde4/services/settings.protocol
usr/share/kde4/services/sftp.protocol
-usr/share/kde4/services/smb.protocol
usr/share/kde4/services/spellchecking.desktop
-usr/share/kde4/services/svgthumbnail.desktop
usr/share/kde4/services/tar.protocol
-usr/share/kde4/services/textthumbnail.desktop
-usr/share/kde4/services/thumbnail.protocol
usr/share/kde4/services/trash.protocol
-usr/share/kde4/services/windowsexethumbnail.desktop
-usr/share/kde4/services/windowsimagethumbnail.desktop
usr/share/kde4/services/xz.protocol
usr/share/kde4/services/zip.protocol
usr/share/kde4/servicetypes/knotifynotifymethod.desktop
usr/share/kde4/servicetypes/phononbackend.desktop
usr/share/kde4/servicetypes/plasma-javascriptaddon.desktop
usr/share/kde4/servicetypes/searchprovider.desktop
-usr/share/kde4/servicetypes/thumbcreator.desktop
usr/share/locale/currency/
usr/share/locale/l10n/*.desktop
usr/share/locale/l10n/*/entry.desktop
diff -Nru kde-runtime-17.08.3/debian/kde-runtime.install kde-runtime-17.08.3/debian/kde-runtime.install
--- kde-runtime-17.08.3/debian/kde-runtime.install 2018-03-03 02:25:50.000000000 -0500
+++ kde-runtime-17.08.3/debian/kde-runtime.install 2019-01-14 03:24:04.000000000 -0500
@@ -29,13 +29,7 @@
usr/lib/attica_kde.so
usr/lib/kconf_update_bin/phonon_devicepreference_update
usr/lib/kconf_update_bin/phonon_deviceuids_update
-usr/lib/kde4/comicbookthumbnail.so
-usr/lib/kde4/cursorthumbnail.so
-usr/lib/kde4/djvuthumbnail.so
-usr/lib/kde4/exrthumbnail.so
usr/lib/kde4/fixhosturifilter.so
-usr/lib/kde4/htmlthumbnail.so
-usr/lib/kde4/imagethumbnail.so
usr/lib/kde4/imports/org/kde/dirmodel/libdirmodelplugin.so
usr/lib/kde4/imports/org/kde/draganddrop/libdraganddropplugin.so
usr/lib/kde4/imports/org/kde/locale/liblocalebindingsplugin.so
@@ -46,7 +40,6 @@
usr/lib/kde4/imports/org/kde/plasma/graphicswidgets/libgraphicswidgetsbindingsplugin.so
usr/lib/kde4/imports/org/kde/qtextracomponents/libqtextracomponentsplugin.so
usr/lib/kde4/imports/org/kde/runnermodel/librunnermodelplugin.so
-usr/lib/kde4/jpegthumbnail.so
usr/lib/kde4/kcm_attica.so
usr/lib/kde4/kcm_cgi.so
usr/lib/kde4/kcm_componentchooser.so
@@ -90,8 +83,6 @@
usr/lib/kde4/kio_remote.so
usr/lib/kde4/kio_settings.so
usr/lib/kde4/kio_sftp.so
-usr/lib/kde4/kio_smb.so
-usr/lib/kde4/kio_thumbnail.so
usr/lib/kde4/kio_trash.so
usr/lib/kde4/kshorturifilter.so
usr/lib/kde4/kuriikwsfilter.so
@@ -114,10 +105,6 @@
usr/lib/kde4/platformimports/touch/org/kde/plasma/components/libplasmacomponentsplugin.so
usr/lib/kde4/plugins/imageformats/kimg_webp.so
usr/lib/kde4/plugins/phonon_platform/kde.so
-usr/lib/kde4/svgthumbnail.so
-usr/lib/kde4/textthumbnail.so
-usr/lib/kde4/windowsexethumbnail.so
-usr/lib/kde4/windowsimagethumbnail.so
usr/lib/libkdeinit4_kcmshell4.so
usr/lib/libkdeinit4_kglobalaccel.so
usr/lib/libkdeinit4_kuiserver.so
diff -Nru kde-runtime-17.08.3/debian/patches/drop_thumbnail.patch kde-runtime-17.08.3/debian/patches/drop_thumbnail.patch
--- kde-runtime-17.08.3/debian/patches/drop_thumbnail.patch 1969-12-31 19:00:00.000000000 -0500
+++ kde-runtime-17.08.3/debian/patches/drop_thumbnail.patch 2019-01-14 05:49:59.000000000 -0500
@@ -0,0 +1,17 @@
+Author: Scott Kitterman <sc...@kitterman.com>
+
+--- kde-runtime-17.08.3.orig/kioslave/CMakeLists.txt
++++ kde-runtime-17.08.3/kioslave/CMakeLists.txt
+@@ -40,9 +40,9 @@ add_subdirectory( remote )
+ add_subdirectory( desktop )
+ add_subdirectory( recentdocuments )
+ add_subdirectory( fish )
+-if(NOT WINCE)
+-add_subdirectory( thumbnail )
+-endif(NOT WINCE)
++#if(NOT WINCE)
++#add_subdirectory( thumbnail )
++#endif(NOT WINCE)
+ add_subdirectory( docfilter )
+ if (LIBSSH_FOUND)
+ add_subdirectory(sftp)
diff -Nru kde-runtime-17.08.3/debian/patches/series kde-runtime-17.08.3/debian/patches/series
--- kde-runtime-17.08.3/debian/patches/series 2018-05-30 15:40:58.000000000 -0400
+++ kde-runtime-17.08.3/debian/patches/series 2019-01-14 06:01:01.000000000 -0500
@@ -9,3 +9,4 @@
Make-sure-people-are-not-trying-to-sneak-invisible-charac.patch
cmake-add-NetworkManager-module.patch
solid-networkstatus-Port-to-libnm.patch
+drop_thumbnail.patch
