diff --git a/kdelibs-4.10.0-webkit.patch b/kdelibs-4.14.16-webkit.patch similarity index 68% rename from kdelibs-4.10.0-webkit.patch rename to kdelibs-4.14.16-webkit.patch index 1aad529..ec4f20d 100644 --- a/kdelibs-4.10.0-webkit.patch +++ b/kdelibs-4.14.16-webkit.patch @@ -1,7 +1,7 @@ -diff -up kdelibs-4.10.0/CMakeLists.txt.webkit kdelibs-4.10.0/CMakeLists.txt ---- kdelibs-4.10.0/CMakeLists.txt.webkit 2013-01-29 22:55:26.000000000 +0100 -+++ kdelibs-4.10.0/CMakeLists.txt 2013-02-28 11:43:57.653616989 +0100 -@@ -328,7 +328,6 @@ if(NOT WINCE) +diff -up kdelibs-4.14.16/CMakeLists.txt.webkit kdelibs-4.14.16/CMakeLists.txt +--- kdelibs-4.14.16/CMakeLists.txt.webkit 2016-01-07 00:02:22.000000000 +0100 ++++ kdelibs-4.14.16/CMakeLists.txt 2016-01-28 13:03:53.556194927 +0100 +@@ -363,7 +363,6 @@ if(NOT WINCE) add_subdirectory( plasma ) endif(NOT WINCE) add_subdirectory( kunitconversion ) @@ -9,9 +9,9 @@ diff -up kdelibs-4.10.0/CMakeLists.txt.webkit kdelibs-4.10.0/CMakeLists.txt add_subdirectory( includes ) add_subdirectory( experimental ) -diff -up kdelibs-4.10.0/kdewidgets/CMakeLists.txt.webkit kdelibs-4.10.0/kdewidgets/CMakeLists.txt ---- kdelibs-4.10.0/kdewidgets/CMakeLists.txt.webkit 2013-02-28 11:43:57.589617095 +0100 -+++ kdelibs-4.10.0/kdewidgets/CMakeLists.txt 2013-02-28 11:43:57.654616988 +0100 +diff -up kdelibs-4.14.16/kdewidgets/CMakeLists.txt.webkit kdelibs-4.14.16/kdewidgets/CMakeLists.txt +--- kdelibs-4.14.16/kdewidgets/CMakeLists.txt.webkit 2016-01-28 13:03:53.527196020 +0100 ++++ kdelibs-4.14.16/kdewidgets/CMakeLists.txt 2016-01-28 13:03:53.556194927 +0100 @@ -88,41 +88,6 @@ if(QT_QTDESIGNER_FOUND) install(TARGETS kdedeprecated DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) endif(NOT KDE_NO_DEPRECATED) @@ -54,19 +54,18 @@ diff -up kdelibs-4.10.0/kdewidgets/CMakeLists.txt.webkit kdelibs-4.10.0/kdewidge if (QT_QT3SUPPORT_FOUND) include_directories( -diff -up kdelibs-4.10.0/plasma/CMakeLists.txt.webkit kdelibs-4.10.0/plasma/CMakeLists.txt ---- kdelibs-4.10.0/plasma/CMakeLists.txt.webkit 2013-02-28 11:43:57.600617077 +0100 -+++ kdelibs-4.10.0/plasma/CMakeLists.txt 2013-02-28 11:47:28.121778200 +0100 -@@ -11,6 +11,8 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL - set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE) +diff -up kdelibs-4.14.16/plasma/CMakeLists.txt.webkit kdelibs-4.14.16/plasma/CMakeLists.txt +--- kdelibs-4.14.16/plasma/CMakeLists.txt.webkit 2016-01-07 00:02:22.000000000 +0100 ++++ kdelibs-4.14.16/plasma/CMakeLists.txt 2016-01-28 13:26:55.730137496 +0100 +@@ -11,6 +11,7 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) + set(PLASMA_NO_PACKAGEKIT TRUE) +set(PLASMA_NO_KDEWEBKIT TRUE) -+ - if(NOT Q_WS_X11) - set(PLASMA_NO_PACKAGEKIT TRUE) - endif(NOT Q_WS_X11) -@@ -124,7 +126,6 @@ set(plasma_LIB_SRCS + + include_directories(${CMAKE_CURRENT_SOURCE_DIR} + ${KDE4_KDECORE_INCLUDES} +@@ -121,7 +122,6 @@ set(plasma_LIB_SRCS framesvg.cpp plasma.cpp popupapplet.cpp @@ -74,7 +73,7 @@ diff -up kdelibs-4.10.0/plasma/CMakeLists.txt.webkit kdelibs-4.10.0/plasma/CMake private/applethandle.cpp private/associatedapplicationmanager.cpp private/componentinstaller.cpp -@@ -214,7 +215,6 @@ set(plasma_LIB_SRCS +@@ -211,7 +211,6 @@ set(plasma_LIB_SRCS widgets/textbrowser.cpp widgets/treeview.cpp widgets/textedit.cpp @@ -82,16 +81,16 @@ diff -up kdelibs-4.10.0/plasma/CMakeLists.txt.webkit kdelibs-4.10.0/plasma/CMake #Temporary QtJolie branch private/qtjolie-branch/qtjolie/abstractadaptor.cpp -@@ -278,7 +278,7 @@ endif(PHONON_FOUND) +@@ -275,7 +274,7 @@ endif(PHONON_FOUND) kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS}) --target_link_libraries(plasma ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY} -+target_link_libraries(plasma ${QT_QTUITOOLS_LIBRARY} +-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}) -@@ -430,7 +430,6 @@ install(FILES +@@ -415,7 +414,6 @@ install(FILES widgets/textbrowser.h widgets/treeview.h widgets/textedit.h diff --git a/kdelibs.spec b/kdelibs.spec index 6919a9f..82e0cb9 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -51,7 +51,7 @@ Summary: KDE Libraries # shipped with kde applications, version... %global apps_version 15.12.1 Version: 4.14.16 -Release: 1%{?dist}.1 +Release: 2%{?dist} Name: kdelibs Epoch: 6 @@ -190,7 +190,7 @@ Patch64: kdelibs-4.13.2-invokeTerminal.patch # rhel patches # disable webkit -Patch300: kdelibs-4.10.0-webkit.patch +Patch300: kdelibs-4.14.16-webkit.patch # set abrt default Patch301: kdelibs-4.x-abrt.patch @@ -795,6 +795,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Thu Jan 28 2016 Than Ngo - 6:4.14.16-2 +- disable webkit for rhel + * Thu Jan 21 2016 Rex Dieter 6:4.14.16-1.1 - unconditionally enable hardening (#965527)