| 1 |
commit: 848082f3ba866fdae1b9c2e2c1af6cfed948f16f |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Aug 29 18:43:54 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 30 07:59:50 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=848082f3 |
| 7 |
|
| 8 |
dev-haskell/hdbc-mysql: remove unused patch(es) |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/17319 |
| 13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/hdbc-mysql-0.6.6.1-cabal-1.18.patch | 33 ---------------------- |
| 16 |
.../files/hdbc-mysql-0.6.6.1-extralib.patch | 18 ------------ |
| 17 |
2 files changed, 51 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-cabal-1.18.patch b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-cabal-1.18.patch |
| 20 |
deleted file mode 100644 |
| 21 |
index 83ddd4a4c8c..00000000000 |
| 22 |
--- a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-cabal-1.18.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,33 +0,0 @@ |
| 25 |
---- HDBC-mysql-0.6.6.1-orig/Setup.lhs 2012-08-30 13:40:03.000000000 +1000 |
| 26 |
-+++ HDBC-mysql-0.6.6.1/Setup.lhs 2014-07-03 22:31:21.162259637 +1000 |
| 27 |
-@@ -1,6 +1,7 @@ |
| 28 |
- #!/usr/bin/env runhaskell |
| 29 |
- |
| 30 |
- \begin{code} |
| 31 |
-+{-# LANGUAGE MultiParamTypeClasses, FlexibleInstances #-} |
| 32 |
- import Distribution.Simple |
| 33 |
- import Distribution.PackageDescription |
| 34 |
- import Distribution.Version |
| 35 |
-@@ -26,8 +27,21 @@ |
| 36 |
- } |
| 37 |
- } |
| 38 |
- |
| 39 |
-+-- 'ConstOrId' is a @Cabal-1.16@ vs @Cabal-1.18@ compatibility hack, |
| 40 |
-+-- 'programFindLocation' has a new (unused in this case) |
| 41 |
-+-- parameter. 'ConstOrId' adds this parameter when types say it is |
| 42 |
-+-- mandatory. |
| 43 |
-+class ConstOrId a b where |
| 44 |
-+ constOrId :: a -> b |
| 45 |
-+ |
| 46 |
-+instance ConstOrId a a where |
| 47 |
-+ constOrId = id |
| 48 |
-+ |
| 49 |
-+instance ConstOrId a (b -> a) where |
| 50 |
-+ constOrId = const |
| 51 |
-+ |
| 52 |
- mysqlConfigProgram = (simpleProgram "mysql_config") { |
| 53 |
-- programFindLocation = \verbosity -> do |
| 54 |
-+ programFindLocation = \verbosity -> constOrId $ do |
| 55 |
- mysql_config <- findProgramOnPath "mysql_config" verbosity |
| 56 |
- mysql_config5 <- findProgramOnPath "mysql_config5" verbosity |
| 57 |
- return (mysql_config `mplus` mysql_config5) |
| 58 |
|
| 59 |
diff --git a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch |
| 60 |
deleted file mode 100644 |
| 61 |
index 8b9993969cb..00000000000 |
| 62 |
--- a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch |
| 63 |
+++ /dev/null |
| 64 |
@@ -1,18 +0,0 @@ |
| 65 |
-commit d53860f7edb75873e263111129c159802b2ac5a6 |
| 66 |
-Author: Satoshi Nakamura <snakamura@×××××××××.com> |
| 67 |
-Date: Tue May 27 15:44:57 2014 +0900 |
| 68 |
- |
| 69 |
- Add mysqlclient to Extra-Libraries |
| 70 |
- |
| 71 |
-diff --git a/HDBC-mysql.cabal b/HDBC-mysql.cabal |
| 72 |
-index 2d56d8b..6a8967a 100644 |
| 73 |
---- a/HDBC-mysql.cabal |
| 74 |
-+++ b/HDBC-mysql.cabal |
| 75 |
-@@ -32,6 +32,7 @@ library |
| 76 |
- time, |
| 77 |
- utf8-string |
| 78 |
- ghc-options: -Wall |
| 79 |
-+ Extra-Libraries: mysqlclient |
| 80 |
- |
| 81 |
- source-repository head |
| 82 |
- type: git |
Archives