commit: 6c01aed88eb04a5766c445cec08ff40b1e6088fa Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Tue Aug 23 17:21:44 2022 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Tue Aug 30 22:57:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c01aed8
dev-lang/ghc: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.14 Closes: https://github.com/gentoo/gentoo/pull/26984 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> dev-lang/ghc/files/ghc-8.10.3-C99-typo-ac270.patch | 12 ----------- dev-lang/ghc/files/ghc-9.0.2-modorigin.patch | 24 ---------------------- .../ghc/files/ghc-9.0.2-verbose-modunusable.patch | 12 ----------- 3 files changed, 48 deletions(-) diff --git a/dev-lang/ghc/files/ghc-8.10.3-C99-typo-ac270.patch b/dev-lang/ghc/files/ghc-8.10.3-C99-typo-ac270.patch deleted file mode 100644 index 762622a07e00..000000000000 --- a/dev-lang/ghc/files/ghc-8.10.3-C99-typo-ac270.patch +++ /dev/null @@ -1,12 +0,0 @@ -autoconf-2.70 does not allow macros with underscores. ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -673,7 +673,7 @@ AC_DEFUN([FP_SET_CFLAGS_C99], - CPPFLAGS="$$3" - unset ac_cv_prog_cc_c99 - dnl perform detection -- _AC_PROG_CC_C99 -+ AC_PROG_CC_C99 - fp_cc_c99="$ac_cv_prog_cc_c99" - case "x$ac_cv_prog_cc_c99" in - x) ;; # noop diff --git a/dev-lang/ghc/files/ghc-9.0.2-modorigin.patch b/dev-lang/ghc/files/ghc-9.0.2-modorigin.patch deleted file mode 100644 index 3c7053778e98..000000000000 --- a/dev-lang/ghc/files/ghc-9.0.2-modorigin.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/compiler/GHC/Unit/State.hs b/compiler/GHC/Unit/State.hs -index cefa5e5058bf68e68aaafadad0c7874189bf8225..92b38443c8378eb69db19a40d23abca47d6acee8 100644 ---- a/compiler/GHC/Unit/State.hs -+++ b/compiler/GHC/Unit/State.hs -@@ -224,14 +224,16 @@ fromFlag :: ModuleOrigin - fromFlag = ModOrigin Nothing [] [] True - - instance Semigroup ModuleOrigin where -- ModOrigin e res rhs f <> ModOrigin e' res' rhs' f' = -+ x@(ModOrigin e res rhs f) <> y@(ModOrigin e' res' rhs' f') = - ModOrigin (g e e') (res ++ res') (rhs ++ rhs') (f || f') - where g (Just b) (Just b') - | b == b' = Just b -- | otherwise = panic "ModOrigin: package both exposed/hidden" -+ | otherwise = pprPanic "ModOrigin: package both exposed/hidden" $ -+ text "x: " <> ppr x $$ text "y: " <> ppr y - g Nothing x = x - g x Nothing = x -- _x <> _y = panic "ModOrigin: hidden module redefined" -+ x <> y = pprPanic "ModOrigin: hidden module redefined" $ -+ text "x: " <> ppr x $$ text "y: " <> ppr y - - instance Monoid ModuleOrigin where - mempty = ModOrigin Nothing [] [] False diff --git a/dev-lang/ghc/files/ghc-9.0.2-verbose-modunusable.patch b/dev-lang/ghc/files/ghc-9.0.2-verbose-modunusable.patch deleted file mode 100644 index 13d12efdc0ec..000000000000 --- a/dev-lang/ghc/files/ghc-9.0.2-verbose-modunusable.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN ghc-9.0.2/compiler/GHC/Unit/State.hs ghc-9.0.2-r1/compiler/GHC/Unit/State.hs ---- ghc-9.0.2/compiler/GHC/Unit/State.hs 2021-10-19 05:20:00.000000000 -0600 -+++ ghc-9.0.2-r1/compiler/GHC/Unit/State.hs 2022-02-17 01:04:05.117930250 -0700 -@@ -194,7 +194,7 @@ - - instance Outputable ModuleOrigin where - ppr ModHidden = text "hidden module" -- ppr (ModUnusable _) = text "unusable module" -+ ppr (ModUnusable reason) = text "unusable module" $$ ppr reason - ppr (ModOrigin e res rhs f) = sep (punctuate comma ( - (case e of - Nothing -> []
