[Git][haskell-team/DHG_packages][master] 2 commits: haskell-haskell-gi: cherry-pick upstream build fix for newer glib2.0 2.79.0

[Gianfranco Costamagna (@locutusofborg)]

Gianfranco Costamagna pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
39230a5f by Gianfranco Costamagna at 2024-03-30T08:54:43+01:00
haskell-haskell-gi: cherry-pick upstream build fix for newer glib2.0 2.79.0

- - - - -
182fca6d by Gianfranco Costamagna at 2024-03-30T08:58:40+01:00
Merge remote-tracking branch 'origin/master'

- - - - -


3 changed files:

- p/haskell-haskell-gi/debian/changelog
- + p/haskell-haskell-gi/debian/patches/7bb9bf28755ddd3ac0e01613b46f57d4532b5d36.patch
- p/haskell-haskell-gi/debian/patches/series


Changes:

=====================================
p/haskell-haskell-gi/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-haskell-gi (0.26.7-3) unstable; urgency=medium
+
+  * debian/patches/7bb9bf28755ddd3ac0e01613b46f57d4532b5d36.patch:
+    - cherry-pick upstream build fix for newer glib2.0
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Sat, 30 Mar 2024 08:10:33 +0100
+
 haskell-haskell-gi (0.26.7-2) unstable; urgency=medium
 
   * Declare compliance with Debian policy 4.6.2


=====================================
p/haskell-haskell-gi/debian/patches/7bb9bf28755ddd3ac0e01613b46f57d4532b5d36.patch
=====================================
@@ -0,0 +1,43 @@
+From 7bb9bf28755ddd3ac0e01613b46f57d4532b5d36 Mon Sep 17 00:00:00 2001
+From: David Shea <reallylongword at gmail.com>
+Date: Sat, 17 Feb 2024 14:37:24 -0500
+Subject: [PATCH] Add scope type "forever" (#427)
+
+Fixes #425
+---
+ lib/Data/GI/CodeGen/Callable.hs | 1 +
+ lib/Data/GI/GIR/Arg.hs          | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/lib/Data/GI/CodeGen/Callable.hs b/lib/Data/GI/CodeGen/Callable.hs
+index 52a23c2e..60541595 100644
+--- a/lib/Data/GI/CodeGen/Callable.hs
++++ b/lib/Data/GI/CodeGen/Callable.hs
+@@ -573,6 +573,7 @@ prepareClosures callable nameMap = do
+                     n -> let destroyName = escapedArgName $ (args callable)!!n
+                          in line $ "let " <> destroyName <> " = FP.nullFunPtr"
+                 ScopeTypeCall -> line $ "let " <> closureName <> " = nullPtr"
++                ScopeTypeForever -> line $ "let " <> closureName <> " = nullPtr"
+             _ -> badIntroError $ "Closure \"" <> n <> "\" is not a callback."
+ 
+ freeCallCallbacks :: Callable -> Map.Map Text Text -> ExcCodeGen ()
+diff --git a/lib/Data/GI/GIR/Arg.hs b/lib/Data/GI/GIR/Arg.hs
+index 6d6f3792..cbe2e554 100644
+--- a/lib/Data/GI/GIR/Arg.hs
++++ b/lib/Data/GI/GIR/Arg.hs
+@@ -24,6 +24,7 @@ data Scope = ScopeTypeInvalid
+            | ScopeTypeCall
+            | ScopeTypeAsync
+            | ScopeTypeNotified
++           | ScopeTypeForever
+              deriving (Show, Eq, Ord)
+ 
+ data Arg = Arg {
+@@ -54,6 +55,7 @@ parseScope :: Text -> Parser Scope
+ parseScope "call" = return ScopeTypeCall
+ parseScope "async" = return ScopeTypeAsync
+ parseScope "notified" = return ScopeTypeNotified
++parseScope "forever" = return ScopeTypeForever
+ parseScope s = parseError $ "Unknown scope type \"" <> s <> "\""
+ 
+ parseDirection :: Text -> Parser Direction


=====================================
p/haskell-haskell-gi/debian/patches/series
=====================================
@@ -1 +1,2 @@
 force-overloading
+7bb9bf28755ddd3ac0e01613b46f57d4532b5d36.patch



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/7e045c97427d5be1f1174c855a887540613df46c...182fca6d76b5834b3b01c1eb2aeee2df23f4f68c

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/7e045c97427d5be1f1174c855a887540613df46c...182fca6d76b5834b3b01c1eb2aeee2df23f4f68c
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/20240330/2f1114b4/attachment-0001.htm>