diff --git a/dev-libs/msgpack_c_cpp/msgpack_c_cpp-2.1.5.recipe b/dev-libs/msgpack_c_cpp/msgpack_c_cpp-2.1.5.recipe deleted file mode 100644 index 13cccfb82..000000000 --- a/dev-libs/msgpack_c_cpp/msgpack_c_cpp-2.1.5.recipe +++ /dev/null @@ -1,98 +0,0 @@ -SUMMARY="A serialization library" -DESCRIPTION="An efficient binary serialization format, which lets you exchange \ -data among multiple languages like JSON, except that it's faster and smaller. \ -Small integers are encoded into a single byte while typical short strings \ -require only one extra byte in addition to the strings themselves." -HOMEPAGE="https://msgpack.org/" -COPYRIGHT="2010-2017 MessagePack Developers" -LICENSE="Boost v1.0" -REVISION="1" -SOURCE_URI="https://github.com/msgpack/msgpack-c/archive/cpp-$portVersion.tar.gz" -CHECKSUM_SHA256="9c87f80fc651b900772deaef0ab154b63160c74d292529b5be6d06d6485d4640" -SOURCE_DIR="msgpack-c-cpp-$portVersion" - -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PROVIDES=" - msgpack_c_cpp$secondaryArchSuffix = $portVersion - lib:libmsgpackc$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -PROVIDES_devel=" - msgpack_c_cpp${secondaryArchSuffix}_devel = $portVersion - devel:libmsgpackc$secondaryArchSuffix = $portVersion - " -REQUIRES_devel=" - msgpack_c_cpp$secondaryArchSuffix == $portVersion base - devel:libz$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libboost_chrono$secondaryArchSuffix - devel:libboost_context$secondaryArchSuffix - devel:libboost_system$secondaryArchSuffix - devel:libboost_timer$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:doxygen - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:sed - " - -PATCH() -{ - sed -i 's/-pthread/-lroot/g' example/cpp03/CMakeLists.txt -} - -BUILD() -{ - mkdir -p build && cd build - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$prefix \ - -DCMAKE_INSTALL_LIBDIR=$libDir \ - -DCMAKE_SKIP_RPATH=YES \ - -DMSGPACK_BUILD_EXAMPLES=OFF \ - -DMSGPACK_CXX11=OFF \ - .. - - make $jobArgs -} - -INSTALL() -{ - mkdir -p $includeDir - mkdir -p $libDir - - cd build - make install - - mv $prefix/include/* $includeDir - rm -rf $prefix/include - - rm -f $libDir/*.la - - prepareInstalledDevelLib libmsgpackc - - fixPkgconfig - - packageEntries devel \ - $developDir -} - -TEST() -{ - make check -} diff --git a/dev-libs/msgpack_c_cpp/msgpack_c_cpp-3.0.0.recipe b/dev-libs/msgpack_c_cpp/msgpack_c_cpp-3.0.0.recipe deleted file mode 100644 index 7100c9d5a..000000000 --- a/dev-libs/msgpack_c_cpp/msgpack_c_cpp-3.0.0.recipe +++ /dev/null @@ -1,101 +0,0 @@ -SUMMARY="A serialization library" -DESCRIPTION="An efficient binary serialization format, which lets you exchange \ -data among multiple languages like JSON, except that it's faster and smaller. \ -Small integers are encoded into a single byte while typical short strings \ -require only one extra byte in addition to the strings themselves." -HOMEPAGE="https://msgpack.org/" -COPYRIGHT="2010-2018 MessagePack Developers" -LICENSE="Boost v1.0" -REVISION="1" -SOURCE_URI="https://github.com/msgpack/msgpack-c/archive/cpp-$portVersion.tar.gz" -CHECKSUM_SHA256="ff1908879e8015d3fb9588fb4ad6a4043e0ce1d44f2dc7da3b387fad7fffb842" -SOURCE_DIR="msgpack-c-cpp-$portVersion" - -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PROVIDES=" - msgpack_c_cpp$secondaryArchSuffix = $portVersion - lib:libmsgpackc$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -PROVIDES_devel=" - msgpack_c_cpp${secondaryArchSuffix}_devel = $portVersion - devel:libmsgpackc$secondaryArchSuffix = $portVersion - " -REQUIRES_devel=" - msgpack_c_cpp$secondaryArchSuffix == $portVersion base - devel:libz$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libboost_chrono$secondaryArchSuffix - devel:libboost_context$secondaryArchSuffix - devel:libboost_system$secondaryArchSuffix - devel:libboost_timer$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:doxygen - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:sed - " - -defineDebugInfoPackage msgpack_c_cpp$secondaryArchSuffix \ - "$libDir"/libmsgpackc.so.2.0.0 - -PATCH() -{ - sed -i 's/-pthread/-lroot/g' example/cpp03/CMakeLists.txt -} - -BUILD() -{ - mkdir -p build && cd build - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$prefix \ - -DCMAKE_INSTALL_LIBDIR=$libDir \ - -DCMAKE_SKIP_RPATH=YES \ - -DMSGPACK_BUILD_EXAMPLES=OFF \ - -DMSGPACK_CXX11=OFF \ - .. - - make $jobArgs -} - -INSTALL() -{ - mkdir -p "$includeDir" "$libDir" - - cd build - make install - - mv $prefix/include/* $includeDir - rm -rf $prefix/include - - rm -f "$libDir"/*.la - - prepareInstalledDevelLib libmsgpackc - - fixPkgconfig - - packageEntries devel \ - "$developDir" \ - "$libDir"/cmake -} - -TEST() -{ - make test -} diff --git a/dev-libs/msgpack_c_cpp/msgpack_c_cpp-3.1.1.recipe b/dev-libs/msgpack_c_cpp/msgpack_c_cpp-3.1.1.recipe deleted file mode 100644 index b11d53912..000000000 --- a/dev-libs/msgpack_c_cpp/msgpack_c_cpp-3.1.1.recipe +++ /dev/null @@ -1,106 +0,0 @@ -SUMMARY="A serialization library" -DESCRIPTION="An efficient binary serialization format, which lets you exchange \ -data among multiple languages like JSON, except that it's faster and smaller. \ -Small integers are encoded into a single byte while typical short strings \ -require only one extra byte in addition to the strings themselves." -HOMEPAGE="https://msgpack.org/" -COPYRIGHT="2010-2018 MessagePack Developers" -LICENSE="Boost v1.0" -REVISION="1" -SOURCE_URI="https://github.com/msgpack/msgpack-c/archive/cpp-$portVersion.tar.gz" -CHECKSUM_SHA256="bda49f996a73d2c6080ff0523e7b535917cd28c8a79c3a5da54fc29332d61d1e" -SOURCE_DIR="msgpack-c-cpp-$portVersion" - -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -libVersion="2.0.0" -libVersionCompat="$libVersion compat >= ${libVersion%%.*}" - -PROVIDES=" - msgpack_c_cpp$secondaryArchSuffix = $portVersion - lib:libmsgpackc$secondaryArchSuffix = $libVersionCompat - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -PROVIDES_devel=" - msgpack_c_cpp${secondaryArchSuffix}_devel = $portVersion - devel:libmsgpackc$secondaryArchSuffix = $libVersionCompat - " -REQUIRES_devel=" - msgpack_c_cpp$secondaryArchSuffix == $portVersion base - devel:libz$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libboost_chrono$secondaryArchSuffix - devel:libboost_context$secondaryArchSuffix - devel:libboost_system$secondaryArchSuffix - devel:libboost_timer$secondaryArchSuffix - devel:libgtest$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:doxygen - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:sed - " - -defineDebugInfoPackage msgpack_c_cpp$secondaryArchSuffix \ - "$libDir"/libmsgpackc.so.$libVersion - -PATCH() -{ - sed -i 's/-pthread/-lroot/g' example/cpp03/CMakeLists.txt -} - -BUILD() -{ - mkdir -p build && cd build - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="$prefix" \ - -DCMAKE_INSTALL_LIBDIR="$libDir" \ - -DCMAKE_SKIP_RPATH=YES \ - -DMSGPACK_BUILD_EXAMPLES=OFF \ - -DMSGPACK_CXX11=OFF \ - .. - - make $jobArgs -} - -INSTALL() -{ - mkdir -p "$includeDir" - mkdir -p "$libDir" - - cd build - make install - - mv "$prefix"/include/* "$includeDir" - rm -rf "$prefix"/include - - rm -f "$libDir"/*.la - - prepareInstalledDevelLib libmsgpackc - - fixPkgconfig - - packageEntries devel \ - "$developDir" \ - "$libDir"/cmake -} - -TEST() -{ - make check -} diff --git a/dev-libs/msgpack_c_cpp/msgpack_c_cpp-3.0.1.recipe b/dev-libs/msgpack_c_cpp/msgpack_c_cpp-3.2.0.recipe similarity index 93% rename from dev-libs/msgpack_c_cpp/msgpack_c_cpp-3.0.1.recipe rename to dev-libs/msgpack_c_cpp/msgpack_c_cpp-3.2.0.recipe index 5f72cf958..7af7403fe 100644 --- a/dev-libs/msgpack_c_cpp/msgpack_c_cpp-3.0.1.recipe +++ b/dev-libs/msgpack_c_cpp/msgpack_c_cpp-3.2.0.recipe @@ -4,12 +4,13 @@ data among multiple languages like JSON, except that it's faster and smaller. \ Small integers are encoded into a single byte while typical short strings \ require only one extra byte in addition to the strings themselves." HOMEPAGE="https://msgpack.org/" -COPYRIGHT="2010-2018 MessagePack Developers" +COPYRIGHT="2008-2015 Furuhashi Sadayuki" LICENSE="Boost v1.0" REVISION="1" SOURCE_URI="https://github.com/msgpack/msgpack-c/archive/cpp-$portVersion.tar.gz" -CHECKSUM_SHA256="1b834ab0b5b41da1dbfb96dd4a673f6de7e79dbd7f212f45a553ff9cc54abf3b" +CHECKSUM_SHA256="ff865a36bad5c72b8e7ebc4b7cf5f27a820fce4faff9c571c1791e3728355a39" SOURCE_DIR="msgpack-c-cpp-$portVersion" +PATCH="msgpack_c_cpp-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" diff --git a/dev-libs/msgpack_c_cpp/patches/msgpack_c_cpp-3.2.0.patchset b/dev-libs/msgpack_c_cpp/patches/msgpack_c_cpp-3.2.0.patchset new file mode 100644 index 000000000..c1985d5eb --- /dev/null +++ b/dev-libs/msgpack_c_cpp/patches/msgpack_c_cpp-3.2.0.patchset @@ -0,0 +1,22 @@ +From 0e07ae5c41bc1ee05e8ecdfda6f3043a933a738f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sat, 13 Jul 2019 20:37:21 +0200 +Subject: Haiku have sys/uio.h + + +diff --git a/include/msgpack/vrefbuffer.h b/include/msgpack/vrefbuffer.h +index 139869a..574c3cb 100644 +--- a/include/msgpack/vrefbuffer.h ++++ b/include/msgpack/vrefbuffer.h +@@ -13,7 +13,7 @@ + #include "zone.h" + #include + +-#if defined(unix) || defined(__unix) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__QNX__) || defined(__QNXTO__) ++#if defined(unix) || defined(__unix) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__QNX__) || defined(__QNXTO__) || defined(__HAIKU__) + #include + #else + struct iovec { +-- +2.21.0 +