diff --git a/debian/changelog b/debian/changelog index 7824d63..5ce9a88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ qterminal (0.14.1-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. * Run wrap-and-sort. + * Drop fix-memory-api.patch, which causes crashes. -- Simon Quigley Sat, 09 Mar 2019 13:25:22 -0600 diff --git a/debian/patches/fix-memory-api.patch b/debian/patches/fix-memory-api.patch deleted file mode 100644 index 5629522..0000000 --- a/debian/patches/fix-memory-api.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 f9e1d23..28aed43 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ appdata.patch -fix-memory-api.patch