Hello community, here is the log from the commit of package openmw for openSUSE:Factory checked in at 2018-06-19 11:57:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openmw (Old) and /work/SRC/openSUSE:Factory/.openmw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openmw" Tue Jun 19 11:57:05 2018 rev:2 rq:616341 version:0.43.0 Changes: -------- --- /work/SRC/openSUSE:Factory/openmw/openmw.changes 2018-01-13 21:44:10.391792102 +0100 +++ /work/SRC/openSUSE:Factory/.openmw.new/openmw.changes 2018-06-19 11:57:08.572558459 +0200 @@ -1,0 +2,10 @@ +Tue Jun 12 15:26:01 UTC 2018 - [email protected] + +- add new _constraints, build on x86_64 takes more than 2G ram + +------------------------------------------------------------------- +Mon Jun 11 10:52:27 UTC 2018 - [email protected] + +- add qt_5_11-cmake.patch to fix build with QT-5.11 + +------------------------------------------------------------------- New: ---- _constraints qt_5_11-cmake.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openmw.spec ++++++ --- /var/tmp/diff_new_pack.bfgUGH/_old 2018-06-19 11:57:09.316530839 +0200 +++ /var/tmp/diff_new_pack.bfgUGH/_new 2018-06-19 11:57:09.320530691 +0200 @@ -1,7 +1,7 @@ # # spec file for package openmw # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012-2015 openSUSE_user1 # # All modifications and additions to the file contributed by third parties @@ -21,11 +21,12 @@ Version: 0.43.0 Release: 0 Summary: Reimplementation of The Elder Scrolls III: Morrowind -License: GPL-3.0 AND MIT +License: GPL-3.0-only AND MIT Group: Amusements/Games/RPG Url: http://www.openmw.org Source: https://github.com/OpenMW/%{name}/archive/%{name}-%{version}.tar.gz Source2: %{name}.rpmlintrc +Patch0: qt_5_11-cmake.patch BuildRequires: MyGUI-devel >= 3.2.1 BuildRequires: cmake BuildRequires: doxygen @@ -86,6 +87,7 @@ %prep %setup -q -n %{name}-%{name}-%{version} +%patch0 -p1 ## fix __DATE__ and __TIME__ STATIC_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') ++++++ _constraints ++++++ <constraints> <overwrite> <conditions> <arch>x86_64</arch> </conditions> <hardware> <memory> <size unit="G">4</size> </memory> </hardware> </overwrite> </constraints> ++++++ qt_5_11-cmake.patch ++++++ >From 2c9d46a60bd8d35f132cb106e5255d590b13640b Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Tue, 17 Apr 2018 23:03:56 +0200 Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) --- apps/launcher/CMakeLists.txt | 2 +- apps/opencs/CMakeLists.txt | 2 +- apps/wizard/CMakeLists.txt | 2 +- components/CMakeLists.txt | 2 +- extern/osgQt/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt index aec8c2533a..99e7b4daac 100644 --- a/apps/launcher/CMakeLists.txt +++ b/apps/launcher/CMakeLists.txt @@ -106,7 +106,7 @@ if (DESIRED_QT_VERSION MATCHES 4) target_link_libraries(openmw-launcher ${QT_QTMAIN_LIBRARY}) endif(WIN32) else() - qt5_use_modules(openmw-launcher Widgets Core) + target_link_libraries(openmw-launcher Qt5::Widgets Qt5::Core) endif() if (BUILD_WITH_CODE_COVERAGE) diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt index b9279bf912..f07b518a98 100644 --- a/apps/opencs/CMakeLists.txt +++ b/apps/opencs/CMakeLists.txt @@ -246,7 +246,7 @@ if (DESIRED_QT_VERSION MATCHES 4) target_link_libraries(openmw-cs ${QT_QTMAIN_LIBRARY}) endif() else() - qt5_use_modules(openmw-cs Widgets Core Network OpenGL) + target_link_libraries(openmw-cs Qt5::Widgets Qt5::Core Qt5::Network Qt5::OpenGL) endif() if (WIN32) diff --git a/apps/wizard/CMakeLists.txt b/apps/wizard/CMakeLists.txt index 5f7338e520..8d97bbcbfa 100644 --- a/apps/wizard/CMakeLists.txt +++ b/apps/wizard/CMakeLists.txt @@ -118,7 +118,7 @@ if (DESIRED_QT_VERSION MATCHES 4) target_link_libraries(openmw-wizard ${QT_QTMAIN_LIBRARY}) endif() else() - qt5_use_modules(openmw-wizard Widgets Core) + target_link_libraries(openmw-wizard Qt5::Widgets Qt5::Core) endif() if (OPENMW_USE_UNSHIELD) diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 8256f14437..ecb844a9bd 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -216,7 +216,7 @@ if (USE_QT) ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) else() - qt5_use_modules(components Widgets Core) + target_link_libraries(components Qt5::Widgets Qt5::Core) endif() endif() diff --git a/extern/osgQt/CMakeLists.txt b/extern/osgQt/CMakeLists.txt index 3bd08a390a..78a4e60344 100644 --- a/extern/osgQt/CMakeLists.txt +++ b/extern/osgQt/CMakeLists.txt @@ -12,7 +12,7 @@ if (DESIRED_QT_VERSION MATCHES 4) include(${QT_USE_FILE}) target_link_libraries(${OSGQT_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTOPENGL_LIBRARY}) else() - qt5_use_modules(${OSGQT_LIBRARY} Core OpenGL) + target_link_libraries(${OSGQT_LIBRARY} Qt5::Core Qt5::OpenGL) endif() link_directories(${CMAKE_CURRENT_BINARY_DIR})
