From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch | 32 ++++++++++++++++++++++ dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch | 12 ++++++++ 2 files changed, 44 insertions(+) create mode 100644 dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch create mode 100644 dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch (limited to 'dev-haskell/wxc/files') diff --git a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch new file mode 100644 index 000000000000..86d523b362f1 --- /dev/null +++ b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-2.2.patch @@ -0,0 +1,32 @@ +--- a/Setup.hs ++++ b/Setup.hs +@@ -22,2 +22,3 @@ import Distribution.Simple.Setup ( BuildFlags, ConfigFlags + import Distribution.Simple.Utils (installOrdinaryFile, rawSystemExitWithEnv, rawSystemStdInOut, die) ++import qualified Distribution.Simple.Utils as DSU + import Distribution.System (OS (..), Arch (..), buildOS, buildArch) +@@ -81,3 +82,9 @@ rawShellSystemStdInOut :: Verbosity -- Verbosity level + -> IO (String, String, ExitCode) -- (Command result, Errors, Command exit status) ++#if MIN_VERSION_Cabal(2,2,0) ++rawShellSystemStdInOut v f as = do ++ (~(DSU.IODataText so), se, c) <- rawSystemStdInOut v "sh" (f:as) Nothing Nothing Nothing DSU.IODataModeText ++ return (so, se, c) ++#else + rawShellSystemStdInOut v f as = rawSystemStdInOut v "sh" (f:as) Nothing Nothing Nothing False ++#endif + +@@ -438,3 +445,7 @@ deMsysPaths bi = do + let cor ph = do ++#if MIN_VERSION_Cabal(2,2,0) ++ (~(DSU.IODataText r), e, c) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++ "; pwd -W"] Nothing Nothing Nothing DSU.IODataModeText ++#else + (r, e, c ) <- rawSystemStdInOut normal "sh" ["-c", "cd " ++ ph ++ "; pwd -W"] Nothing Nothing Nothing False ++#endif + unless (c == ExitSuccess) (putStrLn ("Error: failed to convert MSYS path to native path \n" ++ e) >> exitFailure) +@@ -504,3 +515,7 @@ sharedLibName ver basename = + where ++#if MIN_VERSION_Cabal(2,2,0) ++ full_ver = (concat . intersperse "." . map show . versionNumbers) ver ++#else + full_ver = (concat . intersperse "." . map show . versionBranch) ver ++#endif + diff --git a/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch new file mode 100644 index 000000000000..5d474098987d --- /dev/null +++ b/dev-haskell/wxc/files/wxc-0.92.3.0-cabal-3.patch @@ -0,0 +1,12 @@ +--- a/Setup.hs ++++ b/Setup.hs +@@ -19,7 +19,8 @@ import Distribution.Simple.Setup ( BuildFlags, ConfigFlags + , InstallFlags, installVerbosity + , fromFlag, fromFlagOrDefault, copyDest + ) +-import Distribution.Simple.Utils (installOrdinaryFile, rawSystemExitWithEnv, rawSystemStdInOut, die) ++import Distribution.Simple.Utils (installOrdinaryFile, rawSystemExitWithEnv, rawSystemStdInOut) ++import System.Exit (die) + import qualified Distribution.Simple.Utils as DSU + import Distribution.System (OS (..), Arch (..), buildOS, buildArch) + import Distribution.Verbosity (Verbosity, normal, verbose) -- cgit v1.2.3