From 3d21e45d8e86997da102979ec5cc74f5f7c56fe2 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Fri, 5 Dec 2025 13:03:36 +0800 Subject: [PATCH] Add D series paper (common in China) and ZL envelope dimensions (cherry picked from commit 452ae200e6b88980537aec42e3e501c2bcdb1e77) --- ...er-common-in-China-and-ZL-envelope-d.patch | 39 +++++++++++++++++++ libpaper.spec | 8 +++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 Add-D-series-paper-common-in-China-and-ZL-envelope-d.patch diff --git a/Add-D-series-paper-common-in-China-and-ZL-envelope-d.patch b/Add-D-series-paper-common-in-China-and-ZL-envelope-d.patch new file mode 100644 index 0000000..b458b2d --- /dev/null +++ b/Add-D-series-paper-common-in-China-and-ZL-envelope-d.patch @@ -0,0 +1,39 @@ +From 63fde803a9602e38bead1d7e33e057071094bb65 Mon Sep 17 00:00:00 2001 +From: Funda Wang +Date: Fri, 5 Dec 2025 12:59:00 +0800 +Subject: [PATCH] Add D series paper (common in China) and ZL envelope + dimensions + +--- + lib/paperspecs | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/lib/paperspecs b/lib/paperspecs +index 811d2a7..d568d51 100644 +--- a/lib/paperspecs ++++ b/lib/paperspecs +@@ -6,6 +6,13 @@ executive 522 756 + halfletter 396 612 + halfexecutive 378 522 + 11x17 792 1224 ++D0 764 1064 mm ++D1 532 760 mm ++D2 380 528 mm ++D3 264 376 mm ++D4 188 260 mm ++D5 130 184 mm ++D6 92 126 mm + statement 396 612 + folio 612 936 + quarto 610 780 +@@ -41,6 +48,7 @@ c6 114 162 mm + c7 81 114 mm + c8 57 81 mm + DL 110 220 mm ++ZL 120 230 mm + Comm10 297 684 + Monarch 279 540 + archE 2592 3456 +-- +2.47.3 + diff --git a/libpaper.spec b/libpaper.spec index 78f87a5..aaae7ae 100644 --- a/libpaper.spec +++ b/libpaper.spec @@ -1,12 +1,15 @@ Name: libpaper Version: 1.1.29 -Release: 1 +Release: 2 Summary: Library for handling paper characteristics License: GPLv2 URL: http://packages.qa.debian.org/libp/libpaper.html Source0: http://ftp.debian.org/debian/pool/main/libp/libpaper/%{name}_%{version}.tar.gz Patch0: libpaper-useglibcfallback.patch Patch1: libpaper-file-leak.patch +# cherry pick and rediffed from: +# https://github.com/rrthomas/libpaper/commit/5d9afa90504636dede80fc5eaa16cc39faa483ae +Patch2: Add-D-series-paper-common-in-China-and-ZL-envelope-d.patch BuildRequires: gcc, libtool, gettext, gawk @@ -77,6 +80,9 @@ done %{_mandir}/man3/* %changelog +* Fri Dec 05 2025 Funda Wang - 1.1.29-2 +- Add D series paper (common in China) and ZL envelope dimensions + * Fri Jul 14 2023 fuanan - 1.1.29-1 - update version to 1.1.29 -- Gitee