From 1a5dfd087e3592dda09c003c3d9c8e9427089f53aa4afa827f6445535f199d72 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 23 Oct 2018 13:40:56 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=14 --- lib64.patch | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/lib64.patch b/lib64.patch index 546d23e..9eae92e 100644 --- a/lib64.patch +++ b/lib64.patch @@ -1,5 +1,5 @@ diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt -index 0a2920e4..b9388182 100644 +index 1af84fc..843761f 100644 --- a/sources/shiboken2/CMakeLists.txt +++ b/sources/shiboken2/CMakeLists.txt @@ -104,7 +104,8 @@ if(MSVC) @@ -12,16 +12,7 @@ index 0a2920e4..b9388182 100644 if (NOT EXISTS ${CLANG_LIBRARY}) string(REPLACE ";" ", " CLANG_LIB_NAMES_STRING "${CLANG_LIB_NAMES}") message(FATAL_ERROR "Unable to find the Clang library in ${CLANG_DIR}.\ -@@ -114,7 +115,7 @@ endif() - message(STATUS "CLANG: ${CLANG_DIR}, ${CLANG_LIBRARY} detected by ${CLANG_DIR_SOURCE}") - - # Find highest version clang builtin includes folder to pass along to shiboken. --set(CLANG_BUILTIN_INCLUDES_DIR_PREFIX ${CLANG_DIR}/lib/clang) -+set(CLANG_BUILTIN_INCLUDES_DIR_PREFIX ${CLANG_DIR}/lib${LIB_SUFFIX}/clang) - file(GLOB CLANG_BUILTIN_INCLUDES_DIR_CANDIDATES "${CLANG_BUILTIN_INCLUDES_DIR_PREFIX}/*") - - # Collect only directories, and not files, and only directories starting with a number. -@@ -303,7 +304,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_T +@@ -311,7 +312,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_T set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON)