diff --git a/community/dbus-cpp/APKBUILD b/community/dbus-cpp/APKBUILD index 8bcc98161ee..e73100bd3c6 100644 --- a/community/dbus-cpp/APKBUILD +++ b/community/dbus-cpp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Luca Weiss pkgname=dbus-cpp pkgver=5.0.3 -pkgrel=7 +pkgrel=8 pkgdesc="A header-only dbus-binding leveraging C++-11" url="https://gitlab.com/ubports/core/lib-cpp/dbus-cpp" arch="all" @@ -10,7 +10,9 @@ depends_dev="boost-dev properties-cpp-dev" makedepends="$depends_dev cmake cmake-extras dbus-dev libxml2-dev process-cpp-dev gtest-dev samurai" checkdepends="dbus coreutils" subpackages="$pkgname-dev" -source="https://gitlab.com/ubports/core/lib-cpp/dbus-cpp/-/archive/$pkgver/dbus-cpp-$pkgver.tar.gz" +source="https://gitlab.com/ubports/core/lib-cpp/dbus-cpp/-/archive/$pkgver/dbus-cpp-$pkgver.tar.gz + cxx.patch + " options="!check" # Tests are too unreliable to not fail randomly build() { @@ -37,4 +39,5 @@ package() { sha512sums=" 03fcbfc856d58310a445ec02dc40e5b7a02a6ab7a5ee5455c8f56ff400a1820c9b62c7d7847eb8df8bad0e18704a35ce2a81c35864ca855cbc9a8e3965d21fc5 dbus-cpp-5.0.3.tar.gz +19134a16963834deffe57168048505a0485099b93c03e76f309bb7b3055fef70df8ae4e5aada0e5c8564349949aa89d926b27513978d055fe30dbaf345744228 cxx.patch " diff --git a/community/dbus-cpp/cxx.patch b/community/dbus-cpp/cxx.patch new file mode 100644 index 00000000000..11204eacd06 --- /dev/null +++ b/community/dbus-cpp/cxx.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c396696..bf988c6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,7 +39,7 @@ include(cmake/PrePush.cmake) + include(GNUInstallDirs) + + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -Wextra -fvisibility=hidden -fPIC -pthread") +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -Wextra -fPIC -pthread") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wall -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -Wextra -fPIC -pthread") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") + + # We leverage GCC's sanitize functionality