diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe index 6347a39fa..d78705f29 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe @@ -7,7 +7,7 @@ srcGitRev="01ed09a3e1f4637f72d4239fe3724fcafa39be94" SRC_URI="https://github.com/weinhold/libsolv/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="4e96208d44dc15ed7ac95a86f35790f34a2bb97c0f0aa3dc355263a54a6ea7e1" SRC_FILENAME="$portVersionedName.tar.gz" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64 ppc arm" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -35,6 +35,7 @@ BUILD_PREREQUIRES=" " SOURCE_DIR="libsolv-$srcGitRev" +PATCHES="libsolv-$portVersion.patchset" PATCH() { diff --git a/dev-libs/libsolv/patches/libsolv-0.3.0_haiku_2013_10_01.patchset b/dev-libs/libsolv/patches/libsolv-0.3.0_haiku_2013_10_01.patchset new file mode 100644 index 000000000..371e5194f --- /dev/null +++ b/dev-libs/libsolv/patches/libsolv-0.3.0_haiku_2013_10_01.patchset @@ -0,0 +1,38 @@ +From 864ecf16d010628abed0242db2d4fa2effb9965d Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Fri, 21 Nov 2014 15:34:28 +0100 +Subject: Remove fopencookie hack. + +* mmu_man added these prototypes in Haiku so this now breaks the build. + +diff --git a/ext/solv_xfopen.c b/ext/solv_xfopen.c +index 63fec23..a9a6e40 100644 +--- a/ext/solv_xfopen.c ++++ b/ext/solv_xfopen.c +@@ -17,23 +17,6 @@ + #include "util.h" + + +-/* Evil hack for Haiku: fopencookie() is implemented internally, but not +- exported by a header. */ +-#ifdef __HAIKU__ +- +-typedef struct { +- ssize_t (*read)(void*, char*, size_t); +- ssize_t (*write)(void*, const char*, size_t); +- int (*seek)(off_t*, int); +- int (*close)(void*); +-} cookie_io_functions_t; +- +- +-FILE *fopencookie(void*, const char*, cookie_io_functions_t); +- +-#endif /* __HAIKU__ */ +- +- + static FILE *cookieopen(void *cookie, const char *mode, + ssize_t (*cread)(void *, char *, size_t), + ssize_t (*cwrite)(void *, const char *, size_t), +-- +1.8.3.4 +