CVS commit: pkgsrc/devel/hs-ghcide

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Mon Nov  9 13:49:19 UTC 2026

Modified Files:
        pkgsrc/devel/hs-ghcide: distinfo
Added Files:
        pkgsrc/devel/hs-ghcide/patches: patch-src_Development_IDE_GHC_CPP.hs
            patch-src_Development_IDE_GHC_Compat_Core.hs

Log Message:
devel/hs-ghcide: Fix a breakage on (not-yet-committed) GHC 9.10.3


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/hs-ghcide/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/hs-ghcide/patches/patch-src_Development_IDE_GHC_CPP.hs \
    pkgsrc/devel/hs-ghcide/patches/patch-src_Development_IDE_GHC_Compat_Core.hs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/hs-ghcide/distinfo
diff -u pkgsrc/devel/hs-ghcide/distinfo:1.5 pkgsrc/devel/hs-ghcide/distinfo:1.6
--- pkgsrc/devel/hs-ghcide/distinfo:1.5 Fri Jan 31 10:22:40 2025
+++ pkgsrc/devel/hs-ghcide/distinfo     Mon Nov  9 13:49:19 2026
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.5 2025/01/31 10:22:40 pho Exp $
+$NetBSD: distinfo,v 1.6 2026/11/09 13:49:19 pho Exp $
 
 BLAKE2s (ghcide-2.9.0.0.tar.gz) = 6a456c7c6e1ada53350f41ca01ba4f01f210c3780737dc1da02c9d35fcf892aa
 SHA512 (ghcide-2.9.0.0.tar.gz) = f8d0cb3f05c8d7d72d6762a59b957174acccf845fa12336cf1056d8eff36d92a318e567c95a67174fbfddd9dcb1e8b525aeb9f8ff52034fa3afb435c095792d0
 Size (ghcide-2.9.0.0.tar.gz) = 255532 bytes
+SHA1 (patch-src_Development_IDE_GHC_CPP.hs) = 661eab87b0c707af581235bf0b2cad96731d9c2f
+SHA1 (patch-src_Development_IDE_GHC_Compat_Core.hs) = dc6eacb5140731c6da3c4238414e12262a3d32ef

Added files:

Index: pkgsrc/devel/hs-ghcide/patches/patch-src_Development_IDE_GHC_CPP.hs
diff -u /dev/null pkgsrc/devel/hs-ghcide/patches/patch-src_Development_IDE_GHC_CPP.hs:1.1
--- /dev/null   Mon Nov  9 13:49:19 2026
+++ pkgsrc/devel/hs-ghcide/patches/patch-src_Development_IDE_GHC_CPP.hs Mon Nov  9 13:49:19 2026
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_Development_IDE_GHC_CPP.hs,v 1.1 2026/11/09 13:49:19 pho Exp $
+
+Fix a build failure on GHC 9.10.3. The change to the type Pipeline.CppOpts
+was backported to the 9.10 branch, which made this #if conditional
+incorrect.
+
+While this is technically an upstream bug, we will be upgrading our GHC in
+the near future anyway, so the patch isn't really worth upstreaming.
+
+--- src/Development/IDE/GHC/CPP.hs.orig        2026-11-09 13:40:21.653372462 +0000
++++ src/Development/IDE/GHC/CPP.hs
+@@ -34,7 +34,7 @@ import qualified GHC.Driver.Pipeline.Exe
+ import qualified GHC.SysTools.Cpp                as Pipeline
+ #endif
+ 
+-#if MIN_VERSION_ghc(9,11,0)
++#if MIN_VERSION_ghc(9,10,3)
+ import qualified GHC.SysTools.Tasks              as Pipeline
+ #endif
+ 
+@@ -56,7 +56,7 @@ doCpp env input_fn output_fn =
+ #if MIN_VERSION_ghc(9,5,0)
+     let cpp_opts = Pipeline.CppOpts
+                  { cppLinePragmas = True
+-#if MIN_VERSION_ghc(9,11,0)
++#if MIN_VERSION_ghc(9,10,3)
+                  , sourceCodePreprocessor = Pipeline.SCPHsCpp
+ #elif MIN_VERSION_ghc(9,10,0)
+                  , useHsCpp = True
Index: pkgsrc/devel/hs-ghcide/patches/patch-src_Development_IDE_GHC_Compat_Core.hs
diff -u /dev/null pkgsrc/devel/hs-ghcide/patches/patch-src_Development_IDE_GHC_Compat_Core.hs:1.1
--- /dev/null   Mon Nov  9 13:49:19 2026
+++ pkgsrc/devel/hs-ghcide/patches/patch-src_Development_IDE_GHC_Compat_Core.hs Mon Nov  9 13:49:19 2026
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_Development_IDE_GHC_Compat_Core.hs,v 1.1 2026/11/09 13:49:19 pho Exp $
+
+Fix a build failure on GHC 9.10.3. The change to the return type of
+GHCi.loadDLL was backported to the 9.10 branch, which made this #if
+conditional incorrect.
+
+While this is technically an upstream bug, we will be upgrading our GHC in
+the near future anyway, so the patch isn't really worth upstreaming.
+
+--- src/Development/IDE/GHC/Compat/Core.hs.orig        2026-11-09 13:32:53.302881061 +0000
++++ src/Development/IDE/GHC/Compat/Core.hs
+@@ -703,7 +703,7 @@ initObjLinker env =
+ loadDLL :: HscEnv -> String -> IO (Maybe String)
+ loadDLL env str = do
+     res <- GHCi.loadDLL (GHCi.hscInterp env) str
+-#if MIN_VERSION_ghc(9,11,0)
++#if MIN_VERSION_ghc(9,10,3)
+     pure $
+       case res of
+         Left err_msg -> Just err_msg