Fabian Vogt
73d71ef132
- Update to 5.15.0 * [PYSIDE-487] Add API of Qt 5.15 * [PYSIDE-487] Add support for QSerialPort * [PYSIDE-487] Add QtQuickControls2 * [PYSIDE-841] example: add systray example * [PYSIDE-841] doc: add more videos from Qt events * [PYSIDE-841] doc: add tutorial for using qrc files * [PYSIDE-904] libpyside: Remove deprecated API * [PYSIDE-904] Add support for template type aliases * [PYSIDE-957] Add a tool to dump meta objects of QObject-derived classes * [PYSIDE-1280] Enable injecting raw code for setattro/getattro * [PYSIDE-1309] Rename and update some snippets * [PYSIDE-454] shiboken: Add a way of specifying system includes to be parsed * [PYSIDE-454] shiboken: Handle smart pointers with const pointees * [PYSIDE-904] libshiboken: Remove deprecated API * [PYSIDE-957] shiboken: Fix refcounts of sbkenum * [PYSIDE-990] shiboken: Handle inline namespaces * [PYSIDE-1024] shiboken: Make it possible to specify smartpointer instantiations * [PYSIDE-1074] shiboken: Fix classes in hidden namespaces * [PYSIDE-1188] shiboken: Fix shared pointer return value in virtual function * [PYSIDE-1265] shiboken: Introduce a separate logging category for documentation generation * [PYSIDE-1265] shiboken: Change debug messages to use qCInfo and remove some messages * [PYSIDE-1267] shiboken: Allow for parsing headers under system include paths * [PYSIDE-1296] shiboken: Support non-type template parameters in functions - Drop 0001-shiboken-Support-Clang-version-10.patch. Fixed upstream - Rebase 0001-Don-t-try-to-install-or-use-uic-rcc-designer-copies.patch - Rebase lib64.patch OBS-URL: https://build.opensuse.org/request/show/809668 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=42
78 lines
3.7 KiB
Diff
78 lines
3.7 KiB
Diff
From d494a8eb0653b6e22207c48da7808a0bbd86b569 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
|
Date: Thu, 20 Dec 2018 19:05:03 +0100
|
|
Subject: [PATCH] Lookup clang library and install in arch specific library
|
|
path
|
|
|
|
---
|
|
build_scripts/platforms/unix.py | 4 ++--
|
|
sources/pyside2/CMakeLists.txt | 2 +-
|
|
.../shiboken2/ApiExtractor/clangparser/compilersupport.cpp | 2 +-
|
|
sources/shiboken2/CMakeLists.txt | 2 +-
|
|
4 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py
|
|
index 60722cd..c9df7f9 100644
|
|
--- a/build_scripts/platforms/unix.py
|
|
+++ b/build_scripts/platforms/unix.py
|
|
@@ -81,7 +81,7 @@ def prepare_packages_posix(self, vars):
|
|
|
|
# <install>/lib/lib* -> {st_package_name}/
|
|
copydir(
|
|
- "{install_dir}/lib/",
|
|
+ "{install_dir}/lib64/",
|
|
"{st_build_dir}/{st_package_name}",
|
|
filter=[
|
|
adjusted_lib_name("libshiboken*",
|
|
@@ -139,7 +139,7 @@ def prepare_packages_posix(self, vars):
|
|
|
|
# <install>/lib/lib* -> {st_package_name}/
|
|
copydir(
|
|
- "{install_dir}/lib/",
|
|
+ "{install_dir}/lib64/",
|
|
"{st_build_dir}/{st_package_name}",
|
|
filter=[
|
|
adjusted_lib_name("libpyside*",
|
|
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt
|
|
index bab97f4..26fa266 100644
|
|
--- a/sources/pyside2/CMakeLists.txt
|
|
+++ b/sources/pyside2/CMakeLists.txt
|
|
@@ -98,7 +98,7 @@ endif()
|
|
|
|
option(BUILD_TESTS "Build tests." TRUE)
|
|
option(ENABLE_VERSION_SUFFIX "Used to use current version in suffix to generated files. This is used to allow multiples versions installed simultaneous." FALSE)
|
|
-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
|
|
+set(LIB_SUFFIX "64" CACHE STRING "Define suffix of directory name (32/64)" )
|
|
set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
|
|
if(CMAKE_HOST_APPLE)
|
|
set(ALTERNATIVE_QT_INCLUDE_DIR "" CACHE PATH "Deprecated. CMake now finds the proper include dir itself.")
|
|
diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
|
|
index dac5110..4b091eb 100644
|
|
--- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
|
|
+++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
|
|
@@ -243,7 +243,7 @@ static QString findClangLibDir()
|
|
{
|
|
for (const char *envVar : {"LLVM_INSTALL_DIR", "CLANG_INSTALL_DIR"}) {
|
|
if (qEnvironmentVariableIsSet(envVar)) {
|
|
- const QString path = QFile::decodeName(qgetenv(envVar)) + QLatin1String("/lib");
|
|
+ const QString path = QFile::decodeName(qgetenv(envVar)) + QLatin1String("/lib64");
|
|
if (QFileInfo::exists(path))
|
|
return path;
|
|
}
|
|
diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt
|
|
index 5877971..25a53b3 100644
|
|
--- a/sources/shiboken2/CMakeLists.txt
|
|
+++ b/sources/shiboken2/CMakeLists.txt
|
|
@@ -121,7 +121,7 @@ else()
|
|
endif()
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
|
|
-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
|
|
+set(LIB_SUFFIX "64" CACHE STRING "Define suffix of directory name (32/64)" )
|
|
set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install \
|
|
prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
|
|
set(BIN_INSTALL_DIR "bin" CACHE PATH "The subdirectory relative to the install prefix where \
|
|
--
|
|
2.26.2
|
|
|