diff --git a/kdelibs.spec b/kdelibs.spec index 8c45207..e2bfde5 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -198,8 +198,6 @@ Patch67: kdelibs-4.14.17-gcc6_narrowing_hack.patch ## upstream # 4.14 branch -# fix visibility support, https://git.reviewboard.kde.org/r/128697 -Patch100: rb128697.patch ## security fix diff --git a/rb128697.patch b/rb128697.patch deleted file mode 100644 index 188384e..0000000 --- a/rb128697.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake -index 7d54b9b83b999f6a6e8541f8e8b89e0b2a105703..c345eca36f4255c03e88a31c53cf2a2efd0e2c42 100644 ---- a/cmake/modules/FindKDE4Internal.cmake -+++ b/cmake/modules/FindKDE4Internal.cmake -@@ -1221,7 +1221,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) - # get the gcc version - exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info) - -- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") -+ string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") - # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: - if (NOT _gcc_version) - string (REGEX MATCH ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${gcc_on_macos}")