From f8568ee0eb3c5c61b41c60017dd9fc038ae51ba5 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sat, 14 May 2016 18:43:17 +0200 Subject: [PATCH] Cherry-picked snapshot: 0.6.0-55-gd572f39 switch package numbering to git describe instead of dates Remove patch, now integrated into upstream (Closes: #798053) Bump standards to 3.9.8 --- debian/changelog | 10 ++++++++++ debian/control | 4 ++-- debian/patches/kfreebsd.patch | 25 ------------------------- debian/patches/series | 1 - lib/SearchBar.cpp | 2 +- lib/Session.cpp | 19 ------------------- lib/Vt102Emulation.h | 4 ++-- lib/kpty.cpp | 8 ++++---- 8 files changed, 19 insertions(+), 54 deletions(-) delete mode 100644 debian/patches/kfreebsd.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 793cad0..4f80b09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +qtermwidget (0.6.0-55-gd572f39-1) unstable; urgency=medium + + * Cherry-picked snapshot: 0.6.0-55-gd572f39 + * switch package numbering to git describe instead of dates + * Remove patch, now integrated into upstream (Closes: #798053) + * Bump standards to 3.9.8 + + -- Alf Gaida Sat, 14 May 2016 18:09:02 +0200 + + qtermwidget (0.6.0+20160108-6) unstable; urgency=medium * Fix two whitespace bugs, which i've had by mistake introduced diff --git a/debian/control b/debian/control index 1b7afc2..12b8567 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Section: libs Priority: optional Build-Depends: debhelper (>= 9), cmake (>= 3.0.2), - qtbase5-dev, -Standards-Version: 3.9.7 + qtbase5-dev +Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/qtermwidget.git/?h=debian/sid Vcs-Git: https://anonscm.debian.org/cgit/pkg-lxqt/qtermwidget.git -b debian/sid Homepage: https://github.com/lxde/qtermwidget diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch deleted file mode 100644 index 94d60ab..0000000 --- a/debian/patches/kfreebsd.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: Add support for kFreeBSD to grass plugin. -Author: Bas Couwenberg -Bug-Debian: https://bugs.debian.org/824079 -Forwarded: https://github.com/qgis/QGIS/pull/3068 - ---- a/lib/kpty.cpp -+++ b/lib/kptypty.cpp -@@ -117,7 +117,7 @@ extern "C" { - # define _NEW_TTY_CTRL - #endif - --#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__) -+#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__) - # define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode) - #else - # if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__) -@@ -127,7 +127,7 @@ extern "C" { - # endif - #endif - --#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__) -+#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__) - # define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode) - #else - # if defined(_HPUX_SOURCE) || defined(__CYGWIN__) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 26238c9..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -kfreebsd.patch diff --git a/lib/SearchBar.cpp b/lib/SearchBar.cpp index 6ce4cd0..493f6ca 100644 --- a/lib/SearchBar.cpp +++ b/lib/SearchBar.cpp @@ -46,7 +46,7 @@ SearchBar::SearchBar(QWidget *parent) : QWidget(parent) m_useRegularExpressionMenuEntry->setCheckable(true); connect(m_useRegularExpressionMenuEntry, SIGNAL(toggled(bool)), this, SIGNAL(searchCriteriaChanged())); - m_highlightMatchesMenuEntry = optionsMenu->addAction(tr("Higlight all matches")); + m_highlightMatchesMenuEntry = optionsMenu->addAction(tr("Highlight all matches")); m_highlightMatchesMenuEntry->setCheckable(true); m_highlightMatchesMenuEntry->setChecked(true); connect(m_highlightMatchesMenuEntry, SIGNAL(toggled(bool)), this, SIGNAL(highlightMatchesChanged(bool))); diff --git a/lib/Session.cpp b/lib/Session.cpp index 42d93c3..f25d3d6 100644 --- a/lib/Session.cpp +++ b/lib/Session.cpp @@ -236,25 +236,9 @@ void Session::removeView(TerminalDisplay * widget) void Session::run() { - //check that everything is in place to run the session - if (_program.isEmpty()) { - qDebug() << "Session::run() - program to run not set."; - } - else { - qDebug() << "Session::run() - program:" << _program; - } - - if (_arguments.isEmpty()) { - qDebug() << "Session::run() - no command line arguments specified."; - } - else { - qDebug() << "Session::run() - arguments:" << _arguments; - } - // Upon a KPty error, there is no description on what that error was... // Check to see if the given program is executable. - /* ok iam not exactly sure where _program comes from - however it was set to /bin/bash on my system * Thats bad for BSD as its /usr/local/bin/bash there - its also bad for arch as its /usr/bin/bash there too! * So i added a check to see if /bin/bash exists - if no then we use $SHELL - if that does not exist either, we fall back to /bin/sh @@ -320,7 +304,6 @@ void Session::run() } _shellProcess->setWriteable(false); // We are reachable via kwrited. - qDebug() << "started!"; emit started(); } @@ -335,8 +318,6 @@ void Session::runEmptyPTY() _shellProcess, SLOT(sendData(const char *,int)) ); _shellProcess->setEmptyPTYProperties(); - - qDebug() << "started!"; emit started(); } diff --git a/lib/Vt102Emulation.h b/lib/Vt102Emulation.h index 2f235fc..af07675 100644 --- a/lib/Vt102Emulation.h +++ b/lib/Vt102Emulation.h @@ -95,8 +95,8 @@ public slots: virtual void sendText(const QString& text); virtual void sendKeyEvent(QKeyEvent*); virtual void sendMouseEvent(int buttons, int column, int line, int eventType); - virtual void focusLost() Q_DECL_OVERRIDE; - virtual void focusGained() Q_DECL_OVERRIDE; + virtual void focusLost(); + virtual void focusGained(); protected: // reimplemented from Emulation diff --git a/lib/kpty.cpp b/lib/kpty.cpp index 1039e00..fbcdb6c 100644 --- a/lib/kpty.cpp +++ b/lib/kpty.cpp @@ -117,20 +117,20 @@ extern "C" { # define _NEW_TTY_CTRL #endif -#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__) +#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__) # define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode) #else -# if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__) +# if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__) || defined(__GNU__) # define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode) # else # define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode) # endif #endif -#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__) +#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__) # define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode) #else -# if defined(_HPUX_SOURCE) || defined(__CYGWIN__) +# if defined(_HPUX_SOURCE) || defined(__CYGWIN__) || defined(__GNU__) # define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode) # else # define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)