Hello community, here is the log from the commit of package gcompris-qt for openSUSE:Factory checked in at 2018-06-19 11:55:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcompris-qt (Old) and /work/SRC/openSUSE:Factory/.gcompris-qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcompris-qt" Tue Jun 19 11:55:21 2018 rev:11 rq:616023 version:0.91 Changes: -------- --- /work/SRC/openSUSE:Factory/gcompris-qt/gcompris-qt.changes 2018-05-29 10:34:57.318563210 +0200 +++ /work/SRC/openSUSE:Factory/.gcompris-qt.new/gcompris-qt.changes 2018-06-19 11:55:22.276504784 +0200 @@ -1,0 +2,17 @@ +Mon Jun 11 12:26:06 UTC 2018 - [email protected] + +- Really fix 42.3 with defined %mail_build + +------------------------------------------------------------------- +Mon Jun 11 07:34:03 UTC 2018 - [email protected] + +- Backport upstream fix qt5_use_modules is deprecated in Qt 5.11 + https://cgit.kde.org/gcompris.git/patch/?id=35278731 + 35278731_0.91_backport.patch + +------------------------------------------------------------------- +Mon May 21 13:17:05 UTC 2018 - [email protected] + +- Fix broken build Leap 42.3 by defining %make_build if not exist + +------------------------------------------------------------------- New: ---- 35278731_0.91_backport.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcompris-qt.spec ++++++ --- /var/tmp/diff_new_pack.tSQmj2/_old 2018-06-19 11:55:24.736413457 +0200 +++ /var/tmp/diff_new_pack.tSQmj2/_new 2018-06-19 11:55:24.744413160 +0200 @@ -17,6 +17,11 @@ # +%if ! %{defined make_build} +# Temporary fix for Leap 42.3 +%define make_build /usr/bin/make %{?_smp_mflags} +%endif + Name: gcompris-qt Version: 0.91 Release: 0 @@ -28,6 +33,9 @@ Source1: http://gcompris.net/download/qt/src/%{name}-%{version}.tar.xz.sig Source2: https://share.kde.org/index.php/s/YjKzYs1bgDsOo5V/download#/%{name}.keyring Source3: gcompris-qt-rpmlintrc +# Backport upstream fix https://cgit.kde.org/gcompris.git/patch/?id=35278731 +# build, qt5_use_modules is deprecated in Qt 5.11 +Patch0: 35278731_0.91_backport.patch BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: libBox2D-devel @@ -101,13 +109,16 @@ %prep %setup -q +%patch0 -p1 %build export LDFLAGS="-Wl,-z,relro,-z,now -pie" export CFLAGS="%{optflags} -fPIE -pie -fno-strict-aliasing -DNDEBUG" export CXXFLAGS="%{optflags} -fPIE -pie -fno-strict-aliasing -DNDEBUG" -%cmake +find . -name CMakeLists.txt \ + -exec sed -i -re '/^[[:blank:]]*[sS][eE][tT][[:blank:]]*\([[:blank:]]*(CMAKE_BUILD_TYPE|CMAKE_COLOR_MAKEFILE|CMAKE_INSTALL_PREFIX|CMAKE_VERBOSE_MAKEFILE).*\)/{s/^/#IGNORE /}' {} + +%cmake_kf5 -d build %make_build # Build translastions too. ++++++ 35278731_0.91_backport.patch ++++++ diff -rup a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt --- a/src/core/CMakeLists.txt 2018-05-15 14:37:34.000000000 +0200 +++ b/src/core/CMakeLists.txt 2018-06-11 09:24:33.366927912 +0200 @@ -62,23 +62,22 @@ elseif(CMAKE_HOST_APPLE) set_source_files_properties(${gcompris_RES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") endif() +set(used_qt_modules Qt5::Qml Qt5::Quick Qt5::Gui Qt5::Multimedia Qt5::Core Qt5::Svg Qt5::Xml Qt5::XmlPatterns Qt5::Sensors) + if(ANDROID) add_library(${GCOMPRIS_EXECUTABLE_NAME} SHARED ${gcompris_SRCS} ${gcompris_MOC}) - qt5_use_modules(${GCOMPRIS_EXECUTABLE_NAME} Qml Quick Gui Multimedia Core Svg Xml XmlPatterns Sensors AndroidExtras) elseif(CMAKE_HOST_APPLE) add_executable(${GCOMPRIS_EXECUTABLE_NAME} MACOSX_BUNDLE ${gcompris_SRCS} ${gcompris_MOC} ${gcompris_RES}) - qt5_use_modules(${GCOMPRIS_EXECUTABLE_NAME} Qml Quick Gui Multimedia Network XmlPatterns Svg Xml Sensors Core) elseif(CMAKE_HOST_WIN32) add_executable(${GCOMPRIS_EXECUTABLE_NAME} WIN32 ${gcompris_SRCS} ${gcompris_MOC} ${gcompris_RES}) - qt5_use_modules(${GCOMPRIS_EXECUTABLE_NAME} Qml Quick Gui Multimedia Network XmlPatterns Svg Xml Sensors Core) elseif(SAILFISHOS) add_executable(${GCOMPRIS_EXECUTABLE_NAME} ${gcompris_SRCS} ${gcompris_MOC} ${gcompris_RES}) - qt5_use_modules(${GCOMPRIS_EXECUTABLE_NAME} Qml Quick Gui Multimedia Network XmlPatterns Svg Xml Sensors Core Widgets) else() add_executable(${GCOMPRIS_EXECUTABLE_NAME} ${gcompris_SRCS} ${gcompris_MOC} ${gcompris_RES}) - qt5_use_modules(${GCOMPRIS_EXECUTABLE_NAME} Qml Quick Gui Multimedia Network XmlPatterns Svg Xml Sensors Core) endif() +target_link_libraries(${GCOMPRIS_EXECUTABLE_NAME} ${used_qt_modules}) + GCOMPRIS_ADD_RCC(core *.qml *.js resource/*.${COMPRESSED_AUDIO} resource/*.gif resource/*.png resource/*.svg resource/bonus/* resource/sounds/* resource/fonts/* qmldir COPYING) # Installation
