!13 Revert avoid saving duplicate command changes

From: @misaka00251 
Reviewed-by: @zhang__3125 
Signed-off-by: @zhang__3125

README.en.md

@@ -1,36 +0,0 @@
-# xfce4-appfinder
-
-#### Description
-Appfinder for the Xfce4 Desktop Environment
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

README.md

@@ -1,37 +0,0 @@
-# xfce4-appfinder
-
-#### 介绍
-Appfinder for the Xfce4 Desktop Environment
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
-
-
-#### 码云特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5.  码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

revert-avoid-saving-duplicate-command.patch

@@ -0,0 +1,31 @@
+diff --git a/src/appfinder-model.c b/src/appfinder-model.c
+index 9357fc9..b10490a 100644
+--- a/src/appfinder-model.c
++++ b/src/appfinder-model.c
+@@ -917,17 +917,6 @@ xfce_appfinder_model_item_compare (gconstpointer a,
+ 
+ 
+ 
+-static gint
+-xfce_appfinder_model_item_compare_command (gconstpointer a,
+-                                           gconstpointer b)
+-{
+-  const ModelItem *item_a = a, *item_b = b;
+-
+-  return g_utf8_collate (item_a->command, item_b->command);
+-}
+-
+-
+-
+ static gchar *
+ xfce_appfinder_model_item_key (GarconMenuItem *item)
+ {
+@@ -1188,7 +1177,7 @@ xfce_appfinder_model_history_insert (XfceAppfinderModel *model,
+   /* add new command */
+   item = g_slice_new0 (ModelItem);
+   item->command = g_strdup (command);
+-  if (g_slist_find_custom (model->items, item, xfce_appfinder_model_item_compare_command) != NULL)
++  if (g_slist_find_custom (model->items, item, xfce_appfinder_model_item_compare) != NULL)
+     {
+        APPFINDER_DEBUG ("Skip adding %s to the model as it's already contained.", command);
+        g_slice_free (ModelItem, item);

use-correct-model-when-running-from-commands-history.patch

@@ -0,0 +1,13 @@
+diff --git a/src/appfinder-window.c b/src/appfinder-window.c
+index 0c39c176fb9bd699a451b2df2c2dcd67ed327858..e4c2a139a153baecb3c7f11d9fff8821bc743ed2 100644
+--- a/src/appfinder-window.c
++++ b/src/appfinder-window.c
+@@ -1925,7 +1925,7 @@ xfce_appfinder_window_execute (XfceAppfinderWindow *window,
+           xfce_appfinder_window_update_frecency (window, model, uri);
+           if (!result && regular_command)
+             {
+-              gtk_tree_model_get (model, &child_iter, XFCE_APPFINDER_MODEL_COLUMN_COMMAND, &cmd, -1);
++              gtk_tree_model_get (GTK_TREE_MODEL (window->model), &child_iter, XFCE_APPFINDER_MODEL_COLUMN_COMMAND, &cmd, -1);
+               result = xfce_appfinder_window_execute_command (cmd, screen, window, FALSE, NULL, &error);
+               g_free (cmd);
+             }

xfce4-appfinder.spec

@@ -1,33 +1,37 @@
-%global xfceversion 4.14
+%global xfceversion 4.18
+
 Name:           xfce4-appfinder
-Version:        4.14.0
-Release:        2
-Summary:        Application finder for the Xfce4 desktop environment
+Version:        4.18.0
+Release:        3
+Summary:        Appfinder for the Xfce4 Desktop Environment
+
 License:        GPLv2+
-#Group:          Development/Libraries
 URL:            http://www.xfce.org/
 Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#BuildArch:      noarch
+
+Patch0:         use-correct-model-when-running-from-commands-history.patch
+Patch1:         revert-avoid-saving-duplicate-command.patch
+
+BuildRequires:  make
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig(dbus-glib-1) >= 0.84
 BuildRequires:  pkgconfig(garcon-1) >= 0.1.7
-BuildRequires:  pkgconfig(libxfce4ui-1) >= %{xfceversion}
+BuildRequires:  pkgconfig(libxfce4ui-2) >= %{xfceversion}
 BuildRequires:  pkgconfig(libxfconf-0) >= %{xfceversion}
-BuildRequires:  desktop-file-utils
+BuildRequires:  startup-notification-devel
 BuildRequires:  gettext 
 BuildRequires:  intltool
+BuildRequires:  desktop-file-utils
 BuildRequires:  libappstream-glib
-BuildRequires:  startup-notification-devel
 
 %description
-xfce-appfinder will search for installed applications on your system. It can also be used
-to browse installed applications by category, run them or edit their launchers.
-xfce4-appfinder can also be used with a shortcut command to quickly run applications, 
-and also supports custom prefixes to execute custom commands on provided paramers.
+xfce-appfinder shows system wide installed applications.
+
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 # fix icon problems - GTK-3.10+
 sed -i 's/gtk-find/edit-find/g' data/xfce4-appfinder.desktop.in
@@ -41,6 +45,7 @@ sed -i 's/gtk-execute/system-run/g' data/xfce4-run.desktop.in
 %install
 %make_install
 
+
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 desktop-file-validate %{buildroot}%{_datadir}/applications/xfce4-run.desktop
 
@@ -48,14 +53,28 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.xfce.%{nam
 
 %find_lang %{name}
 
+
 %files -f %{name}.lang
 %license COPYING
-%doc README TODO ChangeLog AUTHORS
+%doc TODO ChangeLog AUTHORS
 %{_bindir}/xfce4-appfinder
 %{_bindir}/xfrun4
 %{_datadir}/applications/xfce4-*.desktop
+%{_datadir}/icons/hicolor/*/apps/org.xfce.appfinder*
 %{_metainfodir}/org.xfce.%{name}.appdata.xml
 
 %changelog
+* Fri Feb 03 2023 misaka00251 <liuxin@iscas.ac.cn> - 4.18.0-3
+- Revert avoid saving duplicate command changes
+
+* Fri Jan 13 2023 misaka00251 <liuxin@iscas.ac.cn> - 4.18.0-2
+- Add upstream patch to fix command history segmentation fault
+
+* Wed Jan 04 2023 misaka00251 <liuxin@iscas.ac.cn> - 4.18.0-1
+- Update to 4.18.0
+
+* Fri Jun 18 2021 zhanglin <lin.zhang@turbolinux.com.cn> - 4.16.0-1
+- Update to 4.16.0
+
 * Sun Jul 12 2020 Dillon Chen <dillon.chen@turbolinux.com.cn> - 4.14.0-1
 - Init package

xfce4-appfinder.yaml

@@ -1,4 +1,4 @@
 version_control: git
-src_repo: 
+src_repo: https://gitlab.xfce.org/xfce/xfce4-appfinder.git
 tag_prefix: "xfce4-appfinder-"
 seperator: "."