Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-creator for openSUSE:Factory
checked in at 2021-01-19 16:03:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-creator (Old)
and /work/SRC/openSUSE:Factory/.libqt5-creator.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-creator"
Tue Jan 19 16:03:29 2021 rev:85 rq:864293 version:4.14.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-creator/libqt5-creator.changes
2020-12-29 15:49:06.876368578 +0100
+++ /work/SRC/openSUSE:Factory/.libqt5-creator.new.28504/libqt5-creator.changes
2021-01-19 16:04:22.707577335 +0100
@@ -1,0 +2,6 @@
+Tue Jan 19 08:40:46 UTC 2021 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Add patch to use GNUInstallDirs instead of using sed:
+ * cmake-build-use-gnuinstalldirs.patch
+
+-------------------------------------------------------------------
New:
----
cmake-build-use-gnuinstalldirs.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-creator.spec ++++++
--- /var/tmp/diff_new_pack.aK0nhS/_old 2021-01-19 16:04:23.591578665 +0100
+++ /var/tmp/diff_new_pack.aK0nhS/_new 2021-01-19 16:04:23.595578670 +0100
@@ -19,6 +19,12 @@
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300
%global build_clang_backend 1
%endif
+
+%global libexecdirname libexec
+%if "%{_libexecdir}" == "%{_prefix}/lib"
+%global libexecdirname lib
+%endif
+
%define major_ver 4.14
%define qt5_version 5.14.0
%define tar_version 4.14.0
@@ -42,6 +48,7 @@
Patch0: 0001-cmake-build-Don-t-install-highlighting-files-when-us.patch
Patch1: 0001-Fix-compilation-of-ClangFormat-plugin-against-LLVM-w.patch
Patch2: 0001-Fix-a-link-error-when-building-the-qmldesigner-plugi.patch
+Patch3: cmake-build-use-gnuinstalldirs.patch
# Patches 10-20 are openSUSE changes
Patch10: fix-application-output.patch
Patch11: 0001-Disable-some-plugins.patch
@@ -133,16 +140,15 @@
%build
%define _lto_cflags %{nil}
-%if "%{_lib}" == "lib64"
-sed -i 's#lib/#lib64/#g' cmake/QtCreatorAPIInternal.cmake
-%endif
-
# Don't let the qt-creator build system strip debug info
sed -i -e "/qtc_enable_separate_debug_info/d" cmake/QtCreatorAPI.cmake
+# It expects relative paths for CMAKE_INSTALL_LIB{,EXEC}DIR
# https://bugreports.qt.io/browse/QTCREATORBUG-24357 suggests disabling
# the clangpchmanagerbackend and clangrefactoringbackend builds
%cmake \
+ -DCMAKE_INSTALL_LIBDIR=%{_lib} \
+ -DCMAKE_INSTALL_LIBEXECDIR=%{libexecdirname} \
-DCLANGTOOLING_LINK_CLANG_DYLIB=ON \
-DBUILD_WITH_PCH=OFF \
-DWITH_DOCS=ON \
++++++ cmake-build-use-gnuinstalldirs.patch ++++++
>From c81baf1a9cc938a283f6c52c8fd10bab84183391 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.zil...@qt.io>
Date: Wed, 6 Jan 2021 17:45:17 +0100
Subject: [PATCH] cmake build: Use GNUInstallDirs for installation paths on
Linux
Allows e.g. distributions to adapt to system layout.
Fixes: QTCREATORBUG-25142
Change-Id: Ia6d759514fef5a154334bc3d7221ea4b970122f2
Reviewed-by: Cristian Adam <cristian.a...@qt.io>
---
cmake/QtCreatorAPIInternal.cmake | 35 ++++++++++++++++----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/cmake/QtCreatorAPIInternal.cmake b/cmake/QtCreatorAPIInternal.cmake
index 0aafe289e6f..79583f79254 100644
--- a/cmake/QtCreatorAPIInternal.cmake
+++ b/cmake/QtCreatorAPIInternal.cmake
@@ -37,35 +37,36 @@ if (APPLE)
set(_IDE_OUTPUT_PATH "${_IDE_APP_PATH}/${_IDE_APP_TARGET}.app/Contents")
- set(_IDE_PLUGIN_PATH "${_IDE_OUTPUT_PATH}/PlugIns")
set(_IDE_LIBRARY_BASE_PATH "Frameworks")
- set(_IDE_LIBRARY_PATH "${_IDE_OUTPUT_PATH}/Frameworks")
+ set(_IDE_LIBRARY_PATH "${_IDE_OUTPUT_PATH}/${_IDE_LIBRARY_BASE_PATH}")
+ set(_IDE_PLUGIN_PATH "${_IDE_OUTPUT_PATH}/PlugIns")
set(_IDE_LIBEXEC_PATH "${_IDE_OUTPUT_PATH}/Resources/libexec")
set(_IDE_DATA_PATH "${_IDE_OUTPUT_PATH}/Resources")
set(_IDE_DOC_PATH "${_IDE_OUTPUT_PATH}/Resources/doc")
set(_IDE_BIN_PATH "${_IDE_OUTPUT_PATH}/MacOS")
-
- set(QT_DEST_PLUGIN_PATH "${_IDE_PLUGIN_PATH}")
- set(QT_DEST_QML_PATH "${_IDE_DATA_PATH}/../Imports/qtquick2")
-else ()
+elseif(WIN32)
set(_IDE_APP_PATH "bin")
set(_IDE_APP_TARGET "${IDE_ID}")
set(_IDE_LIBRARY_BASE_PATH "lib")
- set(_IDE_LIBRARY_PATH "lib/qtcreator")
- set(_IDE_PLUGIN_PATH "lib/qtcreator/plugins")
- if (WIN32)
- set(_IDE_LIBEXEC_PATH "bin")
- set(QT_DEST_PLUGIN_PATH "bin/plugins")
- set(QT_DEST_QML_PATH "bin/qml")
- else ()
- set(_IDE_LIBEXEC_PATH "libexec/qtcreator")
- set(QT_DEST_PLUGIN_PATH "lib/Qt/plugins")
- set(QT_DEST_QML_PATH "lib/Qt/qml")
- endif ()
+ set(_IDE_LIBRARY_PATH "${_IDE_LIBRARY_BASE_PATH}/qtcreator")
+ set(_IDE_PLUGIN_PATH "${_IDE_LIBRARY_BASE_PATH}/qtcreator/plugins")
+ set(_IDE_LIBEXEC_PATH "bin")
set(_IDE_DATA_PATH "share/qtcreator")
set(_IDE_DOC_PATH "share/doc/qtcreator")
set(_IDE_BIN_PATH "bin")
+else ()
+ include(GNUInstallDirs)
+ set(_IDE_APP_PATH "${CMAKE_INSTALL_BINDIR}")
+ set(_IDE_APP_TARGET "${IDE_ID}")
+
+ set(_IDE_LIBRARY_BASE_PATH "${CMAKE_INSTALL_LIBDIR}")
+ set(_IDE_LIBRARY_PATH "${_IDE_LIBRARY_BASE_PATH}/qtcreator")
+ set(_IDE_PLUGIN_PATH "${_IDE_LIBRARY_BASE_PATH}/qtcreator/plugins")
+ set(_IDE_LIBEXEC_PATH "${CMAKE_INSTALL_LIBEXECDIR}/qtcreator")
+ set(_IDE_DATA_PATH "${CMAKE_INSTALL_DATAROOTDIR}/qtcreator")
+ set(_IDE_DOC_PATH "${CMAKE_INSTALL_DATAROOTDIR}/doc/qtcreator")
+ set(_IDE_BIN_PATH "${CMAKE_INSTALL_BINDIR}")
endif ()
file(RELATIVE_PATH _PLUGIN_TO_LIB "/${_IDE_PLUGIN_PATH}"
"/${_IDE_LIBRARY_PATH}")
