forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-haskell/pango: tweak for Cabal-1.24
Use older deprecated (but still available) cabal helpers. Reported-by: Toralf Förster Closes: https://bugs.gentoo.org/702986 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Sergei Trofimovich <[email protected]>
- Loading branch information
Sergei Trofimovich
committed
Dec 15, 2019
1 parent
d417cd5
commit f2a50df
Showing
2 changed files
with
35 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
https://bugs.gentoo.org/702986 | ||
|
||
--- a/Setup.hs | ||
+++ b/Setup.hs | ||
@@ -8,7 +8,7 @@ import Distribution.Simple ( defaultMainWithHooks, UserHooks(postConf), | ||
import Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages) | ||
import Distribution.Simple.Setup ( ConfigFlags(configVerbosity), fromFlag) | ||
import Distribution.Simple.LocalBuildInfo ( LocalBuildInfo(..) ) | ||
-import Distribution.Simple.BuildPaths ( autogenPackageModulesDir ) | ||
+import Distribution.Simple.BuildPaths ( autogenModulesDir ) | ||
import Distribution.Text ( display ) | ||
import Distribution.Version ( Version(..) ) | ||
import Distribution.Verbosity | ||
@@ -49,7 +49,7 @@ writePangoVersionHeaderFile verbosity lbi (Version (major:minor:micro:_) []) = d | ||
, "#define PANGO_VERSION_MICRO " ++ show micro | ||
] | ||
where | ||
- targetDir = autogenPackageModulesDir lbi | ||
+ targetDir = autogenModulesDir lbi | ||
targetFile = targetDir </> "hspangoversion.h" | ||
|
||
writeVersionHeaderFile _ _ version = | ||
--- a/Setup.hs | ||
+++ b/Setup.hs | ||
@@ -43,7 +43,7 @@ writePangoVersionHeaderFile verbosity lbi (versionNumbers -> (major:minor:micro: | ||
writePangoVersionHeaderFile verbosity lbi (Version (major:minor:micro:_) []) = do | ||
#endif | ||
createDirectoryIfMissingVerbose verbosity True targetDir | ||
- rewriteFileEx verbosity targetFile $ unlines | ||
+ rewriteFile targetFile $ unlines | ||
[ "#define PANGO_VERSION_MAJOR " ++ show major | ||
, "#define PANGO_VERSION_MINOR " ++ show minor | ||
, "#define PANGO_VERSION_MICRO " ++ show micro |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters