diff --git a/debian/changelog b/debian/changelog index 7cb1496..a1f29f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ lxqt-runner (0.13.0-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. * Update build dependencies. + * Remove patches applied upstream. -- Simon Quigley Wed, 23 May 2018 22:31:54 -0500 diff --git a/debian/patches/make-genericName-searchable.patch b/debian/patches/make-genericName-searchable.patch deleted file mode 100644 index 61a691b..0000000 --- a/debian/patches/make-genericName-searchable.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: AppLinkItem: Make genericName searchable -Author: Palo Kisa -Origin: backport -Bug: https://github.com/lxde/lxqt/issues/1278 -Applied-Upstream: commit:c47a674 -Last-Update: 2018-02-05 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,7 +8,7 @@ set(CMAKE_AUTOUIC ON) - set(CMAKE_AUTOMOC ON) - set(CMAKE_AUTORCC ON) - --set(REQUIRED_MENUCACHE_VERSION "0.3.3") -+set(REQUIRED_MENUCACHE_VERSION "1.1.0") - - include(CMakeDependentOption) - include(GNUInstallDirs) ---- a/providers.cpp -+++ b/providers.cpp -@@ -192,8 +192,8 @@ AppLinkItem::AppLinkItem(MenuCacheApp* a - MenuCacheItem* item = MENU_CACHE_ITEM(app); - mIconName = QString::fromUtf8(menu_cache_item_get_icon(item)); - mTitle = QString::fromUtf8(menu_cache_item_get_name(item)); -- mComment = QString::fromUtf8(menu_cache_item_get_comment(item)); -- mToolTip = mComment; -+ mComment = QString::fromUtf8(menu_cache_app_get_generic_name(app)); -+ mToolTip = QString::fromUtf8(menu_cache_item_get_comment(item)); - mCommand = menu_cache_app_get_exec(app); - mProgram = QFileInfo(mCommand).baseName().section(" ", 0, 0); - char* path = menu_cache_item_get_file_path(MENU_CACHE_ITEM(app)); -@@ -271,8 +271,10 @@ bool AppLinkItem::compare(const QRegExp - if (regExp.isEmpty()) - return false; - -- return mProgram.contains(regExp) || -- mTitle.contains(regExp) ; -+ return mProgram.contains(regExp) -+ || mTitle.contains(regExp) -+ || mComment.contains(regExp) -+ || mToolTip.contains(regExp); - } - - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 37cf70b..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -# Ubuntu-specific patches -make-genericName-searchable.patch