[Git][haskell-team/DHG_packages][master] pango: Backport patch to build with newer libpango

[Ilias Tsitsimpis (@iliastsi)]

Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
b0622777 by Ilias Tsitsimpis at 2025-02-28T18:14:41+02:00
pango: Backport patch to build with newer libpango

- - - - -


3 changed files:

- p/haskell-pango/debian/changelog
- + p/haskell-pango/debian/patches/fix-WrapNone
- + p/haskell-pango/debian/patches/series


Changes:

=====================================
p/haskell-pango/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-pango (0.13.11.0-2) unstable; urgency=medium
+
+  * Backport patch to build with newer libpango (Closes: #1094992)
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Fri, 28 Feb 2025 18:14:06 +0200
+
 haskell-pango (0.13.11.0-1) unstable; urgency=medium
 
   * Declare compliance with Debian policy 4.7.0


=====================================
p/haskell-pango/debian/patches/fix-WrapNone
=====================================
@@ -0,0 +1,32 @@
+From ca7f98bd3e9462deac3661244dc76004a36fc8c3 Mon Sep 17 00:00:00 2001
+From: Wen Kokke <wenkokke at users.noreply.github.com>
+Date: Mon, 20 Jan 2025 13:41:48 +0000
+Subject: [PATCH] fix(pango): map PANGO_WRAP_NONE to WrapNowhere to avoid
+ conflict with Gtk WrapMode
+
+Origin: https://github.com/gtk2hs/gtk2hs/pull/336/
+Index: b/Graphics/Rendering/Pango/Layout.chs
+===================================================================
+--- a/Graphics/Rendering/Pango/Layout.chs
++++ b/Graphics/Rendering/Pango/Layout.chs
+@@ -356,11 +356,20 @@ layoutGetWidth (PangoLayout _ pl) = do
+ --   a word if it is the only one on this line and it exceeds the
+ --   specified width.
+ --
++#if PANGO_VERSION_CHECK(1,56,0)
++{#enum PangoWrapMode as LayoutWrapMode
++  {underscoreToCase,
++  PANGO_WRAP_WORD as WrapWholeWords,
++  PANGO_WRAP_CHAR as WrapAnywhere,
++  PANGO_WRAP_WORD_CHAR as WrapPartialWords,
++  PANGO_WRAP_NONE as WrapNowhere}#}
++#else
+ {#enum PangoWrapMode as LayoutWrapMode
+   {underscoreToCase,
+   PANGO_WRAP_WORD as WrapWholeWords,
+   PANGO_WRAP_CHAR as WrapAnywhere,
+   PANGO_WRAP_WORD_CHAR as WrapPartialWords}#}
++#endif
+ 
+ -- | Set how this paragraph is wrapped.
+ --


=====================================
p/haskell-pango/debian/patches/series
=====================================
@@ -0,0 +1 @@
+fix-WrapNone



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/b0622777c94e85c5d607726d14c76b511018e9b0

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/b0622777c94e85c5d607726d14c76b511018e9b0
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20250228/e747a643/attachment-0001.htm>