diff --git a/debian/changelog b/debian/changelog index 90eda15..af08704 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Tue, 10 Jul 2018 21:32:29 -0500 diff --git a/debian/control b/debian/control index 1e4596d..3cd8345 100644 --- a/debian/control +++ b/debian/control @@ -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, diff --git a/debian/patches/fix-memory-api.patch b/debian/patches/fix-memory-api.patch new file mode 100644 index 0000000..5629522 --- /dev/null +++ b/debian/patches/fix-memory-api.patch @@ -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 +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 actions = findParent(this)->leaseActions(); + +- QList extraActions = filterActions(pos); ++ QList extraActions = filterActions(pos, &menu); + for (auto& action : extraActions) + { + menu.addAction(action); diff --git a/debian/patches/series b/debian/patches/series index 28aed43..f9e1d23 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ appdata.patch +fix-memory-api.patch