Bug#1022404: raqm: diff for NMU version 0.7.0-4.1
Dear maintainer,
I've prepared an NMU for raqm (versioned as 0.7.0-4.1) and uploaded
it to DELAYED/3. Please feel free to tell me if I should cancel it.
cu
Adrian
diff -Nru raqm-0.7.0/debian/changelog raqm-0.7.0/debian/changelog
--- raqm-0.7.0/debian/changelog 2019-12-17 11:08:26.0 +0200
+++ raqm-0.7.0/debian/changelog 2023-01-27 18:33:11.0 +0200
@@ -1,3 +1,12 @@
+raqm (0.7.0-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream fix for FTBFS with recent HarfBuzz. (Closes: #1022404)
+ * Require HarfBuzz >= 5.2, thanks to Jeremy Bicha.
+ * Run the full test suite as autopkgtest, thanks to Dave Jones.
+
+ -- Adrian Bunk Fri, 27 Jan 2023 18:33:11 +0200
+
raqm (0.7.0-4) unstable; urgency=medium
* debian/tests/libssh-server: Use the correct compiler for proposed
diff -Nru raqm-0.7.0/debian/control raqm-0.7.0/debian/control
--- raqm-0.7.0/debian/control 2019-12-17 11:08:26.0 +0200
+++ raqm-0.7.0/debian/control 2023-01-27 18:33:06.0 +0200
@@ -9,7 +9,7 @@
pkg-config,
libfreetype6-dev (>= 2.4.2),
libfribidi-dev,
- libharfbuzz-dev,
+ libharfbuzz-dev (>= 5.2),
python3,
gtk-doc-tools (>= 1.15)
Homepage: https://github.com/HOST-Oman/libraqm
@@ -35,7 +35,7 @@
Depends: ${misc:Depends}, libraqm0 (= ${binary:Version})
, libfreetype6-dev
, libfribidi-dev
- , libharfbuzz-dev
+ , libharfbuzz-dev (>= 5.2)
Description: Development files for Raqm library
Raqm is a library for complex text layout.
.
diff -Nru raqm-0.7.0/debian/patches/0001-Update-text-expectation.patch raqm-0.7.0/debian/patches/0001-Update-text-expectation.patch
--- raqm-0.7.0/debian/patches/0001-Update-text-expectation.patch 1970-01-01 02:00:00.0 +0200
+++ raqm-0.7.0/debian/patches/0001-Update-text-expectation.patch 2022-11-19 19:32:08.0 +0200
@@ -0,0 +1,29 @@
+From 17170a1eeb63807b4035427f3ca2b3e475c8f42b Mon Sep 17 00:00:00 2001
+From: Khaled Hosny
+Date: Wed, 25 Aug 2021 16:58:25 +0200
+Subject: Update text expectation
+
+---
+ tests/cursor_position_GB8a.test | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/cursor_position_GB8a.test b/tests/cursor_position_GB8a.test
+index bef963e..d161691 100644
+--- a/tests/cursor_position_GB8a.test
b/tests/cursor_position_GB8a.test
+@@ -32,9 +32,9 @@ glyph [0] x_offset: 0 y_offset: 0 x_advance: 748 font: Amiri
+ glyph [0] x_offset: 0 y_offset: 0 x_advance: 748 font: Amiri
+ glyph [0] x_offset: 0 y_offset: 0 x_advance: 748 font: Amiri
+
+-UTF-32 clusters: 00 01 02 03
+-UTF-8 clusters: 00 04 08 12
++UTF-32 clusters: 00 00 02 02
++UTF-8 clusters: 00 00 08 08
+
+-The position is 2992 at index 12
++The position is 2244 at index 8
+
+ The start-index is 4 at position 1000
+--
+2.30.2
+
diff -Nru raqm-0.7.0/debian/patches/series raqm-0.7.0/debian/patches/series
--- raqm-0.7.0/debian/patches/series 2019-12-17 11:08:26.0 +0200
+++ raqm-0.7.0/debian/patches/series 2022-11-19 21:15:36.0 +0200
@@ -1 +1,2 @@
use_py3.diff
+0001-Update-text-expectation.patch
diff -Nru raqm-0.7.0/debian/tests/control raqm-0.7.0/debian/tests/control
--- raqm-0.7.0/debian/tests/control 2019-12-17 11:08:26.0 +0200
+++ raqm-0.7.0/debian/tests/control 2023-01-27 18:31:21.0 +0200
@@ -1,2 +1,6 @@
Tests: build
Depends: libraqm-dev, pkg-config, build-essential
+
+Tests: run-suite
+Restrictions: build-needed
+Depends: @, @builddeps@
diff -Nru raqm-0.7.0/debian/tests/run-suite raqm-0.7.0/debian/tests/run-suite
--- raqm-0.7.0/debian/tests/run-suite 1970-01-01 02:00:00.0 +0200
+++ raqm-0.7.0/debian/tests/run-suite 2023-01-27 18:30:21.0 +0200
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+make -C "${0%/*}/../../tests" check
Bug#1022404: raqm: diff for NMU version 0.7.0-4.1
On Sat, 19 Nov 2022 21:19:24 +0200 Adrian Bunk wrote: > Control: tags 1022404 + patch > Control: tags 1022404 + pending > > Dear maintainer, > > I've prepared an NMU for raqm (versioned as 0.7.0-4.1) and uploaded > it to DELAYED/15. Please feel free to tell me if I should cancel it. It has been 15 days past your upload but it has not reflected yet in the archive. Did you happen to cancel your NMU? -- Best, Nilesh signature.asc Description: PGP signature
Bug#1022404: raqm: diff for NMU version 0.7.0-4.1
Also, I suggest bumping harbuzz in Build-Depends. I don't know the exact version needed, setting it to 5.2 is probably ok. Thank you, Jeremy Bicha
Bug#1022404: raqm: diff for NMU version 0.7.0-4.1
On Thu, Dec 1, 2022 at 2:21 PM Adrian Bunk wrote: > On Fri, Nov 25, 2022 at 05:16:03AM -0600, Jeremy Bicha wrote: > > Do you think it would be useful to include Ubuntu's change in your NMU > > to add an autopkgtest so that these build failures are detected sooner > > next time? It would have blocked the new harfbuzz from migrating to > > Testing. > > Sounds reasonable to me, but let's give the maintainer a chance to > agree or disagree to that. Adrian, did you cancel your NMU? I believe Ahmed El-Mahmoudy hasn't been active in Debian for a while. > > https://patches.ubuntu.com/r/raqm/raqm_0.7.0-4ubuntu1.patch > > Depends: @, @builddeps@ > would be better than the duplication in Ubuntu's change. Yes, that's a good idea. Thank you, Jeremy Bicha
Bug#1022404: raqm: diff for NMU version 0.7.0-4.1
On Fri, Nov 25, 2022 at 05:16:03AM -0600, Jeremy Bicha wrote: > Adrian, > > Do you think it would be useful to include Ubuntu's change in your NMU > to add an autopkgtest so that these build failures are detected sooner > next time? It would have blocked the new harfbuzz from migrating to > Testing. Sounds reasonable to me, but let's give the maintainer a chance to agree or disagree to that. > https://patches.ubuntu.com/r/raqm/raqm_0.7.0-4ubuntu1.patch Depends: @, @builddeps@ would be better than the duplication in Ubuntu's change. > Thank you, > Jeremy Bicha cu Adrian
Bug#1022404: raqm: diff for NMU version 0.7.0-4.1
Adrian, Do you think it would be useful to include Ubuntu's change in your NMU to add an autopkgtest so that these build failures are detected sooner next time? It would have blocked the new harfbuzz from migrating to Testing. https://patches.ubuntu.com/r/raqm/raqm_0.7.0-4ubuntu1.patch Thank you, Jeremy Bicha
Bug#1022404: raqm: diff for NMU version 0.7.0-4.1
Control: tags 1022404 + patch Control: tags 1022404 + pending Dear maintainer, I've prepared an NMU for raqm (versioned as 0.7.0-4.1) and uploaded it to DELAYED/15. Please feel free to tell me if I should cancel it. cu Adrian diff -Nru raqm-0.7.0/debian/changelog raqm-0.7.0/debian/changelog --- raqm-0.7.0/debian/changelog 2019-12-17 11:08:26.0 +0200 +++ raqm-0.7.0/debian/changelog 2022-11-19 21:15:45.0 +0200 @@ -1,3 +1,10 @@ +raqm (0.7.0-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add upstream fix for FTBFS with recent HarfBuzz. (Closes: #1022404) + + -- Adrian Bunk Sat, 19 Nov 2022 21:15:45 +0200 + raqm (0.7.0-4) unstable; urgency=medium * debian/tests/libssh-server: Use the correct compiler for proposed diff -Nru raqm-0.7.0/debian/patches/0001-Update-text-expectation.patch raqm-0.7.0/debian/patches/0001-Update-text-expectation.patch --- raqm-0.7.0/debian/patches/0001-Update-text-expectation.patch 1970-01-01 02:00:00.0 +0200 +++ raqm-0.7.0/debian/patches/0001-Update-text-expectation.patch 2022-11-19 19:32:08.0 +0200 @@ -0,0 +1,29 @@ +From 17170a1eeb63807b4035427f3ca2b3e475c8f42b Mon Sep 17 00:00:00 2001 +From: Khaled Hosny +Date: Wed, 25 Aug 2021 16:58:25 +0200 +Subject: Update text expectation + +--- + tests/cursor_position_GB8a.test | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/cursor_position_GB8a.test b/tests/cursor_position_GB8a.test +index bef963e..d161691 100644 +--- a/tests/cursor_position_GB8a.test b/tests/cursor_position_GB8a.test +@@ -32,9 +32,9 @@ glyph [0] x_offset: 0 y_offset: 0 x_advance: 748 font: Amiri + glyph [0] x_offset: 0 y_offset: 0 x_advance: 748 font: Amiri + glyph [0] x_offset: 0 y_offset: 0 x_advance: 748 font: Amiri + +-UTF-32 clusters: 00 01 02 03 +-UTF-8 clusters: 00 04 08 12 ++UTF-32 clusters: 00 00 02 02 ++UTF-8 clusters: 00 00 08 08 + +-The position is 2992 at index 12 ++The position is 2244 at index 8 + + The start-index is 4 at position 1000 +-- +2.30.2 + diff -Nru raqm-0.7.0/debian/patches/series raqm-0.7.0/debian/patches/series --- raqm-0.7.0/debian/patches/series 2019-12-17 11:08:26.0 +0200 +++ raqm-0.7.0/debian/patches/series 2022-11-19 21:15:36.0 +0200 @@ -1 +1,2 @@ use_py3.diff +0001-Update-text-expectation.patch
