From b1d8e58d15e542f37556286921ebe898f12452da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:27:51 +0000 Subject: [PATCH 01/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xournal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xournal.spec b/xournal.spec index ef67d63..f34c627 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal License: GPLv2 @@ -85,6 +85,9 @@ desktop-file-install \ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.4.8.2016-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 0.4.8.2016-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From dacd5bf30ec95debca62946868d9450f68ea54de Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 6 Dec 2022 17:50:52 +0100 Subject: [PATCH 02/11] Port to C99 Related to: --- xournal-c99-1.patch | 78 +++++++++++++++++++++++++++++++++++++++++++++ xournal-c99-2.patch | 17 ++++++++++ xournal.spec | 11 +++++-- 3 files changed, 103 insertions(+), 3 deletions(-) create mode 100644 xournal-c99-1.patch create mode 100644 xournal-c99-2.patch diff --git a/xournal-c99-1.patch b/xournal-c99-1.patch new file mode 100644 index 0000000..f6996bc --- /dev/null +++ b/xournal-c99-1.patch @@ -0,0 +1,78 @@ +commit 430d9502547856943df531b700bb5843fcc8bd1f +Author: Denis Auroux +Date: Sun Jan 24 15:48:16 2021 -0500 + + Fix implicit function declarations by including config.h in ttsubset/*.c + +diff --git a/src/ttsubset/list.c b/src/ttsubset/list.c +index 0cf958e43468c5ee..6b764ae7dabbe0ef 100644 +--- a/src/ttsubset/list.c ++++ b/src/ttsubset/list.c +@@ -33,7 +33,7 @@ + * + */ + +-/* $Id$ */ ++/* $Id: list.c,v 1.4 2004/09/10 18:59:06 jody Exp $ */ + /* @(#)list.c 1.7 03/02/06 SMI */ + + /* +@@ -44,6 +44,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #include + #include + #ifdef MALLOC_TRACE +diff --git a/src/ttsubset/sft.c b/src/ttsubset/sft.c +index 249fbdf03b074575..678359eb580f9b56 100644 +--- a/src/ttsubset/sft.c ++++ b/src/ttsubset/sft.c +@@ -33,7 +33,7 @@ + * + */ + +-/* $Id$ */ ++/* $Id: sft.c,v 1.9 2005/01/04 20:10:46 jody Exp $ */ + /* @(#)sft.c 1.17 03/01/08 SMI */ + + /* +@@ -43,6 +43,10 @@ + * @version 1.0 + */ + ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #include + #include + #include +diff --git a/src/ttsubset/ttcr.c b/src/ttsubset/ttcr.c +index eecfcade1a5f1b5d..38962def32de00c3 100644 +--- a/src/ttsubset/ttcr.c ++++ b/src/ttsubset/ttcr.c +@@ -33,7 +33,7 @@ + * + */ + +-/* $Id$ */ ++/* $Id: ttcr.c,v 1.7 2005/01/04 20:10:46 jody Exp $ */ + /* @(#)ttcr.c 1.7 03/01/08 SMI */ + + /* +@@ -44,6 +44,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #include + #ifdef HAVE_UNISTD_H + #include diff --git a/xournal-c99-2.patch b/xournal-c99-2.patch new file mode 100644 index 0000000..f5169ca --- /dev/null +++ b/xournal-c99-2.patch @@ -0,0 +1,17 @@ +Add missing include directives for make_dashed, set_cursor_busy. + +Submitted upstream: + +diff --git a/src/xo-image.c b/src/xo-image.c +index c16f8f40897e064e..5624a46c3a35d287 100644 +--- a/src/xo-image.c ++++ b/src/xo-image.c +@@ -25,6 +25,8 @@ + #include "xo-support.h" + #include "xo-image.h" + #include "xo-misc.h" ++#include "xo-selection.h" ++#include "xo-paint.h" + + // create pixbuf from buffer, or return NULL on failure + GdkPixbuf *pixbuf_from_buffer(const gchar *buf, gsize buflen) diff --git a/xournal.spec b/xournal.spec index f34c627..af0bdaa 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,11 +1,13 @@ Name: xournal Version: 0.4.8.2016 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal License: GPLv2 URL: http://xournal.sourceforge.net/ Source0: http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz +Patch0: xournal-c99-1.patch +Patch1: xournal-c99-2.patch BuildRequires: make BuildRequires: gcc @@ -31,7 +33,7 @@ annotating PDFs. Xournal aims to provide superior graphical quality (subpixel resolution) and overall functionality. %prep -%setup -q +%autosetup -p1 NOCONFIGURE=1 ./autogen.sh @@ -85,6 +87,9 @@ desktop-file-install \ %changelog +* Tue Dec 6 2022 Florian Weimer - 0.4.8.2016-12 +- Port to C99 + * Sat Jul 23 2022 Fedora Release Engineering - 0.4.8.2016-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild @@ -241,7 +246,7 @@ desktop-file-install \ - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Sun Sep 21 2008 Ville Skyttä - 0.4.2.1-2 -- Fix Patch0:/%%patch mismatch (#463069) +- Fix Patch0:/patch mismatch (#463069) * Mon Apr 7 2008 Jeremy Katz - 0.4.2.1-1 - Update to 0.4.2.1 to fix problems with newer xorg From 6e5fcb03cbf68c39c1f351f0e795cc04da69e3d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:47:59 +0000 Subject: [PATCH 03/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xournal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xournal.spec b/xournal.spec index af0bdaa..20be466 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal License: GPLv2 @@ -87,6 +87,9 @@ desktop-file-install \ %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.4.8.2016-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 6 2022 Florian Weimer - 0.4.8.2016-12 - Port to C99 From 710601581d3238191e5a996fd1340ff8c29d67bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:13:36 +0000 Subject: [PATCH 04/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xournal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xournal.spec b/xournal.spec index 20be466..3fcaeb2 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal License: GPLv2 @@ -87,6 +87,9 @@ desktop-file-install \ %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.4.8.2016-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0.4.8.2016-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 17eca32f2c8c14d6a157e3d81331a4c1af2ce69f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 10:03:33 +0000 Subject: [PATCH 05/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xournal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xournal.spec b/xournal.spec index 3fcaeb2..e615639 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal License: GPLv2 @@ -87,6 +87,9 @@ desktop-file-install \ %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.4.8.2016-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.4.8.2016-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From d1480f840020773e0fae4357c9db6027766420c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:23:50 +0000 Subject: [PATCH 06/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xournal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xournal.spec b/xournal.spec index e615639..42ac511 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal License: GPLv2 @@ -87,6 +87,9 @@ desktop-file-install \ %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.4.8.2016-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.4.8.2016-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9248df56012b9b5c76bbe68fb5bcdce567aff171 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 12:32:54 +0200 Subject: [PATCH 07/11] convert GPLv2 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xournal.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xournal.spec b/xournal.spec index 42ac511..21cce60 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,9 +1,10 @@ Name: xournal Version: 0.4.8.2016 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal -License: GPLv2 +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only URL: http://xournal.sourceforge.net/ Source0: http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz Patch0: xournal-c99-1.patch @@ -87,6 +88,9 @@ desktop-file-install \ %changelog +* Mon Jul 29 2024 Miroslav Suchý - 0.4.8.2016-17 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 0.4.8.2016-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 271922aded3f0b447347475917826951d948b132 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:13:02 +0000 Subject: [PATCH 08/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xournal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xournal.spec b/xournal.spec index 21cce60..a065fc9 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal # Automatically converted from old format: GPLv2 - review is highly recommended. @@ -88,6 +88,9 @@ desktop-file-install \ %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.4.8.2016-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jul 29 2024 Miroslav Suchý - 0.4.8.2016-17 - convert license to SPDX From 9c70552ffd901a49ff205235b0e29a87f1d603e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:02:06 +0000 Subject: [PATCH 09/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xournal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xournal.spec b/xournal.spec index a065fc9..3b584bf 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal # Automatically converted from old format: GPLv2 - review is highly recommended. @@ -88,6 +88,9 @@ desktop-file-install \ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.4.8.2016-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 0.4.8.2016-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From bfa3946eb6f692f0ddef048c08b436ff820efb3a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:51:32 +0000 Subject: [PATCH 10/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xournal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xournal.spec b/xournal.spec index 3b584bf..a650afc 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal # Automatically converted from old format: GPLv2 - review is highly recommended. @@ -88,6 +88,9 @@ desktop-file-install \ %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0.4.8.2016-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 0.4.8.2016-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 1576df05db07960b80f688bb6b7ea01004cd31fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:24:06 +0000 Subject: [PATCH 11/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xournal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xournal.spec b/xournal.spec index a650afc..53bb8b7 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal # Automatically converted from old format: GPLv2 - review is highly recommended. @@ -88,6 +88,9 @@ desktop-file-install \ %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0.4.8.2016-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 0.4.8.2016-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild