diff --git a/dev-cpp/asio/asio-1.28.2.recipe b/dev-cpp/asio/asio-1.31.0.recipe similarity index 73% rename from dev-cpp/asio/asio-1.28.2.recipe rename to dev-cpp/asio/asio-1.31.0.recipe index 0a2f45cec..d86f2dd4e 100644 --- a/dev-cpp/asio/asio-1.28.2.recipe +++ b/dev-cpp/asio/asio-1.31.0.recipe @@ -5,10 +5,10 @@ HOMEPAGE="https://github.com/chriskohlhoff/asio/" COPYRIGHT="2003-2023 Christopher M. Kohlhoff" LICENSE="Boost v1.0" REVISION="1" -SOURCE_URI="https://github.com/chriskohlhoff/asio/archive/refs/tags/asio-1-28-2.tar.gz" -SOURCE_DIR="asio-asio-1-28-2" -CHECKSUM_SHA256="5705a0e403017eba276625107160498518838064a6dd7fd8b00b2e30c0ffbdee" -PATCHES="asio-$portVersion.patchset" +ASIO_VERSION=`echo $portVersion | sed 's/\./-/g'` +SOURCE_URI="https://github.com/chriskohlhoff/asio/archive/refs/tags/asio-$ASIO_VERSION.tar.gz" +CHECKSUM_SHA256="530540f973498c2d297771af1bc852f69b27509bbb56bc7ac3309c928373286f" +SOURCE_DIR="asio-asio-$ASIO_VERSION" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -21,23 +21,14 @@ REQUIRES=" haiku$secondaryArchSuffix devel:libboost_coroutine$secondaryArchSuffix devel:libboost_regex$secondaryArchSuffix - devel:libssl$secondaryArchSuffix +# devel:libssl$secondaryArchSuffix >= 3 " -#PROVIDES_devel=" -# asio${secondaryArchSuffix}_devel -# devel:libasio$secondaryArchSuffix -# " -#REQUIRES_devel=" -# asio$secondaryArchSuffix == $portVersion base -# lib:libssl$secondaryArchSuffix -# " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libboost_coroutine$secondaryArchSuffix >= 1.83.0 devel:libboost_regex$secondaryArchSuffix >= 1.83.0 - devel:libssl$secondaryArchSuffix +# devel:libssl$secondaryArchSuffix >= 3 " BUILD_PREREQUIRES=" autoconf_archive @@ -51,6 +42,7 @@ BUILD_PREREQUIRES=" BUILD() { + export CXXFLAGS="_DEFAULT_SOURCE" cd asio autoupdate aclocal diff --git a/dev-cpp/asio/patches/asio-1.28.2.patchset b/dev-cpp/asio/patches/asio-1.28.2.patchset deleted file mode 100644 index 6a956a351..000000000 --- a/dev-cpp/asio/patches/asio-1.28.2.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 688f218c4d23da62e54f0fef73c3df27c1891933 Mon Sep 17 00:00:00 2001 -From: Maite Gamper -Date: Tue, 21 Nov 2023 22:19:53 +0100 -Subject: asio: fix for haiku - - -diff --git a/asio/include/asio/impl/serial_port_base.ipp b/asio/include/asio/impl/serial_port_base.ipp -index 6f0db41..a4bd51a 100644 ---- a/asio/include/asio/impl/serial_port_base.ipp -+++ b/asio/include/asio/impl/serial_port_base.ipp -@@ -113,7 +113,7 @@ ASIO_SYNC_OP_VOID serial_port_base::baud_rate::store( - ec = asio::error::invalid_argument; - ASIO_SYNC_OP_VOID_RETURN(ec); - } --# if defined(_BSD_SOURCE) || defined(_DEFAULT_SOURCE) -+# if (defined(_BSD_SOURCE) || defined(_DEFAULT_SOURCE)) && !(defined(__HAIKU__)) - ::cfsetspeed(&storage, baud); - # else - ::cfsetispeed(&storage, baud); --- -2.42.0 -