From f0952b6ce182351a2fa53ea9a1f572c8e9af75ef Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 14 Dec 2022 18:29:56 +0100 Subject: [PATCH 01/16] C99 compatibility fixes Related to: --- clipit-c99.patch | 31 +++++++++++++++++++++++++++++++ clipit.spec | 8 ++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 clipit-c99.patch diff --git a/clipit-c99.patch b/clipit-c99.patch new file mode 100644 index 0000000..70b1102 --- /dev/null +++ b/clipit-c99.patch @@ -0,0 +1,31 @@ +C99 removed implicit function declarations. Include for +the umask function, and init_history_timeout_timer because it is used +in main.c. + +Submitted upstream: + +diff --git a/src/main.c b/src/main.c +index 148753b..089cf39 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + + #define ICON "clipit-trayicon" + #define ICON_OFFLINE "clipit-trayicon-offline" +diff --git a/src/preferences.h b/src/preferences.h +index b022839..2dd0d28 100644 +--- a/src/preferences.h ++++ b/src/preferences.h +@@ -80,6 +80,8 @@ void show_preferences(gint tab); + + void init_purge_timer(); + ++void init_history_timeout_timer(); ++ + G_END_DECLS + + #endif diff --git a/clipit.spec b/clipit.spec index f04b8e0..eeecd57 100644 --- a/clipit.spec +++ b/clipit.spec @@ -26,7 +26,7 @@ Name: clipit Version: %{main_ver} -Release: %{rel}.2 +Release: %{rel}.3 Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -42,7 +42,7 @@ Source1: %{name}.appdata.xml Patch0: 0001-Autostart-in-MATE.patch # Force GDK_BACKEND to x11 Patch1: clipit-1.4.5-force-gdk_backend-x11.patch - +Patch2: clipit-c99.patch %if 0%{?use_gitbare} >= 1 BuildRequires: git @@ -87,6 +87,7 @@ git config user.email "%{name}-maintainer@fedoraproject.org" %patch0 -p1 -b .mate %patch1 -p1 -b .nowayland +%patch2 -p1 sed -i data/clipit.desktop.in -e '\@_Comment.*hr@d' sed -i data/clipit-startup.desktop.in -e '\@_Comment.*hr@d' @@ -150,6 +151,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Wed Dec 14 2022 Florian Weimer - 1.4.5-4.D20210513gite5fa64c.3 +- C99 compatibility fixes + * Wed Jul 20 2022 Fedora Release Engineering - 1.4.5-4.D20210513gite5fa64c.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 4038baf452537458811ddb08124fbb5161421d76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:01:11 +0000 Subject: [PATCH 02/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index eeecd57..7e2b466 100644 --- a/clipit.spec +++ b/clipit.spec @@ -26,7 +26,7 @@ Name: clipit Version: %{main_ver} -Release: %{rel}.3 +Release: %{rel}.4 Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -151,6 +151,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.4.5-4.D20210513gite5fa64c.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Dec 14 2022 Florian Weimer - 1.4.5-4.D20210513gite5fa64c.3 - C99 compatibility fixes From c1140b63b34a48ad6b3adbb5727df8956a0c6706 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 15:51:43 +0000 Subject: [PATCH 03/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 7e2b466..40570e0 100644 --- a/clipit.spec +++ b/clipit.spec @@ -26,7 +26,7 @@ Name: clipit Version: %{main_ver} -Release: %{rel}.4 +Release: %{rel}.5 Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ @@ -151,6 +151,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.4.5-4.D20210513gite5fa64c.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 1.4.5-4.D20210513gite5fa64c.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 62a2e50e3f267acf01d6afe15f219185eda0bd29 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 10 Jan 2024 23:37:13 +0900 Subject: [PATCH 04/16] use hat for version --- clipit.spec | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/clipit.spec b/clipit.spec index 40570e0..bd1e394 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,5 +1,4 @@ %global main_ver 1.4.5 -%global vendor_rel 4 %global reponame ClipIt %global gitdate 20210513 @@ -10,30 +9,33 @@ %global tarballtime 1754 %global use_release 0 -%global use_gitbare 1 -%global use_gitcommit_as_rel 1 +%global use_gitbare 1 +%global use_gitcommit_as_ver 1 %if 0%{?use_gitbare} < 1 %global use_release 1 %endif -%if 0%{?use_gitcommit_as_rel} >= 1 -%global rel %{vendor_rel}.D%{gitdate}git%{shortcommit}%{?dist} +%if 0%{?use_gitcommit_as_ver} >= 1 +%global rpm_ver %{main_ver}^%{gitdate}git%{shortcommit} +%global builddir_ver %{main_ver}-%{gitdate}git%{shortcommit} %else -%define rel %{vendor_rel}%{?dist} +%define rpmver %{main_ver} +%global builddir_ver %{main_ver} %endif Name: clipit -Version: %{main_ver} -Release: %{rel}.5 +Version: %{rpm_ver} +Release: 0.100%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager License: GPLv3+ URL: https://github.com/CristianHenzel/ClipIt %if 0%{?use_release} >= 1 Source0: https://github.com/CristianHenzel/ClipIt/archive/v%{version}.tar.gz -%else +%endif +%if 0%{?use_gitbare} >= 1 Source0: %{reponame}-%{tarballdate}T%{tarballtime}.tar.gz %endif Source1: %{name}.appdata.xml @@ -54,7 +56,7 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: desktop-file-utils BuildRequires: intltool BuildRequires: gettext -BuildRequires: %{_bindir}/appstream-util +BuildRequires: /usr/bin/appstream-util Requires: xdotool %description @@ -70,24 +72,24 @@ ClipIts main features are: %prep %if 0%{?use_release} >= 1 -%setup -q -n %{reponame}-%{version} +%setup -q -n %{reponame}-%{builddir_ver} %endif %if 0%{?use_gitbare} >= 1 -%setup -q -c -T -a 0 +%setup -q -c -n %{reponame}-%{builddir_ver} -T -a 0 git clone ./%{reponame}.git cd %{reponame} -git checkout -b fedora-%{version}-head %{gitcommit} +git checkout -b fedora-%{builddir_ver}-head %{gitcommit} cp -a [A-Z]* .. git config user.name "%{name} Fedora maintainer" -git config user.email "%{name}-maintainer@fedoraproject.org" +git config user.email "%{name}-maintainers@fedoraproject.org" %endif -%patch0 -p1 -b .mate -%patch1 -p1 -b .nowayland -%patch2 -p1 +%patch -P0 -p1 -b .mate +%patch -P1 -p1 -b .nowayland +%patch -P2 -p1 -b .c99 sed -i data/clipit.desktop.in -e '\@_Comment.*hr@d' sed -i data/clipit-startup.desktop.in -e '\@_Comment.*hr@d' From e15b5bf1aaf666f152af5a854b5971e1f4df7e75 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 10 Jan 2024 23:45:55 +0900 Subject: [PATCH 05/16] SPDX migration --- clipit.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/clipit.spec b/clipit.spec index bd1e394..2cbaaec 100644 --- a/clipit.spec +++ b/clipit.spec @@ -27,10 +27,15 @@ Name: clipit Version: %{rpm_ver} -Release: 0.100%{?dist} +Release: 1%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager -License: GPLv3+ +# meson.build says: GPL-3.0-or-later +# src/eggaccelerators.{c,h} LGPL-2.1-or-later +# src/keybinder.{c,h} LGPL-2.1-or-later +# Other source GPL-3.0-or-later +# SPDX confirmed +License: GPL-3.0-or-later AND LGPL-2.1-or-later URL: https://github.com/CristianHenzel/ClipIt %if 0%{?use_release} >= 1 Source0: https://github.com/CristianHenzel/ClipIt/archive/v%{version}.tar.gz @@ -153,6 +158,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Wed Jan 10 2024 Mamoru TASAKA - 1.4.5^20210513gite5fa64c-1 +- Use hat for release, change EVR scheme +- SPDX migration + * Wed Jul 19 2023 Fedora Release Engineering - 1.4.5-4.D20210513gite5fa64c.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From cdef40be188ac691ac691d718b237dc5a6e76ebf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 19 Jan 2024 16:54:51 +0900 Subject: [PATCH 06/16] Change -Wincompatible-pointer-types from error to warning --- clipit.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 2cbaaec..559250b 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,3 +1,6 @@ +# Skip -Werror=incompatilbe-pointer-types +%global build_type_safety_c 2 + %global main_ver 1.4.5 %global reponame ClipIt @@ -27,7 +30,7 @@ Name: clipit Version: %{rpm_ver} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -158,6 +161,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Fri Jan 19 2024 Mamoru TASAKA - 1.4.5^20210513gite5fa64c-2 +- Change -Wincompatible-pointer-types from error to warning + * Wed Jan 10 2024 Mamoru TASAKA - 1.4.5^20210513gite5fa64c-1 - Use hat for release, change EVR scheme - SPDX migration From 478b6fc4641ed014e58fd9328c57e3548c907a41 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 15:38:55 +0000 Subject: [PATCH 07/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 559250b..da27b04 100644 --- a/clipit.spec +++ b/clipit.spec @@ -30,7 +30,7 @@ Name: clipit Version: %{rpm_ver} -Release: 2%{?dist} +Release: 3%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -161,6 +161,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Mamoru TASAKA - 1.4.5^20210513gite5fa64c-2 - Change -Wincompatible-pointer-types from error to warning From aae53c002bc7db4ca76e7b3b07231eff0ff403b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 07:26:37 +0000 Subject: [PATCH 08/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index da27b04..6940458 100644 --- a/clipit.spec +++ b/clipit.spec @@ -30,7 +30,7 @@ Name: clipit Version: %{rpm_ver} -Release: 3%{?dist} +Release: 4%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -161,6 +161,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ea4fd3ff9338ddabc05e2907e978985bc48d46a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 19:28:16 +0000 Subject: [PATCH 09/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 6940458..5d1cad8 100644 --- a/clipit.spec +++ b/clipit.spec @@ -30,7 +30,7 @@ Name: clipit Version: %{rpm_ver} -Release: 4%{?dist} +Release: 5%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -161,6 +161,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0753dfca12f32a588d04912491b5dba07dc1a5b0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 8 Oct 2024 11:57:38 +0900 Subject: [PATCH 10/16] Apply debian patch for -Werror=incompatible-pointer-types --- clipit.spec | 11 +++-- incompatible-pointer-types.patch | 79 ++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 incompatible-pointer-types.patch diff --git a/clipit.spec b/clipit.spec index 5d1cad8..2105554 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,6 +1,3 @@ -# Skip -Werror=incompatilbe-pointer-types -%global build_type_safety_c 2 - %global main_ver 1.4.5 %global reponame ClipIt @@ -30,7 +27,7 @@ Name: clipit Version: %{rpm_ver} -Release: 5%{?dist} +Release: 6%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -53,6 +50,8 @@ Patch0: 0001-Autostart-in-MATE.patch # Force GDK_BACKEND to x11 Patch1: clipit-1.4.5-force-gdk_backend-x11.patch Patch2: clipit-c99.patch +# Fix -Werror=incompatible-pointer-types +Patch3: https://sources.debian.org/data/main/c/clipit/1.4.5%2Bgit20210313-3/debian/patches/incompatible-pointer-types.patch %if 0%{?use_gitbare} >= 1 BuildRequires: git @@ -98,6 +97,7 @@ git config user.email "%{name}-maintainers@fedoraproject.org" %patch -P0 -p1 -b .mate %patch -P1 -p1 -b .nowayland %patch -P2 -p1 -b .c99 +%patch -P3 -p1 -b .c99_cast sed -i data/clipit.desktop.in -e '\@_Comment.*hr@d' sed -i data/clipit-startup.desktop.in -e '\@_Comment.*hr@d' @@ -161,6 +161,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Tue Oct 08 2024 Mamoru TASAKA - 1.4.5^20210513gite5fa64c-6 +- Apply debian patch for -Werror=incompatible-pointer-types + * Wed Jul 17 2024 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/incompatible-pointer-types.patch b/incompatible-pointer-types.patch new file mode 100644 index 0000000..71e52ed --- /dev/null +++ b/incompatible-pointer-types.patch @@ -0,0 +1,79 @@ +Author: Andreas Beckmann +Description: fix building with -Werror=incompatible-pointer-types + +--- a/src/keybinder.c ++++ b/src/keybinder.c +@@ -310,7 +310,7 @@ keybinder_is_modifier (guint keycode) + gboolean retval = FALSE; + + mod_keymap = XGetModifierMapping ( +- GDK_WINDOW_XDISPLAY(gdk_display_get_default())); ++ GDK_DISPLAY_XDISPLAY(gdk_display_get_default())); + + map_size = 8 * mod_keymap->max_keypermod; + +--- a/src/main.c ++++ b/src/main.c +@@ -614,7 +614,7 @@ void underline_match(char* match, GtkMen + PangoAttrList* attr_list = pango_attr_list_new(); + pango_attr_list_insert (attr_list, underline); + +- GtkWidget* gtk_label = gtk_bin_get_child (GTK_BIN (menu_item)); ++ GtkLabel* gtk_label = (GtkLabel *) gtk_bin_get_child (GTK_BIN (menu_item)); + gtk_label_set_attributes (gtk_label, attr_list); + } + +@@ -638,7 +638,7 @@ gboolean selected_by_input(const GtkWidg + append_to_input_buffer(event->string); + + GtkMenuShell* menu = (GtkMenuShell *) history_menu; +- GList* element = gtk_container_get_children(menu); ++ GList* element = gtk_container_get_children((GtkContainer *) menu); + GtkMenuItem *menu_item, *first_match = 0; + + const gchar* menu_label; +@@ -657,9 +657,9 @@ gboolean selected_by_input(const GtkWidg + first_match = menu_item; + match_count++; + underline_match(match, menu_item, menu_label); +- gtk_widget_set_sensitive(menu_item, true); ++ gtk_widget_set_sensitive((GtkWidget *) menu_item, true); + } else { +- gtk_widget_set_sensitive(menu_item, false); ++ gtk_widget_set_sensitive((GtkWidget *) menu_item, false); + } + element = element->next; + count++; +@@ -667,7 +667,7 @@ gboolean selected_by_input(const GtkWidg + + if (first_match && match_count != prefs.items_menu) { + gtk_menu_item_select(first_match); +- gtk_menu_shell_select_item(menu, first_match); ++ gtk_menu_shell_select_item(menu, (GtkWidget *) first_match); + return TRUE; + } + return FALSE; +--- a/src/preferences.c ++++ b/src/preferences.c +@@ -723,7 +723,7 @@ void show_preferences(gint tab) { + *alignment, *hbox, + *vbox; + +- GtkWidget *adjustment, *adjustment_small, *adjustment_statics; ++ GtkAdjustment *adjustment, *adjustment_small, *adjustment_statics; + GtkTreeViewColumn *tree_column; + + /* Create the dialog */ +@@ -898,9 +898,9 @@ void show_preferences(gint tab) { + gtk_misc_set_alignment((GtkMisc*)label, 0.0, 0.50); + gtk_box_pack_start((GtkBox*)hbox, label, FALSE, FALSE, 0); + ellipsize_combo = gtk_combo_box_text_new(); +- gtk_combo_box_text_append_text((GtkComboBox*)ellipsize_combo, _("Beginning")); +- gtk_combo_box_text_append_text((GtkComboBox*)ellipsize_combo, _("Middle")); +- gtk_combo_box_text_append_text((GtkComboBox*)ellipsize_combo, _("End")); ++ gtk_combo_box_text_append_text((GtkComboBoxText*)ellipsize_combo, _("Beginning")); ++ gtk_combo_box_text_append_text((GtkComboBoxText*)ellipsize_combo, _("Middle")); ++ gtk_combo_box_text_append_text((GtkComboBoxText*)ellipsize_combo, _("End")); + gtk_box_pack_start((GtkBox*)hbox, ellipsize_combo, FALSE, FALSE, 0); + gtk_box_pack_start((GtkBox*)vbox_history, frame, FALSE, FALSE, 0); + From e9038589fd259665818eced264fb12258505710f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 13:55:45 +0000 Subject: [PATCH 11/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index 2105554..4ad0eeb 100644 --- a/clipit.spec +++ b/clipit.spec @@ -27,7 +27,7 @@ Name: clipit Version: %{rpm_ver} -Release: 6%{?dist} +Release: 7%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -161,6 +161,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Oct 08 2024 Mamoru TASAKA - 1.4.5^20210513gite5fa64c-6 - Apply debian patch for -Werror=incompatible-pointer-types From 63a87183c6feeebff3e80d9a949f0202316ab36c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 17 Jan 2025 00:07:05 +0900 Subject: [PATCH 12/16] Update to the latest git (20241103gitf35db54) --- clipit-c99.patch | 31 ------------------------------- clipit.spec | 16 +++++++++------- 2 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 clipit-c99.patch diff --git a/clipit-c99.patch b/clipit-c99.patch deleted file mode 100644 index 70b1102..0000000 --- a/clipit-c99.patch +++ /dev/null @@ -1,31 +0,0 @@ -C99 removed implicit function declarations. Include for -the umask function, and init_history_timeout_timer because it is used -in main.c. - -Submitted upstream: - -diff --git a/src/main.c b/src/main.c -index 148753b..089cf39 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - - #define ICON "clipit-trayicon" - #define ICON_OFFLINE "clipit-trayicon-offline" -diff --git a/src/preferences.h b/src/preferences.h -index b022839..2dd0d28 100644 ---- a/src/preferences.h -+++ b/src/preferences.h -@@ -80,6 +80,8 @@ void show_preferences(gint tab); - - void init_purge_timer(); - -+void init_history_timeout_timer(); -+ - G_END_DECLS - - #endif diff --git a/clipit.spec b/clipit.spec index 4ad0eeb..cf296f0 100644 --- a/clipit.spec +++ b/clipit.spec @@ -1,12 +1,12 @@ %global main_ver 1.4.5 %global reponame ClipIt -%global gitdate 20210513 -%global gitcommit e5fa64c216c1b02a43cb3c90e8a151e43e881d96 +%global gitdate 20241103 +%global gitcommit f35db540c9d3c57b13439d66597736e917e8c9a1 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global tarballdate 20210922 -%global tarballtime 1754 +%global tarballdate 20250116 +%global tarballtime 2347 %global use_release 0 %global use_gitbare 1 @@ -27,7 +27,7 @@ Name: clipit Version: %{rpm_ver} -Release: 7%{?dist} +Release: 1%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -44,12 +44,12 @@ Source0: https://github.com/CristianHenzel/ClipIt/archive/v%{version}.tar Source0: %{reponame}-%{tarballdate}T%{tarballtime}.tar.gz %endif Source1: %{name}.appdata.xml +Source2: create-clipit-git-bare-tarball.sh # clipit doesn't autostart in MATE # Fixed upstream but not yet merged Patch0: 0001-Autostart-in-MATE.patch # Force GDK_BACKEND to x11 Patch1: clipit-1.4.5-force-gdk_backend-x11.patch -Patch2: clipit-c99.patch # Fix -Werror=incompatible-pointer-types Patch3: https://sources.debian.org/data/main/c/clipit/1.4.5%2Bgit20210313-3/debian/patches/incompatible-pointer-types.patch @@ -96,7 +96,6 @@ git config user.email "%{name}-maintainers@fedoraproject.org" %patch -P0 -p1 -b .mate %patch -P1 -p1 -b .nowayland -%patch -P2 -p1 -b .c99 %patch -P3 -p1 -b .c99_cast sed -i data/clipit.desktop.in -e '\@_Comment.*hr@d' @@ -161,6 +160,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Thu Jan 16 2025 Mamoru TASAKA - 1.4.5^20241103gitf35db54-1 +- Update to the latest git (20241103gitf35db54) + * Thu Jan 16 2025 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b3d8fc249c3780d38e00343d8a2e8561649200af Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 17 Jan 2025 00:35:52 +0900 Subject: [PATCH 13/16] support C23 --- clipit-pr211-c23-function-prototype.patch | 55 +++++++++++++++++++++++ clipit.spec | 6 +++ 2 files changed, 61 insertions(+) create mode 100644 clipit-pr211-c23-function-prototype.patch diff --git a/clipit-pr211-c23-function-prototype.patch b/clipit-pr211-c23-function-prototype.patch new file mode 100644 index 0000000..799b2f6 --- /dev/null +++ b/clipit-pr211-c23-function-prototype.patch @@ -0,0 +1,55 @@ +From 46c53082bd81c769d3422f1bedbab57bc73e8007 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Fri, 17 Jan 2025 00:23:31 +0900 +Subject: [PATCH] Fix function prototype for g_timer_add family for C23 + +g_timer_add or g_timeout_add_seconds manual says that +the second argument must have type of GSourceFunc, i.e. +function with one gpointer argument returning gboolean. + +Fixing so, unless compilation fails with C23. +--- + src/manage.c | 2 +- + src/manage.h | 2 +- + src/preferences.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/manage.c b/src/manage.c +index 25f7b75..25ed6d4 100644 +--- a/src/manage.c ++++ b/src/manage.c +@@ -331,7 +331,7 @@ void search_window_response(GtkDialog *dialog, gint response_id, gpointer user_d + } + + /* Shows the search dialog */ +-gboolean show_search() ++gboolean show_search(gpointer user_data) + { + /* Prevent multiple instances */ + if(gtk_grab_get_current()) { +diff --git a/src/manage.h b/src/manage.h +index 8740c0f..b810e74 100644 +--- a/src/manage.h ++++ b/src/manage.h +@@ -24,7 +24,7 @@ + + G_BEGIN_DECLS + +-gboolean show_search(); ++gboolean show_search(gpointer); + void remove_all_selected(gpointer); + + G_END_DECLS +diff --git a/src/preferences.c b/src/preferences.c +index 4e9a9ed..8222758 100644 +--- a/src/preferences.c ++++ b/src/preferences.c +@@ -430,7 +430,7 @@ static void start_purge_timer(gint timeout_seconds); + static void stop_purge_timer(); + + /* Purge history if history_timeout is enabled. This function is called every prefs.history_timeout_seconds */ +-static gboolean purge_history() { ++static gboolean purge_history(gpointer user_data) { + if (prefs.history_timeout) { + g_list_free(history); + history = NULL; diff --git a/clipit.spec b/clipit.spec index cf296f0..816f01d 100644 --- a/clipit.spec +++ b/clipit.spec @@ -52,6 +52,9 @@ Patch0: 0001-Autostart-in-MATE.patch Patch1: clipit-1.4.5-force-gdk_backend-x11.patch # Fix -Werror=incompatible-pointer-types Patch3: https://sources.debian.org/data/main/c/clipit/1.4.5%2Bgit20210313-3/debian/patches/incompatible-pointer-types.patch +# https://github.com/CristianHenzel/ClipIt/pull/211 +# Fix compilation with C23 struct function prototype +Patch4: clipit-pr211-c23-function-prototype.patch %if 0%{?use_gitbare} >= 1 BuildRequires: git @@ -97,6 +100,7 @@ git config user.email "%{name}-maintainers@fedoraproject.org" %patch -P0 -p1 -b .mate %patch -P1 -p1 -b .nowayland %patch -P3 -p1 -b .c99_cast +%patch -P4 -p1 -b .c23 sed -i data/clipit.desktop.in -e '\@_Comment.*hr@d' sed -i data/clipit-startup.desktop.in -e '\@_Comment.*hr@d' @@ -106,6 +110,7 @@ git commit -m "Apply Fedora specific configuration" -a %endif ./autogen.sh +%global optflags %optflags -std=gnu23 %build %if 0%{?use_gitbare} >= 1 @@ -162,6 +167,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog * Thu Jan 16 2025 Mamoru TASAKA - 1.4.5^20241103gitf35db54-1 - Update to the latest git (20241103gitf35db54) +- Fix compilation with C23 for struct function prototypes * Thu Jan 16 2025 Fedora Release Engineering - 1.4.5^20210513gite5fa64c-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 820491fd9cc6c07c55117f5356224483de76cca5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 17 Jan 2025 00:36:29 +0900 Subject: [PATCH 14/16] upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7be9f10..0835745 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /v1.4.4.tar.gz /v1.4.5.tar.gz /ClipIt-20210922T1754.tar.gz +/ClipIt-20250116T2347.tar.gz diff --git a/sources b/sources index 7e741c9..7e089b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ClipIt-20210922T1754.tar.gz) = ba3efcaaa935b89f76035ade44cfd93eeb58a0982c48db2486edd6f33aa70c017e0b90017870d36ad5d22e26de470c51ade0ed8ea31766461a6bdd753075aa84 +SHA512 (ClipIt-20250116T2347.tar.gz) = c99a3b5633018f9a4f168cca8d81f6ec75b398579c4a875fe9ad258410548b3f6c012f0914ea33af7ffb6c40c7cf47732f3420def042a2a5b8976fdf8e011c35 From fe7c35eb4ab927711cfb765c5e34a455a767fd2e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Jan 2025 11:20:34 +0900 Subject: [PATCH 15/16] Remove some debugging code --- clipit.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/clipit.spec b/clipit.spec index 816f01d..b43c5c6 100644 --- a/clipit.spec +++ b/clipit.spec @@ -27,7 +27,7 @@ Name: clipit Version: %{rpm_ver} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -110,7 +110,6 @@ git commit -m "Apply Fedora specific configuration" -a %endif ./autogen.sh -%global optflags %optflags -std=gnu23 %build %if 0%{?use_gitbare} >= 1 @@ -165,6 +164,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Fri Jan 24 2025 Mamoru TASAKA - 1.4.5^20241103gitf35db54-2 +- Remove debugging -std= option + * Thu Jan 16 2025 Mamoru TASAKA - 1.4.5^20241103gitf35db54-1 - Update to the latest git (20241103gitf35db54) - Fix compilation with C23 for struct function prototypes From 1b6c09d5d58390ad890caf339f7dc968451b980a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:23:59 +0000 Subject: [PATCH 16/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- clipit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clipit.spec b/clipit.spec index b43c5c6..1b52227 100644 --- a/clipit.spec +++ b/clipit.spec @@ -27,7 +27,7 @@ Name: clipit Version: %{rpm_ver} -Release: 2%{?dist} +Release: 3%{?dist} Summary: A lightweight, fully featured GTK+ clipboard manager # meson.build says: GPL-3.0-or-later @@ -164,6 +164,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}-startup.desktop %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.4.5^20241103gitf35db54-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 24 2025 Mamoru TASAKA - 1.4.5^20241103gitf35db54-2 - Remove debugging -std= option