From b69f70620e0109d6c52d2a4eb8e01e435f9630c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:02:08 +0000 Subject: [PATCH 01/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 ecd6542..527c0ef 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal Group: Applications/Editors @@ -104,6 +104,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.4.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 0.4.8-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 96c9809aedad955fdf2efa34f1043af94540c166 Mon Sep 17 00:00:00 2001 From: "Nathanael d. Noblet" Date: Tue, 29 May 2018 11:16:23 -0600 Subject: [PATCH 02/29] fix FTBS bug #1556555 --- xournal.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xournal.spec b/xournal.spec index 527c0ef..6973f63 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal Group: Applications/Editors @@ -15,9 +15,7 @@ BuildRequires: poppler-glib-devel >= 0.5.4 %else BuildRequires: poppler-devel >= 0.5.4 %endif -%if 0%{?rhel} > 4 BuildRequires: autoconf, automake -%endif BuildRequires: freetype-devel >= 2.0.0 BuildRequires: desktop-file-utils BuildRequires: ImageMagick @@ -104,6 +102,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Tue May 29 2018 Nathanael Noblet - 0.4.8-11 +- Fix build error by adding automake/autoconf as a BuildRequirement + * Fri Feb 09 2018 Fedora Release Engineering - 0.4.8-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From cd462269c6cda2b0138e59a76c4e1a127461ca08 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:54 +0200 Subject: [PATCH 03/29] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- xournal.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xournal.spec b/xournal.spec index 6973f63..e4a114f 100644 --- a/xournal.spec +++ b/xournal.spec @@ -8,6 +8,7 @@ License: GPLv2 URL: http://xournal.sourceforge.net/ Source0: http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz +BuildRequires: gcc BuildRequires: gtk2-devel >= 2.10.0 BuildRequires: libgnomecanvas-devel >= 2.4.0 %if 0%{?fedora} > 9 || 0%{?rhel} > 5 From 19f47bd3814977ce0eaee650f53dac39690dbf5f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:32:45 +0000 Subject: [PATCH 04/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 e4a114f..0e62e79 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal Group: Applications/Editors @@ -103,6 +103,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.4.8-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue May 29 2018 Nathanael Noblet - 0.4.8-11 - Fix build error by adding automake/autoconf as a BuildRequirement From 459e71f8e9c65bf3f8f47be25b432ebaea9332d9 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 14 Nov 2018 14:11:04 -0600 Subject: [PATCH 05/29] Update to 0.4.8.2016. --- xournal.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xournal.spec b/xournal.spec index 0e62e79..fba0caa 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal -Version: 0.4.8 -Release: 12%{?dist} +Version: 0.4.8.2016 +Release: 1%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal Group: Applications/Editors @@ -103,6 +103,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Wed Nov 14 2018 Jason L Tibbitts III - 0.4.8.2016-1 +- Update to 0.4.8.2016. + * Sat Jul 14 2018 Fedora Release Engineering - 0.4.8-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From a91234ab7790023fb7f564eecb0f4bf9c19b704d Mon Sep 17 00:00:00 2001 From: "Nathanael d. Noblet" Date: Wed, 14 Nov 2018 13:47:55 -0700 Subject: [PATCH 06/29] Updated source file for new version --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c3e498e..c5620cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xournal-0.4.5.tar.gz /xournal-0.4.7.tar.gz /xournal-0.4.8.tar.gz +/xournal-0.4.8.2016.tar.gz diff --git a/sources b/sources index d930f81..49c188e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d47acd6987b9fccf2ccdd65878667c79 xournal-0.4.8.tar.gz +SHA512 (xournal-0.4.8.2016.tar.gz) = 1426d5c9ba3486fbe342d49fc19fcc162965cd6a7b7754f79665e43fe0e60e6f42f61969405ace78fdaa7b99cbb3d4b07b7fb5df246d68a329b52084b6eec76e From 7c6e449f733a0f9c54c32bf0c70c63343265d7f2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 27 Jan 2019 13:22:52 +0100 Subject: [PATCH 07/29] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- xournal.spec | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/xournal.spec b/xournal.spec index fba0caa..ef96daf 100644 --- a/xournal.spec +++ b/xournal.spec @@ -71,24 +71,6 @@ desktop-file-install \ %find_lang %{name} -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null -touch --no-create %{_datadir}/mime/packages &> /dev/null || : -update-desktop-database &> /dev/null || : - -%postun -if [ $1 -eq 0 ] ; then -touch --no-create %{_datadir}/icons/hicolor &>/dev/null -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null -touch --no-create %{_datadir}/mime/packages &> /dev/null || : -update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : -fi -update-desktop-database &> /dev/null || : - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : - %files -f %{name}.lang %{_bindir}/xournal %{_datadir}/icons/hicolor/*x*/apps/%{name}.png From bec1b6a73f9af51122393297f05833c58ebd79c6 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:31 +0100 Subject: [PATCH 08/29] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xournal.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xournal.spec b/xournal.spec index ef96daf..b2d3901 100644 --- a/xournal.spec +++ b/xournal.spec @@ -3,7 +3,6 @@ Version: 0.4.8.2016 Release: 1%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal -Group: Applications/Editors License: GPLv2 URL: http://xournal.sourceforge.net/ Source0: http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz From b478b745252cd2ec950df08124dc1ce1058d594b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:46:19 +0000 Subject: [PATCH 09/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 b2d3901..806594f 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal License: GPLv2 @@ -84,6 +84,9 @@ desktop-file-install \ %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.4.8.2016-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Nov 14 2018 Jason L Tibbitts III - 0.4.8.2016-1 - Update to 0.4.8.2016. From f0748bba5879762013ed1c1be27c0b037242c32b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:35:16 +0000 Subject: [PATCH 10/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 806594f..a3b11cd 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal License: GPLv2 @@ -84,6 +84,9 @@ desktop-file-install \ %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.4.8.2016-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 0.4.8.2016-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 15b83ef23d4a64e6a77bb61592257eb2dc739325 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Fri, 17 Jan 2020 12:30:04 +0100 Subject: [PATCH 11/29] Rebuild for poppler-0.84.0 --- xournal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xournal.spec b/xournal.spec index a3b11cd..cbd6860 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal License: GPLv2 @@ -84,6 +84,9 @@ desktop-file-install \ %changelog +* Fri Jan 17 2020 Marek Kasik - 0.4.8.2016-4 +- Rebuild for poppler-0.84.0 + * Sat Jul 27 2019 Fedora Release Engineering - 0.4.8.2016-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 73f59c1dde355b163e80f7b99a8d11b27eea0098 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:50:56 +0000 Subject: [PATCH 12/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 cbd6860..bb15dbd 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal License: GPLv2 @@ -84,6 +84,9 @@ desktop-file-install \ %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.4.8.2016-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 17 2020 Marek Kasik - 0.4.8.2016-4 - Rebuild for poppler-0.84.0 From e8542e6f5913975d4d6a52f5968f68a0b3bdaf3b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:01:50 +0000 Subject: [PATCH 13/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 bb15dbd..14b5796 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal License: GPLv2 @@ -84,6 +84,9 @@ desktop-file-install \ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.4.8.2016-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 0.4.8.2016-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 26e0f4e5ff1a0e1de766f884fb34f7731490f0b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:47:30 +0000 Subject: [PATCH 14/29] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xournal.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xournal.spec b/xournal.spec index 14b5796..1a5cbf5 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal License: GPLv2 @@ -84,6 +84,10 @@ desktop-file-install \ %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 0.4.8.2016-7 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.4.8.2016-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 0283c90a3e25b786585b56b801b3c595feb6ccf2 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:35:41 +0000 Subject: [PATCH 15/29] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xournal.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xournal.spec b/xournal.spec index 1a5cbf5..d92d417 100644 --- a/xournal.spec +++ b/xournal.spec @@ -7,6 +7,7 @@ License: GPLv2 URL: http://xournal.sourceforge.net/ Source0: http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz +BuildRequires: make BuildRequires: gcc BuildRequires: gtk2-devel >= 2.10.0 BuildRequires: libgnomecanvas-devel >= 2.4.0 From 77a2599e98d32c93a6a5ff5a799fe8ce90f9d1e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:20:33 +0000 Subject: [PATCH 16/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 d92d417..a9ee439 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal License: GPLv2 @@ -85,6 +85,9 @@ desktop-file-install \ %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 0.4.8.2016-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 0.4.8.2016-7 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 6ddf58a53d456eeb605a17aaa126c74639eeac4c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:53:34 +0000 Subject: [PATCH 17/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 a9ee439..266c84b 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal License: GPLv2 @@ -85,6 +85,9 @@ desktop-file-install \ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.4.8.2016-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 0.4.8.2016-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From f6a2cef411fc21492eb24691f86874705b285374 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:26:46 +0000 Subject: [PATCH 18/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 266c84b..ef67d63 100644 --- a/xournal.spec +++ b/xournal.spec @@ -1,6 +1,6 @@ Name: xournal Version: 0.4.8.2016 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Notetaking, sketching, PDF annotation and general journal License: GPLv2 @@ -85,6 +85,9 @@ desktop-file-install \ %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.4.8.2016-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0.4.8.2016-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From b1d8e58d15e542f37556286921ebe898f12452da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:27:51 +0000 Subject: [PATCH 19/29] 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 20/29] 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 21/29] 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 22/29] 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 23/29] 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 24/29] 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 25/29] 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 26/29] 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 27/29] 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 28/29] 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 29/29] 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