From 5fd45764859ca1cedeff1f6739e08e647430a142 Mon Sep 17 00:00:00 2001
From: Simon Quigley <tsimonq2@ubuntu.com>
Date: Mon, 5 Feb 2018 20:28:09 -0600
Subject: [PATCH] AppLinkItem: Make genericName searchable.

---
 debian/changelog                              | 10 +++++
 .../patches/make-genericName-searchable.patch | 43 +++++++++++++++++++
 debian/patches/series                         |  2 +
 3 files changed, 55 insertions(+)
 create mode 100644 debian/patches/make-genericName-searchable.patch
 create mode 100644 debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index c2f8535..b8a4371 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/patches/make-genericName-searchable.patch b/debian/patches/make-genericName-searchable.patch
new file mode 100644
index 0000000..61a691b
--- /dev/null
+++ b/debian/patches/make-genericName-searchable.patch
@@ -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);
+ }
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..37cf70b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+# Ubuntu-specific patches
+make-genericName-searchable.patch