From f245dbf47daeb0230e3ceacbfc62b455155589ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 21:27:06 +0000 Subject: [PATCH 1/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- paps.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/paps.spec b/paps.spec index 1005302..b2b95df 100644 --- a/paps.spec +++ b/paps.spec @@ -1,6 +1,6 @@ Name: paps Version: 0.8.0 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPL-2.0-or-later URL: https://github.com/dov/paps @@ -151,6 +151,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p" %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.8.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 7 2024 Akira TAGOH - 0.8.0-9 - Own /usr/share/paps Resolves: rhbz#2283284 From 529b6586b2fc3417510d37a4b1dc57092a215c63 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Thu, 25 Jul 2024 20:49:12 +0900 Subject: [PATCH 2/7] ci: Use tmt based test cases --- .fmf/version | 1 + plans/basic.fmf | 5 +++++ tests/basic/main.fmf | 5 +++++ tests/basic/test.sh | 21 +++++++++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 .fmf/version create mode 100644 plans/basic.fmf create mode 100644 tests/basic/main.fmf create mode 100755 tests/basic/test.sh diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/basic/main.fmf b/tests/basic/main.fmf new file mode 100644 index 0000000..d9d7de5 --- /dev/null +++ b/tests/basic/main.fmf @@ -0,0 +1,5 @@ +summary: Basic test +require: + - paps +test: ./test.sh +framework: beakerlib diff --git a/tests/basic/test.sh b/tests/basic/test.sh new file mode 100755 index 0000000..e07c777 --- /dev/null +++ b/tests/basic/test.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" + rlRun "pushd $tmp" + rlRun "set -o pipefail" + rlPhaseEnd + + rlPhaseStartTest + rlRun "paps --help | tee output" 0 "Check help message" + rlAssertGrep "paps" "output" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $tmp" 0 "Remove tmp directory" + rlPhaseEnd +rlJournalEnd From 2728eeda35b15427986d15c70e2d81b300531c0f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 12 Sep 2024 21:33:49 -0400 Subject: [PATCH 3/7] Fix build with glib 2.82 g_utf8_next_char no longer includes a cast to char*: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016 --- paps-glib282.patch | 34 ++++++++++++++++++++++++++++++++++ paps.spec | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 paps-glib282.patch diff --git a/paps-glib282.patch b/paps-glib282.patch new file mode 100644 index 0000000..23bd2b4 --- /dev/null +++ b/paps-glib282.patch @@ -0,0 +1,34 @@ +g_utf8_next_char no longer includes a cast to char* as of 2.81.0: + +https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016 + +diff -up a/src/paps.cc b/src/paps.cc +--- a/src/paps.cc 2024-09-12 19:21:02.858439427 -0400 ++++ b/src/paps.cc 2024-09-12 21:15:46.905955152 -0400 +@@ -1115,7 +1115,7 @@ split_text_into_paragraphs (PangoContext + while (p != nullptr && *p) + { + wc = g_utf8_get_char (p); +- next = g_utf8_next_char (p); ++ next = (char *) g_utf8_next_char (p); + if (wc == (gunichar)-1) + { + fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ()); +@@ -1130,7 +1130,7 @@ split_text_into_paragraphs (PangoContext + para->length = p - last_para; + /* handle dos line breaks */ + if (wc == '\r' && *next == '\n') +- next = g_utf8_next_char(next); ++ next = (char *) g_utf8_next_char(next); + para->layout = pango_layout_new (pango_context); + + if (page_layout->cpi > 0.0L) +@@ -1201,7 +1201,7 @@ split_text_into_paragraphs (PangoContext + g_free (newtext); + + para->length = i; +- next = g_utf8_offset_to_pointer (para->text, para->length); ++ next = (char *) g_utf8_offset_to_pointer (para->text, para->length); + wc = g_utf8_get_char (g_utf8_prev_char (next)); + } + else diff --git a/paps.spec b/paps.spec index b2b95df..bfc18b5 100644 --- a/paps.spec +++ b/paps.spec @@ -47,6 +47,7 @@ Patch62: paps-c99.patch ### For paps Patch100: %{name}-fix-src-to-paps.patch Patch101: %{name}-fix-build.patch +Patch102: %{name}-glib282.patch Summary: Plain Text to PostScript converter %description @@ -68,6 +69,7 @@ This package contains a CUPS filter based on paps. %setup -q -a 3 %patch 100 -p1 -b .src-to-paps %patch 101 -p1 -b .build +%patch 102 -p1 -b .glib282 pushd %{name}-0.6.8 %patch 0 -p1 -b .shared %patch 1 -p1 -b .wordwrap From a06bf824ed44485358013afd68e399868182be46 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 13 Sep 2024 21:14:44 +0900 Subject: [PATCH 4/7] Fix build with glib 2.82 Patch from Yaakov Selkowitz --- paps-0.6.8-glib282.patch | 12 ++++++++++++ paps.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 paps-0.6.8-glib282.patch diff --git a/paps-0.6.8-glib282.patch b/paps-0.6.8-glib282.patch new file mode 100644 index 0000000..7d3d165 --- /dev/null +++ b/paps-0.6.8-glib282.patch @@ -0,0 +1,12 @@ +diff -pruN paps-0.6.8.orig/src/paps.c paps-0.6.8/src/paps.c +--- paps-0.6.8.orig/src/paps.c 2024-09-13 21:07:13.225683344 +0900 ++++ paps-0.6.8/src/paps.c 2024-09-13 21:10:24.177041518 +0900 +@@ -784,7 +784,7 @@ split_text_into_paragraphs (PangoContext + while (p != NULL && *p) + { + wc = g_utf8_get_char (p); +- next = g_utf8_next_char (p); ++ next = (char *) g_utf8_next_char (p); + if (wc == (gunichar)-1) + { + fprintf (stderr, "%s: Invalid character in input\n", g_get_prgname ()); diff --git a/paps.spec b/paps.spec index bfc18b5..835d60c 100644 --- a/paps.spec +++ b/paps.spec @@ -1,6 +1,6 @@ Name: paps Version: 0.8.0 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPL-2.0-or-later URL: https://github.com/dov/paps @@ -44,6 +44,7 @@ Patch60: %{name}-a3.patch ## rhbz#1214939 Patch61: %{name}-fix-paper-size-truncate.patch Patch62: paps-c99.patch +Patch63: paps-0.6.8-glib282.patch ### For paps Patch100: %{name}-fix-src-to-paps.patch Patch101: %{name}-fix-build.patch @@ -90,6 +91,7 @@ pushd %{name}-0.6.8 %patch 60 -p1 -b .a3 %patch 61 -p1 -b .paper-size %patch 62 -p2 -b .configure-c99 +%patch 63 -p1 -b .glib282 libtoolize -f -c autoreconf -f -i popd @@ -153,6 +155,10 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p" %changelog +* Fri Sep 13 2024 Akira TAGOH - 0.8.0-11 +- Fix build with glib 2.82 + Patch from Yaakov Selkowitz + * Thu Jul 18 2024 Fedora Release Engineering - 0.8.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 454fff4bc5a65e11d451f0e3202cdcec4afa4bc0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 22:21:37 +0000 Subject: [PATCH 5/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- paps.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/paps.spec b/paps.spec index 835d60c..6b1eab0 100644 --- a/paps.spec +++ b/paps.spec @@ -1,6 +1,6 @@ Name: paps Version: 0.8.0 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPL-2.0-or-later URL: https://github.com/dov/paps @@ -155,6 +155,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p" %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.8.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Sep 13 2024 Akira TAGOH - 0.8.0-11 - Fix build with glib 2.82 Patch from Yaakov Selkowitz From efdad73179345079891a5cd18e17c2030490d63b Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 27 Jan 2025 18:49:59 +0900 Subject: [PATCH 6/7] Fix FTBFS Resolves: rhbz#2341001 --- paps-0.6.8-ftbfs.patch | 13 +++++++++++++ paps.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 paps-0.6.8-ftbfs.patch diff --git a/paps-0.6.8-ftbfs.patch b/paps-0.6.8-ftbfs.patch new file mode 100644 index 0000000..01bdb5c --- /dev/null +++ b/paps-0.6.8-ftbfs.patch @@ -0,0 +1,13 @@ +バイナリーファイル paps-0.6.8.orig/src/paps-paps.o とpaps-0.6.8/src/paps-paps.o は異なります +diff -pruN paps-0.6.8.orig/src/paps.c paps-0.6.8/src/paps.c +--- paps-0.6.8.orig/src/paps.c 2025-01-27 18:18:12.130570673 +0900 ++++ paps-0.6.8/src/paps.c 2025-01-27 18:47:05.214883811 +0900 +@@ -515,7 +515,7 @@ int main(int argc, char *argv[]) + } /* if (!cups_mode) */ + + paps = paps_new(); +- pango_context = paps_get_pango_context (paps); ++ pango_context = paps_get_pango_context (); + + /* Setup pango */ + pango_context_set_language (pango_context, get_language ()); diff --git a/paps.spec b/paps.spec index 6b1eab0..164b3e2 100644 --- a/paps.spec +++ b/paps.spec @@ -1,6 +1,6 @@ Name: paps Version: 0.8.0 -Release: 12%{?dist} +Release: 13%{?dist} License: LGPL-2.0-or-later URL: https://github.com/dov/paps @@ -45,6 +45,7 @@ Patch60: %{name}-a3.patch Patch61: %{name}-fix-paper-size-truncate.patch Patch62: paps-c99.patch Patch63: paps-0.6.8-glib282.patch +Patch64: paps-0.6.8-ftbfs.patch ### For paps Patch100: %{name}-fix-src-to-paps.patch Patch101: %{name}-fix-build.patch @@ -92,6 +93,7 @@ pushd %{name}-0.6.8 %patch 61 -p1 -b .paper-size %patch 62 -p2 -b .configure-c99 %patch 63 -p1 -b .glib282 +%patch 64 -p1 -b .ftbfs libtoolize -f -c autoreconf -f -i popd @@ -155,6 +157,10 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p" %changelog +* Mon Jan 27 2025 Akira TAGOH - 0.8.0-13 +- Fix FTBFS + Resolves: rhbz#2341001 + * Fri Jan 17 2025 Fedora Release Engineering - 0.8.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6b8042a73135a3411b9af1b2ec8853eaa4639b4d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:56:45 +0000 Subject: [PATCH 7/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- paps.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/paps.spec b/paps.spec index 164b3e2..2177152 100644 --- a/paps.spec +++ b/paps.spec @@ -1,6 +1,6 @@ Name: paps Version: 0.8.0 -Release: 13%{?dist} +Release: 14%{?dist} License: LGPL-2.0-or-later URL: https://github.com/dov/paps @@ -157,6 +157,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p" %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.8.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jan 27 2025 Akira TAGOH - 0.8.0-13 - Fix FTBFS Resolves: rhbz#2341001