Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at 2017-12-05 01:25:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old) and /work/SRC/openSUSE:Factory/.kdelibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4" Tue Dec 5 01:25:34 2017 rev:300 rq:547667 version:4.14.38 Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes 2017-11-16 14:34:47.220217265 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes 2017-12-05 01:25:35.855413826 +0100 @@ -1,0 +2,7 @@ +Sat Dec 2 16:46:52 UTC 2017 - [email protected] + +- Add patch to not build against Qt4 WebKit: + * Skip-qtwebkit-parts.patch + * Vade retro satana + +------------------------------------------------------------------- New: ---- Skip-qtwebkit-parts.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.KhbCCJ/_old 2017-12-05 01:25:37.163366308 +0100 +++ /var/tmp/diff_new_pack.KhbCCJ/_new 2017-12-05 01:25:37.167366162 +0100 @@ -38,7 +38,6 @@ BuildRequires: hicolor-icon-theme BuildRequires: kde4-filesystem BuildRequires: krb5-devel -BuildRequires: libQtWebKit-devel BuildRequires: libacl-devel BuildRequires: libattica-devel >= 0.4.2 BuildRequires: libattr-devel @@ -88,6 +87,8 @@ Patch15: 0001-Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch # PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Fix errors spotted by GCC6. Patch17: gcc6-fix-errors.patch +# PATCH-FIX-OPENSUSE +Patch18: Skip-qtwebkit-parts.patch PreReq: permissions Requires: libattica0_4 >= %( echo `rpm -q --queryformat '%{VERSION}' libattica-devel`) Recommends: media-player-info @@ -144,6 +145,7 @@ %patch12 -p1 %patch15 -p1 %patch17 +%patch18 -p1 %build EXTRA_FLAGS="-DLIB_INSTALL_DIR=%{_kde4_libdir} \ @@ -351,7 +353,6 @@ %{_kde4_libdir}/libkdeclarative.so.* %{_kde4_libdir}/libkdesu.so.* %{_kde4_libdir}/libkdeui.so.* -%{_kde4_libdir}/libkdewebkit.so.* %{_kde4_libdir}/libkdnssd.so.* %{_kde4_libdir}/libkemoticons.so.* %{_kde4_libdir}/libkfile.so.* @@ -386,7 +387,6 @@ Requires: docbook-xsl-stylesheets Requires: kdelibs4 = %{version} Requires: kdelibs4-doc = %{version} -Requires: libQtWebKit-devel Requires: libkde4 = %{version} Requires: libkdecore4-devel = %{version} Requires: phonon-devel ++++++ Skip-qtwebkit-parts.patch ++++++ From: Fabian Vogt <[email protected]> Subject: Do not build parts depending on Qt WebKit Qt WebKit is unmaintained and must not be used anymore. Index: kdelibs-4.14.38/CMakeLists.txt =================================================================== --- kdelibs-4.14.38.orig/CMakeLists.txt +++ kdelibs-4.14.38/CMakeLists.txt @@ -357,7 +357,6 @@ if(NOT WINCE) add_subdirectory( plasma ) endif(NOT WINCE) add_subdirectory( kunitconversion ) -add_subdirectory( kdewebkit ) add_subdirectory( includes ) add_subdirectory( experimental ) Index: kdelibs-4.14.38/plasma/CMakeLists.txt =================================================================== --- kdelibs-4.14.38.orig/plasma/CMakeLists.txt +++ kdelibs-4.14.38/plasma/CMakeLists.txt @@ -1,6 +1,7 @@ # strange conversion error in pushbutton.cpp kde4_no_enable_final(plasma) +set(PLASMA_NO_KDEWEBKIT TRUE) if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) set(PLASMA_NO_KDEWEBKIT TRUE) set(PLASMA_NO_KNEWSTUFF TRUE) @@ -121,7 +122,6 @@ set(plasma_LIB_SRCS framesvg.cpp plasma.cpp popupapplet.cpp - private/animablegraphicswebview.cpp private/applethandle.cpp private/associatedapplicationmanager.cpp private/componentinstaller.cpp @@ -211,7 +211,6 @@ set(plasma_LIB_SRCS widgets/textbrowser.cpp widgets/treeview.cpp widgets/textedit.cpp - widgets/webview.cpp #Temporary QtJolie branch private/qtjolie-branch/qtjolie/abstractadaptor.cpp @@ -275,7 +274,7 @@ endif(PHONON_FOUND) kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS}) -target_link_libraries(plasma LINK_PRIVATE ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY} +target_link_libraries(plasma LINK_PRIVATE ${QT_QTUITOOLS_LIBRARY} ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS} ${KDE4_THREADWEAVER_LIBS} ${PLASMA_EXTRA_LIBS}) @@ -418,7 +417,6 @@ install(FILES widgets/textbrowser.h widgets/treeview.h widgets/textedit.h - widgets/webview.h DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/widgets COMPONENT Devel) install(FILES Index: kdelibs-4.14.38/kdewidgets/CMakeLists.txt =================================================================== --- kdelibs-4.14.38.orig/kdewidgets/CMakeLists.txt +++ kdelibs-4.14.38/kdewidgets/CMakeLists.txt @@ -89,40 +89,6 @@ if(QT_QTDESIGNER_FOUND) endif(NOT KDE_NO_DEPRECATED) - # kdewebkit widgets - 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) - - 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_add_resources(kdewebkitwidgets_PART_SRCS kdewebkitwidgets.qrc) - - 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 - INSTALL_RPATH ${LIB_INSTALL_DIR} - ) - endif(NOT WIN32) - - install(TARGETS kdewebkitwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) - - if (QT_QT3SUPPORT_FOUND) include_directories(
