| 1 |
commit: f3b963504036a0835d32866249ff95834ffb8263 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 30 09:28:17 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 30 09:28:17 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b96350 |
| 7 |
|
| 8 |
dev-haskell/wxcore: bump up to 0.92.3.0 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-haskell/wxcore/Manifest | 1 + |
| 14 |
.../wxcore/files/wxcore-0.92.2.0-ghc-8.4.patch | 5 +++ |
| 15 |
.../wxcore/files/wxcore-0.92.3.0-cabal-3.patch | 11 +++++ |
| 16 |
dev-haskell/wxcore/wxcore-0.92.3.0.ebuild | 52 ++++++++++++++++++++++ |
| 17 |
4 files changed, 69 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-haskell/wxcore/Manifest b/dev-haskell/wxcore/Manifest |
| 20 |
index 7eb5e7040cb..59e419e066a 100644 |
| 21 |
--- a/dev-haskell/wxcore/Manifest |
| 22 |
+++ b/dev-haskell/wxcore/Manifest |
| 23 |
@@ -1 +1,2 @@ |
| 24 |
DIST wxcore-0.92.2.0.tar.gz 400116 BLAKE2B c4d87792ad7a7fdf125ef68211f1efe89bff9d3114dc2dacb8f7b96a824fa359addb00c331e3d8fd6325cf90cf3c78448c500431ef18ac7d2989eedee952e17c SHA512 e1339ea30a699e22a9fc2f12b6ddcd773911e4d611f834886952bde4d76205c448e1702bab3148f4c370eec1cabeac06655b4cf3cbbfe24e2ea08a628906880a |
| 25 |
+DIST wxcore-0.92.3.0.tar.gz 400300 BLAKE2B ce7ea6e2ec71935001d0b1fd347d5aa57de5d9f7cab9cf9fa87879c8dfd6291e76811899aeaccf8c227d54e6b0499ea5420dabac84014cbbf6373f8dd8a60f0f SHA512 199eb8afa9b568637c8d1fb2ab8b98a73d4ea9f03df088a855a88f17728997ed1044fb7c1c69d732530d7b24ae312e8dfc3f6ffc0396765d583531524d10a442 |
| 26 |
|
| 27 |
diff --git a/dev-haskell/wxcore/files/wxcore-0.92.2.0-ghc-8.4.patch b/dev-haskell/wxcore/files/wxcore-0.92.2.0-ghc-8.4.patch |
| 28 |
new file mode 100644 |
| 29 |
index 00000000000..6c7c2c7e9ce |
| 30 |
--- /dev/null |
| 31 |
+++ b/dev-haskell/wxcore/files/wxcore-0.92.2.0-ghc-8.4.patch |
| 32 |
@@ -0,0 +1,5 @@ |
| 33 |
+--- a/src/haskell/Graphics/UI/WXCore/WxcTypes.hs |
| 34 |
++++ b/src/haskell/Graphics/UI/WXCore/WxcTypes.hs |
| 35 |
+@@ -125 +125 @@ import Data.Ix |
| 36 |
+-import Foreign.C |
| 37 |
++import Foreign.C hiding (CBool) |
| 38 |
|
| 39 |
diff --git a/dev-haskell/wxcore/files/wxcore-0.92.3.0-cabal-3.patch b/dev-haskell/wxcore/files/wxcore-0.92.3.0-cabal-3.patch |
| 40 |
new file mode 100644 |
| 41 |
index 00000000000..b93da91f7f4 |
| 42 |
--- /dev/null |
| 43 |
+++ b/dev-haskell/wxcore/files/wxcore-0.92.3.0-cabal-3.patch |
| 44 |
@@ -0,0 +1,11 @@ |
| 45 |
+--- a/Setup.hs |
| 46 |
++++ b/Setup.hs |
| 47 |
+@@ -7,7 +7,7 @@ import Data.List (foldl', intersperse, intercalate, nub, lookup, isPrefixOf, isI |
| 48 |
+ import Data.Maybe (fromJust) |
| 49 |
+ import Distribution.PackageDescription hiding (includeDirs) |
| 50 |
+ import qualified Distribution.PackageDescription as PD (includeDirs) |
| 51 |
+-import Distribution.InstalledPackageInfo(installedPackageId, sourcePackageId, includeDirs) |
| 52 |
++import Distribution.InstalledPackageInfo({-installedPackageId,-} sourcePackageId, includeDirs) |
| 53 |
+ import Distribution.Simple |
| 54 |
+ import Distribution.Simple.LocalBuildInfo (LocalBuildInfo, localPkgDescr, installedPkgs, withPrograms, buildDir) |
| 55 |
+ import Distribution.Simple.PackageIndex(SearchResult (..), searchByName, allPackages ) |
| 56 |
|
| 57 |
diff --git a/dev-haskell/wxcore/wxcore-0.92.3.0.ebuild b/dev-haskell/wxcore/wxcore-0.92.3.0.ebuild |
| 58 |
new file mode 100644 |
| 59 |
index 00000000000..45fad5cbefe |
| 60 |
--- /dev/null |
| 61 |
+++ b/dev-haskell/wxcore/wxcore-0.92.3.0.ebuild |
| 62 |
@@ -0,0 +1,52 @@ |
| 63 |
+# Copyright 1999-2020 Gentoo Authors |
| 64 |
+# Distributed under the terms of the GNU General Public License v2 |
| 65 |
+ |
| 66 |
+EAPI=6 |
| 67 |
+ |
| 68 |
+# ebuild generated by hackport 0.5.3.9999 |
| 69 |
+ |
| 70 |
+WX_GTK_VER="3.0" |
| 71 |
+ |
| 72 |
+CABAL_FEATURES="lib profile haddock hoogle hscolour" |
| 73 |
+inherit haskell-cabal wxwidgets |
| 74 |
+ |
| 75 |
+DESCRIPTION="wxHaskell core" |
| 76 |
+HOMEPAGE="https://wiki.haskell.org/WxHaskell" |
| 77 |
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" |
| 78 |
+ |
| 79 |
+LICENSE="wxWinLL-3.1" |
| 80 |
+SLOT="${WX_GTK_VER}/${PV}" |
| 81 |
+KEYWORDS="~amd64 ~x86" |
| 82 |
+IUSE="gstreamer" |
| 83 |
+ |
| 84 |
+RDEPEND="dev-haskell/parsec:=[profile?] |
| 85 |
+ dev-haskell/stm:=[profile?] |
| 86 |
+ >=dev-haskell/wxc-0.92:${WX_GTK_VER}=[profile?,gstreamer?] |
| 87 |
+ >=dev-haskell/wxdirect-0.91:${WX_GTK_VER}=[profile?] |
| 88 |
+ >=dev-lang/ghc-7.4.1:= |
| 89 |
+ x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer?,opengl] |
| 90 |
+" |
| 91 |
+DEPEND="${RDEPEND} |
| 92 |
+ >=dev-haskell/cabal-1.23 |
| 93 |
+" |
| 94 |
+ |
| 95 |
+PATCHES=( |
| 96 |
+ "${FILESDIR}"/${PN}-0.92.2.0-ghc-8.4.patch |
| 97 |
+ "${FILESDIR}"/${PN}-0.92.3.0-cabal-3.patch |
| 98 |
+) |
| 99 |
+ |
| 100 |
+src_prepare() { |
| 101 |
+ default |
| 102 |
+ |
| 103 |
+ sed -e "s@wxdirect@wxdirect-${WX_GTK_VER}@g" \ |
| 104 |
+ -i "${S}/Setup.hs" \ |
| 105 |
+ || die "Could not change Setup.hs for wxdirect slot ${WX_GTK_VER}" |
| 106 |
+ |
| 107 |
+ cabal_chdeps\ |
| 108 |
+ 'containers >= 0.2 && < 0.6' 'containers >=0.2' |
| 109 |
+} |
| 110 |
+ |
| 111 |
+src_configure() { |
| 112 |
+ haskell-cabal_src_configure \ |
| 113 |
+ --flag=splitbase |
| 114 |
+} |
Archives