Compare commits

...
Sign in to create a new pull request.

6 commits

Author SHA1 Message Date
Fedora Release Engineering
1b6c09d5d5 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 18:23:59 +00:00
Mamoru TASAKA
fe7c35eb4a Remove some debugging code 2025-01-24 11:20:34 +09:00
Mamoru TASAKA
820491fd9c upload source 2025-01-17 00:36:29 +09:00
Mamoru TASAKA
b3d8fc249c support C23 2025-01-17 00:35:52 +09:00
Mamoru TASAKA
63a87183c6 Update to the latest git (20241103gitf35db54) 2025-01-17 00:07:05 +09:00
Fedora Release Engineering
e9038589fd Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 13:55:45 +00:00
5 changed files with 80 additions and 39 deletions

1
.gitignore vendored
View file

@ -3,3 +3,4 @@
/v1.4.4.tar.gz
/v1.4.5.tar.gz
/ClipIt-20210922T1754.tar.gz
/ClipIt-20250116T2347.tar.gz

View file

@ -1,31 +0,0 @@
C99 removed implicit function declarations. Include <sys/stat.h> for
the umask function, and init_history_timeout_timer because it is used
in main.c.
Submitted upstream: <https://github.com/CristianHenzel/ClipIt/pull/203>
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 <ctype.h>
#include <stdbool.h>
#include <string.h>
+#include <sys/stat.h>
#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

View file

@ -0,0 +1,55 @@
From 46c53082bd81c769d3422f1bedbab57bc73e8007 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
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;

View file

@ -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: 6%{?dist}
Release: 3%{?dist}
Summary: A lightweight, fully featured GTK+ clipboard manager
# meson.build says: GPL-3.0-or-later
@ -44,14 +44,17 @@ 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
# 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
@ -96,8 +99,8 @@ 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
%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'
@ -161,6 +164,19 @@ 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 <releng@fedoraproject.org> - 1.4.5^20241103gitf35db54-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jan 24 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.4.5^20241103gitf35db54-2
- Remove debugging -std= option
* Thu Jan 16 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 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 <releng@fedoraproject.org> - 1.4.5^20210513gite5fa64c-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Tue Oct 08 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.4.5^20210513gite5fa64c-6
- Apply debian patch for -Werror=incompatible-pointer-types

View file

@ -1 +1 @@
SHA512 (ClipIt-20210922T1754.tar.gz) = ba3efcaaa935b89f76035ade44cfd93eeb58a0982c48db2486edd6f33aa70c017e0b90017870d36ad5d22e26de470c51ade0ed8ea31766461a6bdd753075aa84
SHA512 (ClipIt-20250116T2347.tar.gz) = c99a3b5633018f9a4f168cca8d81f6ec75b398579c4a875fe9ad258410548b3f6c012f0914ea33af7ffb6c40c7cf47732f3420def042a2a5b8976fdf8e011c35