Hello community, here is the log from the commit of package cutecom for openSUSE:Factory checked in at 2018-06-19 11:55:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cutecom (Old) and /work/SRC/openSUSE:Factory/.cutecom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cutecom" Tue Jun 19 11:55:01 2018 rev:15 rq:615935 version:0.40.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cutecom/cutecom.changes 2017-08-16 16:14:12.389233137 +0200 +++ /work/SRC/openSUSE:Factory/.cutecom.new/cutecom.changes 2018-06-19 11:55:03.449203775 +0200 @@ -1,0 +2,5 @@ +Mon Jun 11 08:25:25 UTC 2018 - [email protected] + +- fix build with cmake >= 5.11 (68.patch) + +------------------------------------------------------------------- New: ---- 68.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cutecom.spec ++++++ --- /var/tmp/diff_new_pack.eRCcTu/_old 2018-06-19 11:55:04.461166205 +0200 +++ /var/tmp/diff_new_pack.eRCcTu/_new 2018-06-19 11:55:04.469165908 +0200 @@ -1,7 +1,7 @@ # # spec file for package cutecom # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -29,6 +29,8 @@ BuildRequires: libqt5-qtbase-devel BuildRequires: libqt5-qtserialport-devel Source: %{name}-%{version}.tgz +#PATCH-FIX-UPSTREAM cmake 5.11 fixes https://patch-diff.githubusercontent.com/raw/neundorf/CuteCom/pull/68.patch +Patch1: 68.patch %description CuteCom is a graphical serial terminal, similar to minicom. It is @@ -39,6 +41,7 @@ %prep %setup +%patch1 -p1 %build cmake . ++++++ 68.patch ++++++ >From 52a89101f5c0e3bea3654133058eceaf22e5a025 Mon Sep 17 00:00:00 2001 From: Javier Carnero <[email protected]> Date: Sun, 3 Jun 2018 12:05:29 +0200 Subject: [PATCH 1/2] Qt5>=5.11 build problem solved - Build autogenerated files to gitignore --- .gitignore | 10 +++++++++- CMakeLists.txt | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 645c8ba..b506b8e 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,12 @@ Makefile* *.qmlproject.user *.qmlproject.user.* - +# Build +CMakeCache.txt +CMakeFiles/* +CPackConfig.cmake +CPackSourceConfig.cmake +cmake_install.cmake +cutecom +cutecom.spec +cutecom_autogen/* diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ee53e5..1113dc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ set(CMAKE_AUTORCC ON) find_package(Qt5Widgets REQUIRED) find_package(Qt5Core REQUIRED) find_package(Qt5Gui REQUIRED) -#find_package(Serialport REQUIRED) +find_package(Qt5SerialPort REQUIRED) qt5_wrap_ui(uiHeaders controlpanel.ui mainwindow.ui statusbar.ui sessionmanager.ui searchpanel.ui) set(cutecomSrcs main.cpp mainwindow.cpp controlpanel.cpp devicecombo.cpp @@ -45,7 +45,7 @@ endif(APPLE) add_executable(cutecom ${exeType} ${cutecomSrcs} ${uiHeaders} resources.qrc) -qt5_use_modules(cutecom Core Gui Widgets SerialPort) +target_link_libraries(cutecom Qt5::Core Qt5::Gui Qt5::Widgets Qt5::SerialPort) if (APPLE) set_target_properties(cutecom PROPERTIES OUTPUT_NAME CuteCom)
