diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2020-08-15 21:15:00 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-08-15 21:15:00 +0100 |
| commit | 21bdeddb28b45dc1f9ca0c09496136f99c116d1b (patch) | |
| tree | 070ab932ad402fd4c9c093d3148c1419c22e7a71 /dev-vcs/darcs | |
| parent | profiles/package.mask: mask dev-haskell/crypto-conduit for removal (diff) | |
| download | gentoo-21bdeddb28b45dc1f9ca0c09496136f99c116d1b.tar.gz gentoo-21bdeddb28b45dc1f9ca0c09496136f99c116d1b.tar.bz2 gentoo-21bdeddb28b45dc1f9ca0c09496136f99c116d1b.zip | |
dev-vcs/darcs: fix PACKAG_VERSION definition
Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/737236
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'dev-vcs/darcs')
| -rw-r--r-- | dev-vcs/darcs/darcs-2.16.1.ebuild | 2 | ||||
| -rw-r--r-- | dev-vcs/darcs/files/darcs-2.16.1-curl.patch | 25 |
2 files changed, 27 insertions, 0 deletions
diff --git a/dev-vcs/darcs/darcs-2.16.1.ebuild b/dev-vcs/darcs/darcs-2.16.1.ebuild index f1a923a53c4c..e33373b03406 100644 --- a/dev-vcs/darcs/darcs-2.16.1.ebuild +++ b/dev-vcs/darcs/darcs-2.16.1.ebuild @@ -70,6 +70,8 @@ DEPEND="${RDEPEND} curl? ( virtual/pkgconfig ) " +PATCHES=("${FILESDIR}"/${PN}-2.16.1-curl.patch) + src_configure() { haskell-cabal_src_configure \ $(cabal_flag curl curl) \ diff --git a/dev-vcs/darcs/files/darcs-2.16.1-curl.patch b/dev-vcs/darcs/files/darcs-2.16.1-curl.patch new file mode 100644 index 000000000000..8216ce2e8c4f --- /dev/null +++ b/dev-vcs/darcs/files/darcs-2.16.1-curl.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/737236 + +--- a/src/hscurl.c ++++ b/src/hscurl.c +@@ -11,6 +11,9 @@ + #define ENABLE_PIPELINING + #endif + ++/* workaround for https://bugs.gentoo.org/737236 */ ++#include "cabal_macros.h" ++ + enum RESULT_CODES + { + RESULT_OK = 0, +@@ -46,6 +49,10 @@ struct UrlData + + static int debug = 0; + #ifndef _WIN32 ++#ifndef PACKAGE_VERSION ++/* workaround for https://bugs.gentoo.org/737236 */ ++# define PACKAGE_VERSION CURRENT_PACKAGE_VERSION ++#endif + static const char user_agent[] = + "darcs/" PACKAGE_VERSION " libcurl/" LIBCURL_VERSION; + #else |