Hello community, here is the log from the commit of package qmltermwidget for openSUSE:Factory checked in at 2020-06-22 17:46:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qmltermwidget (Old) and /work/SRC/openSUSE:Factory/.qmltermwidget.new.2956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qmltermwidget" Mon Jun 22 17:46:27 2020 rev:2 rq:816322 version:0.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qmltermwidget/qmltermwidget.changes 2019-02-26 22:18:22.602150698 +0100 +++ /work/SRC/openSUSE:Factory/.qmltermwidget.new.2956/qmltermwidget.changes 2020-06-22 17:46:30.825961419 +0200 @@ -1,0 +2,8 @@ +Sat Jun 13 14:26:26 UTC 2020 - Martin Hauke <mar...@gmx.de> + +- Add patches to fix Tumbleweed compilation issues: + * 0001-Fix-missing-includes-in-TerminalCharacterDecoder-27.patch + * 0004-Refix-CTRL-SPACE-behaviour-on-QT5.patch + * 0005-QMAKE_POST_LINK-doesn-t-work-in-Qt-5.5.-10.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-missing-includes-in-TerminalCharacterDecoder-27.patch 0004-Refix-CTRL-SPACE-behaviour-on-QT5.patch 0005-QMAKE_POST_LINK-doesn-t-work-in-Qt-5.5.-10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qmltermwidget.spec ++++++ --- /var/tmp/diff_new_pack.Vie6lU/_old 2020-06-22 17:46:31.433963326 +0200 +++ /var/tmp/diff_new_pack.Vie6lU/_new 2020-06-22 17:46:31.437963338 +0200 @@ -1,7 +1,7 @@ # # spec file for package qmltermwidget # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,9 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: qmltermwidget Version: 0.2.0 Release: 0 @@ -23,6 +24,9 @@ Group: Development/Libraries/C and C++ URL: https://github.com/Swordfish90/qmltermwidget Source: https://github.com/Swordfish90/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: 0001-Fix-missing-includes-in-TerminalCharacterDecoder-27.patch +Patch2: 0004-Refix-CTRL-SPACE-behaviour-on-QT5.patch +Patch3: 0005-QMAKE_POST_LINK-doesn-t-work-in-Qt-5.5.-10.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -35,7 +39,7 @@ using as a built-in console (or terminal emulation widget). %prep -%setup -q +%autosetup -p1 %build %qmake5 \ ++++++ 0001-Fix-missing-includes-in-TerminalCharacterDecoder-27.patch ++++++ >From 7c04df9884794b4be5c72ab8662298c92557098e Mon Sep 17 00:00:00 2001 From: suve <v...@svgames.pl> Date: Wed, 6 May 2020 16:37:40 +0200 Subject: [PATCH] Fix missing #includes in TerminalCharacterDecoder (#27) --- lib/TerminalCharacterDecoder.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/TerminalCharacterDecoder.cpp b/lib/TerminalCharacterDecoder.cpp index 579dedf..7ce8c78 100644 --- a/lib/TerminalCharacterDecoder.cpp +++ b/lib/TerminalCharacterDecoder.cpp @@ -22,6 +22,9 @@ // Own #include "TerminalCharacterDecoder.h" +// stdlib +#include <cwctype> + // Qt #include <QTextStream> -- 2.27.0 ++++++ 0004-Refix-CTRL-SPACE-behaviour-on-QT5.patch ++++++ >From 2233b6f998b2e8ca05761aaeefa59a77f3bf1b64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kent=20Engstr=C3=B6m?= <k...@nsc.liu.se> Date: Mon, 17 Jun 2019 11:15:17 +0200 Subject: [PATCH 4/5] Refix CTRL+SPACE behaviour on QT5. As per discussion in Swordfish90/cool-retro-term issue #165, revert later change back to the state after commit 490eeaf, "Fix CTRL+SPACE behaviour on QT5." --- lib/Vt102Emulation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Vt102Emulation.cpp b/lib/Vt102Emulation.cpp index 1d6998b..bd18ca4 100644 --- a/lib/Vt102Emulation.cpp +++ b/lib/Vt102Emulation.cpp @@ -1230,7 +1230,7 @@ void Vt102Emulation::sendKeyEvent( QKeyEvent* origEvent ) } else if ( !entry.text().isEmpty() ) { - textToSend += _codec->fromUnicode(QString::fromUtf8(entry.text(true,modifiers))); + textToSend += entry.text(true,modifiers); } else if((modifiers & Qt::ControlModifier) && event->key() >= 0x40 && event->key() < 0x5f) { textToSend += (event->key() & 0x1f); -- 2.27.0 ++++++ 0005-QMAKE_POST_LINK-doesn-t-work-in-Qt-5.5.-10.patch ++++++ >From e1b6ac5c6ca3db037127f6be2721fa902a1bbd81 Mon Sep 17 00:00:00 2001 From: Vadim Zhukov <persg...@gmail.com> Date: Wed, 6 May 2020 17:23:08 +0300 Subject: [PATCH 5/5] QMAKE_POST_LINK doesn't work in Qt 5.5. (#10) Replace QMAKE_POST_LINK with more extensive usage of INSTALLS. --- qmltermwidget.pro | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/qmltermwidget.pro b/qmltermwidget.pro index 128cb30..8b159b0 100644 --- a/qmltermwidget.pro +++ b/qmltermwidget.pro @@ -25,12 +25,6 @@ OTHER_FILES += \ test-app/test-app.qml \ src/qmldir -# Copy the files useful to the plugin in DESTDIR -QMAKE_POST_LINK = $(COPY_DIR) $$PWD/lib/color-schemes $$DESTDIR && \ - $(COPY_DIR) $$PWD/lib/kb-layouts $$DESTDIR && \ - $$QMAKE_COPY $$PWD/src/qmldir $$DESTDIR && \ - $$QMAKE_COPY $$PWD/src/QMLTermScrollbar.qml $$DESTDIR - ######################################### ## INTALLS ######################################### @@ -49,4 +43,17 @@ assets.path += $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH qmldir.files += $$PWD/src/qmldir qmldir.path += $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH -INSTALLS += target qmldir assets +colorschemes.files = $$PWD/lib/color-schemes/* +colorschemes.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH/color-schemes +colorschemes2.files = $$PWD/lib/color-schemes/historic/* +colorschemes2.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH/color-schemes/historic + +kblayouts.files = $$PWD/lib/kb-layouts/* +kblayouts.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH/kb-layouts +kblayouts2.files = $$PWD/lib/kb-layouts/historic/* +kblayouts2.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH/kb-layouts/historic + +scrollbar.files = $$PWD/src/QMLTermScrollbar.qml +scrollbar.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH + +INSTALLS += target qmldir assets colorschemes colorschemes2 kblayouts kblayouts2 scrollbar -- 2.27.0
