Add patch adapting to API changes in qtermwidget, and bump the dependencies accordingly.

This commit is contained in:
Simon Quigley 2018-07-10 21:48:04 -05:00
parent b0fb91bb84
commit c84b3f3e66
4 changed files with 23 additions and 1 deletions

2
debian/changelog vendored
View File

@ -1,6 +1,8 @@
qterminal (0.9.0-3ubuntu1) UNRELEASED; urgency=medium
* Update the maintainer and Vcs-* for maintaining in Lubuntu.
* Add patch adapting to API changes in qtermwidget, and bump the
dependencies accordingly.
-- Simon Quigley <tsimonq2@ubuntu.com> Tue, 10 Jul 2018 21:32:29 -0500

2
debian/control vendored
View File

@ -9,7 +9,7 @@ Section: x11
Priority: optional
Build-Depends: debhelper (>= 11~),
libkf5windowsystem-dev,
libqtermwidget5-0-dev (>= 0.9.0~),
libqtermwidget5-0-dev (>= 0.9.0-1ubuntu1),
libqt5svg5-dev,
libqt5x11extras5-dev,
libutf8proc-dev,

19
debian/patches/fix-memory-api.patch vendored Normal file
View File

@ -0,0 +1,19 @@
Description: Adapt to API changes
This adapts to API changes in qtermwidget which were made when fixing a
memory problem when right-clicking on links.
Author: Yen Chi Hsuan <yan12125@gmail.com>
Origin: upstream
Bug: https://github.com/lxqt/qterminal/issues/358
Applied-Upstream: commit:cbdb9e2
Last-Update: 2018-07-10
--- a/src/termwidget.cpp
+++ b/src/termwidget.cpp
@@ -137,7 +137,7 @@ void TermWidgetImpl::customContextMenuCa
QMenu menu;
QMap<QString, QAction*> actions = findParent<MainWindow>(this)->leaseActions();
- QList<QAction*> extraActions = filterActions(pos);
+ QList<QAction*> extraActions = filterActions(pos, &menu);
for (auto& action : extraActions)
{
menu.addAction(action);

View File

@ -1 +1,2 @@
appdata.patch
fix-memory-api.patch