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

AppLinkItem: Make genericName searchable.

Browse Source
This commit is contained in:
Simon Quigley 2018-02-05 20:28:09 -06:00
parent 07fe60523d
commit 5fd4576485
3 changed files with 55 additions and 0 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 @@
lxqt-runner (0.12.0-4ubuntu1) UNRELEASED; urgency=medium
* Cherry-pick an upstream commit because the upstream release cycle is
horribly slow:
- AppLinkItem: Make genericName searchable.
+ make-genericName-searchable.patch
+ Upstream commit c47a674.
-- Simon Quigley <tsimonq2@ubuntu.com> Mon, 05 Feb 2018 20:20:50 -0600
lxqt-runner (0.12.0-4) unstable; urgency=medium
* Bumped Standards to 4.1.2, no changes needed

43
debian/patches/make-genericName-searchable.patch vendored Normal file
View File

@ -0,0 +1,43 @@
Description: AppLinkItem: Make genericName searchable
Author: Palo Kisa <palo.kisa@gmail.com>
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);
}

2
debian/patches/series vendored Normal file
View File

@ -0,0 +1,2 @@
# Ubuntu-specific patches
make-genericName-searchable.patch