Hello community, here is the log from the commit of package qterm for openSUSE:Factory checked in at 2018-10-17 08:39:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qterm (Old) and /work/SRC/openSUSE:Factory/.qterm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qterm" Wed Oct 17 08:39:30 2018 rev:28 rq:641961 version:0.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qterm/qterm.changes 2018-06-20 15:33:12.278053892 +0200 +++ /work/SRC/openSUSE:Factory/.qterm.new/qterm.changes 2018-10-17 08:41:15.437863359 +0200 @@ -1,0 +2,7 @@ +Sun Oct 14 15:07:02 UTC 2018 - [email protected] + +- update to 0.7.3 +- drop patches: + qterm-fix-build-error.patch + +------------------------------------------------------------------- Old: ---- qterm-0.7.2.tar.gz qterm-fix-build-error.patch New: ---- qterm-0.7.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qterm.spec ++++++ --- /var/tmp/diff_new_pack.wrnelx/_old 2018-10-17 08:41:16.413862527 +0200 +++ /var/tmp/diff_new_pack.wrnelx/_new 2018-10-17 08:41:16.413862527 +0200 @@ -1,7 +1,7 @@ # # spec file for package qterm # -# 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 @@ -12,20 +12,19 @@ # 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: qterm -Version: 0.7.2 +Version: 0.7.3 Release: 0 Summary: QTerm is BBS client -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/X11/Terminals Url: https://github.com/qterm/qterm Source0: https://github.com/qterm/%{name}/archive/%{version}.tar.gz#./%{name}-%{version}.tar.gz Source1: qterm.desktop -Patch0: qterm-fix-build-error.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: hicolor-icon-theme @@ -46,7 +45,6 @@ %prep %setup -q -%patch0 -p1 %build %cmake -DQT5=YES ++++++ qterm-0.7.2.tar.gz -> qterm-0.7.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qterm-0.7.2/.appveyor.yml new/qterm-0.7.3/.appveyor.yml --- old/qterm-0.7.2/.appveyor.yml 2017-09-22 19:12:14.000000000 +0200 +++ new/qterm-0.7.3/.appveyor.yml 2018-07-30 16:31:50.000000000 +0200 @@ -1,28 +1,8 @@ version: '{branch}-{build}' +image: Visual Studio 2015 environment: matrix: - - QTDIR: C:\Qt\5.3\mingw482_32 - CMAKE_GENERATOR: "MinGW Makefiles" - MINGWDIR: C:\Qt\Tools\mingw482_32 - - QTDIR: C:\Qt\5.3\msvc2013_opengl - CMAKE_GENERATOR: "NMake Makefiles" - - QTDIR: C:\Qt\5.3\msvc2013_64_opengl - CMAKE_GENERATOR: "NMake Makefiles" - - QTDIR: C:\Qt\5.4\mingw491_32 - CMAKE_GENERATOR: "MinGW Makefiles" - MINGWDIR: C:\Qt\Tools\mingw491_32 - - QTDIR: C:\Qt\5.4\msvc2013_opengl - CMAKE_GENERATOR: "NMake Makefiles" - - QTDIR: C:\Qt\5.4\msvc2013_64_opengl - CMAKE_GENERATOR: "NMake Makefiles" - - QTDIR: C:\Qt\5.5\mingw492_32 - CMAKE_GENERATOR: "MinGW Makefiles" - MINGWDIR: C:\Qt\Tools\mingw492_32 - - QTDIR: C:\Qt\5.5\msvc2013 - CMAKE_GENERATOR: "NMake Makefiles" - - QTDIR: C:\Qt\5.5\msvc2013_64 - CMAKE_GENERATOR: "NMake Makefiles" - QTDIR: C:\Qt\5.6\mingw49_32 MINGWDIR: C:\Qt\Tools\mingw492_32 CMAKE_GENERATOR: "MinGW Makefiles" @@ -34,20 +14,36 @@ CMAKE_GENERATOR: "NMake Makefiles" - QTDIR: C:\Qt\5.6\msvc2015_64 CMAKE_GENERATOR: "NMake Makefiles" - - QTDIR: C:\Qt\5.7\mingw53_32 + - QTDIR: C:\Qt\5.7\msvc2015 + CMAKE_GENERATOR: "NMake Makefiles" + - QTDIR: C:\Qt\5.9\mingw53_32 + MINGWDIR: C:\Qt\Tools\mingw530_32 CMAKE_GENERATOR: "MinGW Makefiles" + - QTDIR: C:\Qt\5.9\msvc2015 + CMAKE_GENERATOR: "NMake Makefiles" + - QTDIR: C:\Qt\5.9\msvc2013_64 + CMAKE_GENERATOR: "NMake Makefiles" + - QTDIR: C:\Qt\5.9\msvc2015_64 + CMAKE_GENERATOR: "NMake Makefiles" + - QTDIR: C:\Qt\5.10\mingw53_32 MINGWDIR: C:\Qt\Tools\mingw530_32 - - QTDIR: C:\Qt\5.7\msvc2013 + CMAKE_GENERATOR: "MinGW Makefiles" + - QTDIR: C:\Qt\5.10\msvc2015 CMAKE_GENERATOR: "NMake Makefiles" - - QTDIR: C:\Qt\5.7\msvc2013_64 + - QTDIR: C:\Qt\5.10\msvc2013_64 CMAKE_GENERATOR: "NMake Makefiles" - - QTDIR: C:\Qt\5.7\msvc2015 + - QTDIR: C:\Qt\5.10\msvc2015_64 + CMAKE_GENERATOR: "NMake Makefiles" + - QTDIR: C:\Qt\5.11\mingw53_32 + MINGWDIR: C:\Qt\Tools\mingw530_32 + CMAKE_GENERATOR: "MinGW Makefiles" + - QTDIR: C:\Qt\5.11\msvc2015 CMAKE_GENERATOR: "NMake Makefiles" - - QTDIR: C:\Qt\5.7\msvc2015_64 + - QTDIR: C:\Qt\5.11\msvc2015_64 CMAKE_GENERATOR: "NMake Makefiles" install: - - '%QTDIR%\bin\qtenv2.bat' + - set PATH=%QTDIR%\bin;%MINGWDIR%\bin;%PATH% - qmake -v - if %QTDIR:_64=%==%QTDIR% ( set ARCH=x86 ) else set ARCH=x64 - if %QTDIR:_64=%==%QTDIR% ( set OPENSSL_ROOT_DIR=C:\OpenSSL-Win32 ) else set OPENSSL_ROOT_DIR=C:\OpenSSL-Win64 @@ -79,11 +75,11 @@ secure: wc0cFfZSLHWbW3W8FKqgVPHQfF0bV1l54wkpLcpsq4EuBliQdwfV+4JLnWuHBdr4 on: appveyor_repo_tag: true - QTDIR: C:\Qt\5.7\msvc2015_64 + QTDIR: C:\Qt\5.11\msvc2015_64 - provider: GitHub artifact: Win32Installer auth_token: secure: wc0cFfZSLHWbW3W8FKqgVPHQfF0bV1l54wkpLcpsq4EuBliQdwfV+4JLnWuHBdr4 on: appveyor_repo_tag: true - QTDIR: C:\Qt\5.7\msvc2015 + QTDIR: C:\Qt\5.11\msvc2015 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qterm-0.7.2/.travis.yml new/qterm-0.7.3/.travis.yml --- old/qterm-0.7.2/.travis.yml 2017-09-22 19:12:14.000000000 +0200 +++ new/qterm-0.7.3/.travis.yml 2018-07-30 16:31:50.000000000 +0200 @@ -12,22 +12,22 @@ env: - QT=5 BREW=5 - - QT=53 BREW=ex PPA=beineri/opt-qt532-trusty - - QT=54 BREW=ex PPA=beineri/opt-qt542-trusty - - QT=55 BREW=55 PPA=beineri/opt-qt551-trusty - QT=56 BREW=5 PPA=beineri/opt-qt562-trusty - - QT=57 BREW=ex PPA=beineri/opt-qt57-trusty + - QT=57 BREW=ex PPA=beineri/opt-qt571-trusty + - QT=58 BREW=ex PPA=beineri/opt-qt58-trusty + - QT=59 BREW=ex PPA=beineri/opt-qt593-trusty + - QT=510 BREW=@ex PPA=beineri/opt-qt-5.10.1-trusty matrix: exclude: - { os: linux, env: QT=5 BREW=5 } - - { os: osx, env: QT=51 BREW=ex PPA=beineri/opt-qt511-trusty } - - { os: osx, env: QT=52 BREW=ex PPA=beineri/opt-qt521-trusty } - - { os: osx, env: QT=53 BREW=ex PPA=beineri/opt-qt532-trusty } - - { os: osx, env: QT=54 BREW=ex PPA=beineri/opt-qt542-trusty } - - { os: osx, env: QT=57 BREW=ex PPA=beineri/opt-qt57-trusty } + - { os: osx, env: QT=57 BREW=ex PPA=beineri/opt-qt571-trusty } - { os: osx, compiler: gcc, env: QT=5 BREW=5 } # Qt 5.6 no longer supports gcc on OS X. - { os: osx, compiler: gcc, env: QT=56 BREW=5 PPA=beineri/opt-qt561-trusty } # Qt 5.6 no longer supports gcc on OS X. + - { os: osx, env: QT=57 BREW=ex PPA=beineri/opt-qt571-trusty } + - { os: osx, env: QT=58 BREW=ex PPA=beineri/opt-qt58-trusty } + - { os: osx, env: QT=59 BREW=ex PPA=beineri/opt-qt593-trusty } + - { os: osx, env: QT=510 BREW=@ex PPA=beineri/opt-qt-5.10.1-trusty } before_install: - '[[ "$TRAVIS_OS_NAME" != linux || -z "$PPA" ]] || sudo add-apt-repository -y ppa:$PPA' @@ -35,11 +35,11 @@ - '[ "$TRAVIS_OS_NAME" != osx ] || brew update' install: - - '[[ "$TRAVIS_OS_NAME" != linux || "$PPA" != */opt-* ]] || sudo apt-get -qy install qt$QT-meta-full' - - '[[ "$TRAVIS_OS_NAME" != linux || "$PPA" == */opt-* ]] || sudo apt-get -qy install qt5-qmake qtbase5-dev qttools5-dev qttools5-dev-tools qtscript5-dev qtmultimedia5-dev' - - '[ "$TRAVIS_OS_NAME" != osx ] || brew install qt$BREW' - - '[ "$TRAVIS_OS_NAME" != osx ] || brew link --force qt$BREW' - - '[ "$TRAVIS_OS_NAME" != osx ] || brew info openssl' + - '[[ "$TRAVIS_OS_NAME" != linux || "$PPA" != */opt-* ]] || travis_wait sudo apt-get -qy install qt$QT-meta-full' + - '[[ "$TRAVIS_OS_NAME" != linux || "$PPA" == */opt-* ]] || travis_wait sudo apt-get -qy install qt5-qmake qtbase5-dev qttools5-dev qttools5-dev-tools qtscript5-dev qtmultimedia5-dev' + - '[ "$TRAVIS_OS_NAME" != osx ] || travis_wait brew install qt$BREW' + - '[ "$TRAVIS_OS_NAME" != osx ] || travis_wait brew link --force qt$BREW' + - '[ "$TRAVIS_OS_NAME" != osx ] || travis_wait brew info openssl' script: - '[[ "$TRAVIS_OS_NAME" != linux || "$PPA" != */opt-* ]] || . /opt/qt$QT/bin/qt$QT-env.sh' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qterm-0.7.2/CMakeLists.txt new/qterm-0.7.3/CMakeLists.txt --- old/qterm-0.7.2/CMakeLists.txt 2017-09-22 19:12:14.000000000 +0200 +++ new/qterm-0.7.3/CMakeLists.txt 2018-07-30 16:31:50.000000000 +0200 @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR) set(QTERM_VERSION_MAJOR 0) set(QTERM_VERSION_MINOR 7) -set(QTERM_VERSION_RELEASE 2) +set(QTERM_VERSION_RELEASE 3) set(QTERM_VERSION "${QTERM_VERSION_MAJOR}.${QTERM_VERSION_MINOR}.${QTERM_VERSION_RELEASE}" ) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qterm-0.7.2/README.rst new/qterm-0.7.3/README.rst --- old/qterm-0.7.2/README.rst 2017-09-22 19:12:14.000000000 +0200 +++ new/qterm-0.7.3/README.rst 2018-07-30 16:31:50.000000000 +0200 @@ -67,7 +67,7 @@ To build on Linux or macOS, :: # Create the build directory side by side to qterm source directory - mdkir qterm-build + mkdir -p qterm-build && cd qterm-build # Using Qt4 cmake ../qterm # Using Qt5 @@ -101,7 +101,7 @@ License ------- -QTerm is released under GNU General Public License (refer to COPYING). +QTerm is released under GNU General Public License (refer to COPYRIGHT). Credits diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qterm-0.7.2/RELEASE_NOTES new/qterm-0.7.3/RELEASE_NOTES --- old/qterm-0.7.2/RELEASE_NOTES 2017-09-22 19:12:14.000000000 +0200 +++ new/qterm-0.7.3/RELEASE_NOTES 2018-07-30 16:31:50.000000000 +0200 @@ -1,3 +1,7 @@ +0.7.3 +===== +1. 修正在 Qt5.11 下的编译错误 + 0.7.2 ===== 1. 修正快速连接对话框里端口号限制 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qterm-0.7.2/src/imagelistviewer.cpp new/qterm-0.7.3/src/imagelistviewer.cpp --- old/qterm-0.7.2/src/imagelistviewer.cpp 2017-09-22 19:12:14.000000000 +0200 +++ new/qterm-0.7.3/src/imagelistviewer.cpp 2018-07-30 16:31:50.000000000 +0200 @@ -126,6 +126,8 @@ void ImageListViewer::viewImage(const QModelIndex &index) { + if (!index.isValid()) + return; QString filename = qvariant_cast<QString>(index.model()->data(index)); emit selectedFileChanged(filename); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qterm-0.7.2/src/keydialog.h new/qterm-0.7.3/src/keydialog.h --- old/qterm-0.7.2/src/keydialog.h 2017-09-22 19:12:14.000000000 +0200 +++ new/qterm-0.7.3/src/keydialog.h 2018-07-30 16:31:50.000000000 +0200 @@ -10,6 +10,8 @@ #ifndef KEYDIALOG_H #define KEYDIALOG_H +#include <QButtonGroup> + #include "ui_keydialog.h" namespace QTerm { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qterm-0.7.2/src/shortcutsdialog.cpp new/qterm-0.7.3/src/shortcutsdialog.cpp --- old/qterm-0.7.2/src/shortcutsdialog.cpp 2017-09-22 19:12:14.000000000 +0200 +++ new/qterm-0.7.3/src/shortcutsdialog.cpp 2018-07-30 16:31:50.000000000 +0200 @@ -3,6 +3,7 @@ #include <QKeyEvent> #include <QMessageBox> #include <QShortcut> +#include <QAction> namespace QTerm { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qterm-0.7.2/src/shortcutsdialog.h new/qterm-0.7.3/src/shortcutsdialog.h --- old/qterm-0.7.2/src/shortcutsdialog.h 2017-09-22 19:12:14.000000000 +0200 +++ new/qterm-0.7.3/src/shortcutsdialog.h 2018-07-30 16:31:50.000000000 +0200 @@ -3,6 +3,7 @@ #include "ui_shortcutsdialog.h" class QShortcut; +class QAction; namespace QTerm{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qterm-0.7.2/src/soundconf.h new/qterm-0.7.3/src/soundconf.h --- old/qterm-0.7.2/src/soundconf.h 2017-09-22 19:12:14.000000000 +0200 +++ new/qterm-0.7.3/src/soundconf.h 2018-07-30 16:31:50.000000000 +0200 @@ -1,6 +1,7 @@ #ifndef SOUNDCONF_H #define SOUNDCONF_H +#include <QButtonGroup> #include "ui_soundconf.h" namespace QTerm {
