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/dbus: Bump to 1.2.27, patch to allow earlier TH
Patch (by me) to allow earlier template-haskell versions. Tests pass with network-sandbox, thanks to eroen for reporting. Fix: dbus depends on nonexistent version of lens gentoo#1360, thanks to Hypoon for reporting. Closes: gentoo-haskell/gentoo-haskell#1360 Closes: https://bugs.gentoo.org/575254 Signed-off-by: Mark Wright <[email protected]>
- Loading branch information
1 parent
79abfd1
commit 4184202
Showing
4 changed files
with
77 additions
and
7 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 |
---|---|---|
@@ -1 +1,2 @@ | ||
DIST dbus-1.2.22.tar.gz 78010 BLAKE2B c7189e15e0a9622e707bb50064584bd43141857257baec8e6d59d0cf39428b3b5efa82668ef70fbff218738ba5822b1aaad0c85b5e14bfa3ae4ef237e2458a9d SHA512 81f9fe1420939ebb5b03602ba59dd86656e4443690d8be460684dcb461ff7df1ff4cdf846a5a15ea6193b6f64b08526b27d3e12825a375eecbded3d0a99a59b9 | ||
DIST dbus-1.2.27.tar.gz 78017 BLAKE2B 396739e7e6af0fe1921c9d3857c0650db9532d00a3fd2eda18042d42ce8336631d93d0c0ce75681b695f9e90c7205e38aea7c4f984544460ecab19c7d5090478 SHA512 2c6b87b4a793b555ef617e3f3f89695116180f0e1df2f84ee3da62c819c05c10a78d328644b84c8c9796354ee6dd1c6ad6b0430a1b9a2d7fe112b251d4606e8d |
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,51 @@ | ||
# Copyright 1999-2022 Gentoo Authors | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI=8 | ||
|
||
# ebuild generated by hackport 0.7.1.1.9999 | ||
|
||
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" | ||
inherit haskell-cabal | ||
|
||
DESCRIPTION="A client library for the D-Bus IPC system" | ||
HOMEPAGE="https://github.com/rblaze/haskell-dbus#readme" | ||
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" | ||
|
||
LICENSE="Apache-2.0" | ||
SLOT="0/${PV}" | ||
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" | ||
|
||
PATCHES=( | ||
"${FILESDIR}/${PN}-1.2.22-disable-integration-tests.patch" | ||
"${FILESDIR}/${PN}-1.2.27-template-haskell.patch" | ||
) | ||
|
||
RDEPEND="<dev-haskell/cereal-0.6:=[profile?] | ||
>=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?] | ||
<dev-haskell/lens-5.3:=[profile?] | ||
>=dev-haskell/network-3.1.2.1:=[profile?] <dev-haskell/network-3.2:=[profile?] | ||
<dev-haskell/random-1.3:=[profile?] | ||
<dev-haskell/split-0.3:=[profile?] | ||
<dev-haskell/th-lift-0.9:=[profile?] | ||
<dev-haskell/vector-0.14:=[profile?] | ||
>=dev-haskell/xml-conduit-1.9.0.0:=[profile?] <dev-haskell/xml-conduit-1.10.0.0:=[profile?] | ||
<dev-haskell/xml-types-0.4:=[profile?] | ||
>=dev-lang/ghc-8.10.1:= | ||
" | ||
DEPEND="${RDEPEND} | ||
>=dev-haskell/cabal-3.2.0.0 | ||
test? ( <dev-haskell/extra-1.8 | ||
<dev-haskell/quickcheck-2.15 | ||
<dev-haskell/resourcet-1.3 | ||
<dev-haskell/tasty-1.5 | ||
<dev-haskell/tasty-hunit-0.11 | ||
<dev-haskell/tasty-quickcheck-0.11 ) | ||
" | ||
|
||
src_prepare() { | ||
default | ||
cabal_chdeps \ | ||
"base >=4.16 && <5" "base >=4 && <5" \ | ||
"template-haskell >= 2.18 && < 2.20" "template-haskell" | ||
} |
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,14 @@ | ||
--- dbus-1.2.27-orig/lib/DBus/Generation.hs 2022-07-13 00:32:15.000000000 +1000 | ||
+++ dbus-1.2.27/lib/DBus/Generation.hs 2022-11-15 11:11:32.291154128 +1100 | ||
@@ -148,7 +148,11 @@ | ||
makeFromVariantApp name = AppE (VarE 'T.fromVariant) $ VarE name | ||
|
||
makeJustPattern :: Name -> Pat | ||
+#if MIN_VERSION_template_haskell(2,18,0) | ||
makeJustPattern name = ConP 'Just [] [VarP name] | ||
+#else | ||
+makeJustPattern name = ConP 'Just [VarP name] | ||
+#endif | ||
|
||
mapOrHead :: | ||
(Num a, Eq a) => a -> (t -> b) -> [t] -> ([b] -> b) -> b |
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