From e9038589fd259665818eced264fb12258505710f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 13:55:45 +0000 Subject: [PATCH 1/6] 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 2/6] 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 3/6] 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 4/6] 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 5/6] 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 6/6] 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