diff --git a/clipit-1.4.4-config-item-member-fix.patch b/clipit-1.4.4-config-item-member-fix.patch new file mode 100644 index 0000000..54c3e72 --- /dev/null +++ b/clipit-1.4.4-config-item-member-fix.patch @@ -0,0 +1,54 @@ +From 99d1d57875c5672a1b22e6b8b10786f4ff5cea0b Mon Sep 17 00:00:00 2001 +From: Cristian Henzel +Date: Fri, 29 Jun 2018 14:00:56 +0300 +Subject: [PATCH] Fix bug introduced by "History purge timeout" + +--- + src/main.c | 34 ++++++++++++++++++++++++++-------- + 1 file changed, 26 insertions(+), 8 deletions(-) + +diff --git a/src/main.c b/src/main.c +index 7e485ec..e0e09ab 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -60,14 +60,32 @@ static gboolean status_menu_lock = FALSE; + static gboolean actions_lock = FALSE; + + /* Init preferences structure */ +-prefs_t prefs = {DEF_USE_COPY, DEF_USE_PRIMARY, DEF_SYNCHRONIZE, +- DEF_AUTOMATIC_PASTE, DEF_SHOW_INDEXES, DEF_SAVE_URIS, +- DEF_USE_RMB_MENU, DEF_SAVE_HISTORY, DEF_HISTORY_LIMIT, +- DEF_ITEMS_MENU, DEF_STATICS_SHOW, DEF_STATICS_ITEMS, +- DEF_HYPERLINKS_ONLY, DEF_CONFIRM_CLEAR, DEF_SINGLE_LINE, +- DEF_REVERSE_HISTORY, DEF_ITEM_LENGTH, DEF_ELLIPSIZE, +- INIT_HISTORY_KEY, INIT_ACTIONS_KEY, INIT_MENU_KEY, +- INIT_SEARCH_KEY, INIT_OFFLINE_KEY, DEF_NO_ICON, ++prefs_t prefs = {DEF_USE_COPY, ++ DEF_USE_PRIMARY, ++ DEF_SYNCHRONIZE, ++ DEF_AUTOMATIC_PASTE, ++ DEF_SHOW_INDEXES, ++ DEF_SAVE_URIS, ++ DEF_USE_RMB_MENU, ++ DEF_SAVE_HISTORY, ++ DEF_HISTORY_LIMIT, ++ DEF_HISTORY_TIMEOUT, ++ DEF_HISTORY_TIMEOUT_SECONDS, ++ DEF_ITEMS_MENU, ++ DEF_STATICS_SHOW, ++ DEF_STATICS_ITEMS, ++ DEF_HYPERLINKS_ONLY, ++ DEF_CONFIRM_CLEAR, ++ DEF_SINGLE_LINE, ++ DEF_REVERSE_HISTORY, ++ DEF_ITEM_LENGTH, ++ DEF_ELLIPSIZE, ++ INIT_HISTORY_KEY, ++ INIT_ACTIONS_KEY, ++ INIT_MENU_KEY, ++ INIT_SEARCH_KEY, ++ INIT_OFFLINE_KEY, ++ DEF_NO_ICON, + DEF_OFFLINE_MODE}; + + /* Variables for input buffer used for matching input to menu items */ diff --git a/clipit.spec b/clipit.spec index 34efb99..e80e76c 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,6 @@ Name: clipit Version: 1.4.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -11,6 +11,9 @@ Source1: %{name}.appdata.xml # Fixed upstream but not yet merged Patch0: 0001-Autostart-in-MATE.patch Patch1: 0002-Fix-starting-outside-terminal.patch +# Upstream: https://github.com/CristianHenzel/ClipIt/commit/99d1d57875c5672a1b22e6b8b10786f4ff5cea0b +# Fix bug introduced by "History purge timeout" +Patch2: clipit-1.4.4-config-item-member-fix.patch BuildRequires: gcc BuildRequires: make @@ -36,6 +39,7 @@ ClipIts main features are: %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build ./autogen.sh @@ -69,6 +73,9 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %changelog +* Fri Sep 11 2020 Mamoru TASAKA - 1.4.4-8 +- Backport upstream patch to fix history purge time being too short (bug 1640765) + * Mon Jul 27 2020 Fedora Release Engineering - 1.4.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild