Lubuntu/qtermwidget-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cherry-picked snapshot: 0.6.0-55-gd572f39

Browse Source 
switch package numbering to git describe instead of dates
Remove patch, now integrated into upstream (Closes: #798053)
Bump standards to 3.9.8
This commit is contained in:
Alf Gaida 2016-05-14 18:43:17 +02:00
parent cbcb87d24e
commit f8568ee0eb
8 changed files with 19 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -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 <agaida@siduction.org> 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

4
debian/control vendored
View File

@ -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

25
debian/patches/kfreebsd.patch vendored
View File

@ -1,25 +0,0 @@
Description: Add support for kFreeBSD to grass plugin.
Author: Bas Couwenberg <sebastic@debian.org>
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__)

1
debian/patches/series vendored
View File

@ -1 +0,0 @@
kfreebsd.patch

2
lib/SearchBar.cpp
View File

@ -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)));

19
lib/Session.cpp
View File

@ -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();
}

4
lib/Vt102Emulation.h
View File

@ -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

8
lib/kpty.cpp
View File

@ -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)