Hello community, here is the log from the commit of package qterm for openSUSE:Factory checked in at 2019-01-08 12:28:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qterm (Old) and /work/SRC/openSUSE:Factory/.qterm.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qterm" Tue Jan 8 12:28:21 2019 rev:29 rq:663028 version:0.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qterm/qterm.changes 2018-10-17 08:41:15.437863359 +0200 +++ /work/SRC/openSUSE:Factory/.qterm.new.28833/qterm.changes 2019-01-08 12:30:56.176111430 +0100 @@ -1,0 +2,8 @@ +Sat Jan 5 12:53:22 UTC 2019 - Marguerite Su <i...@marguerite.su> + +- fix tumbleweed build +- add qterm-qt5qcollectiongenerator.patch + * qcollectiongenerator-qt5 has been merged into qhelpgenerator-qt5 in Qt 5.12.0 + * http://code.qt.io/cgit/qt/qttools.git/commit/?h=5.12&id=30a75f7f + +------------------------------------------------------------------- New: ---- qterm-qt5qcollectiongenerator.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qterm.spec ++++++ --- /var/tmp/diff_new_pack.S8NwTy/_old 2019-01-08 12:30:56.712110847 +0100 +++ /var/tmp/diff_new_pack.S8NwTy/_new 2019-01-08 12:30:56.716110843 +0100 @@ -1,7 +1,7 @@ # # spec file for package qterm # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,8 @@ Url: https://github.com/qterm/qterm Source0: https://github.com/qterm/%{name}/archive/%{version}.tar.gz#./%{name}-%{version}.tar.gz Source1: qterm.desktop +#PATCH-FIX-UPSTREAM marguer...@opensuse.org - qcollectiongenerator has been merged into qhelpgenerator in Qt 5.12.0 +Patch: qterm-qt5qcollectiongenerator.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: hicolor-icon-theme @@ -45,6 +47,7 @@ %prep %setup -q +%patch -p1 %build %cmake -DQT5=YES ++++++ qterm-qt5qcollectiongenerator.patch ++++++ Index: qterm-0.7.3/CMakeLists.txt =================================================================== --- qterm-0.7.3.orig/CMakeLists.txt +++ qterm-0.7.3/CMakeLists.txt @@ -22,9 +22,12 @@ IF(QT5) find_package(Qt5ScriptTools 5.3.0) find_package(Qt5Multimedia 5.3.0) IF(NOT QT_BINARY_DIR) - exec_program(${_qt5Core_install_prefix}/bin/qmake ARGS "-query QT_INSTALL_BINS" + exec_program(${_qt5Core_install_prefix}/bin/qmake-qt5 ARGS "-query QT_INSTALL_BINS" OUTPUT_VARIABLE QT_BINARY_DIR) ENDIF() + exec_program(${_qt5Core_install_prefix}/bin/qmake-qt5 ARGS "-query QT_VERSION" + OUTPUT_VARIABLE QT5VERSION) + STRING(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" QT5_VERSION_MINOR "${QT5VERSION}") ELSE(QT5) find_package(Qt4 4.5.0 REQUIRED) find_package(KDE4) Index: qterm-0.7.3/src/doc/CMakeLists.txt =================================================================== --- qterm-0.7.3.orig/src/doc/CMakeLists.txt +++ qterm-0.7.3/src/doc/CMakeLists.txt @@ -7,11 +7,16 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DI CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/qterm.qhcp ${CMAKE_CURRENT_BINARY_DIR}/qterm.qhcp COPYONLY) if (QT5) +if (${QT5_VERSION_MINOR} GREATER 11) + find_program(QT5_QCOLLECTIONGENERATOR_EXECUTABLE NAMES qhelpgenerator-qt5 qhelpgenerator PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) +else() + find_program(QT5_QCOLLECTIONGENERATOR_EXECUTABLE NAMES qcollectiongenerator-qt5 qcollectiongenerator PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) +endif() ADD_CUSTOM_COMMAND( OUTPUT qterm.qhc DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qterm.qhcp DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qterm.qhp - COMMAND Qt5::qcollectiongenerator + COMMAND ${QT5_QCOLLECTIONGENERATOR_EXECUTABLE} ARGS qterm.qhcp -o qterm.qhc COMMENT "Compiling Qt help collection project qterm.qhcp"
