commit: 015ede5a14fb52ce3c0ec6de6a837d926d757141 Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Sat Oct 19 09:03:50 2024 +0000 Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> CommitDate: Sat Oct 19 09:03:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=015ede5a
sci-electronics/dsview: fix build with GCC 13 Closes: https://bugs.gentoo.org/887877 Closes: https://bugs.gentoo.org/887913 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> sci-electronics/dsview/dsview-1.3.0.ebuild | 9 +++++- sci-electronics/dsview/dsview-9999.ebuild | 7 +++- .../dsview/files/dsview-1.3.0-fix-flags.patch | 14 ++++++++ .../dsview/files/dsview-1.3.0-gcc13.patch | 37 ++++++++++++++++++++++ 4 files changed, 65 insertions(+), 2 deletions(-) diff --git a/sci-electronics/dsview/dsview-1.3.0.ebuild b/sci-electronics/dsview/dsview-1.3.0.ebuild index f4f6a3b49..da408efd0 100644 --- a/sci-electronics/dsview/dsview-1.3.0.ebuild +++ b/sci-electronics/dsview/dsview-1.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -50,6 +50,13 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + # bug 887877 + "${FILESDIR}/${P}-gcc13.patch" + # bug 887913 + "${FILESDIR}/${P}-fix-flags.patch" +) + src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" diff --git a/sci-electronics/dsview/dsview-9999.ebuild b/sci-electronics/dsview/dsview-9999.ebuild index b48296664..e8c94b5cb 100644 --- a/sci-electronics/dsview/dsview-9999.ebuild +++ b/sci-electronics/dsview/dsview-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -50,6 +50,11 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + # bug 887913 + "${FILESDIR}/${PN}-1.3.0-fix-flags.patch" +) + src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" diff --git a/sci-electronics/dsview/files/dsview-1.3.0-fix-flags.patch b/sci-electronics/dsview/files/dsview-1.3.0-fix-flags.patch new file mode 100644 index 000000000..0cc9ba54c --- /dev/null +++ b/sci-electronics/dsview/files/dsview-1.3.0-fix-flags.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/887913 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c40c925..41e5230 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -594,8 +594,6 @@ endif() + set(CMAKE_CXX_FLAGS "-Wall -Wextra") + set(CMAKE_BUILD_TYPE Release) + set(CMAKE_CXX_FLAGS_DEBUG "-g") +-set(CMAKE_CXX_FLAGS_RELEASE "-O3") +-add_compile_options(-O3) + + #=============================================================================== + #= Linker Configuration diff --git a/sci-electronics/dsview/files/dsview-1.3.0-gcc13.patch b/sci-electronics/dsview/files/dsview-1.3.0-gcc13.patch new file mode 100644 index 000000000..01a4d6d83 --- /dev/null +++ b/sci-electronics/dsview/files/dsview-1.3.0-gcc13.patch @@ -0,0 +1,37 @@ +https://bugs.gentoo.org/887877 +https://github.com/DreamSourceLab/DSView/commit/2018baf0e1add4f9971dd02271ee8e6773cebfac +From: Lutz Freitag <[email protected]> +Date: Wed, 22 May 2024 21:29:54 +0200 +Subject: [PATCH] added missing includes and a define to compile it for recent + machines +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -668,6 +668,8 @@ install(FILES DSView/icons/logo.svg DESTINATION share/pixmaps RENAME dsview.svg) + if(CMAKE_SYSTEM_NAME MATCHES "Linux") + install(FILES DSView/DSView.desktop DESTINATION /usr/share/applications RENAME dsview.desktop) + ++ add_compile_definitions(_DEFAULT_SOURCE) ++ + if(IS_DIRECTORY /usr/lib/udev/rules.d) + install(FILES DSView/DreamSourceLab.rules DESTINATION /usr/lib/udev/rules.d RENAME 60-dreamsourcelab.rules) + elseif(IS_DIRECTORY /lib/udev/rules.d) +--- a/libsigrok4DSL/input/in_wav.c ++++ b/libsigrok4DSL/input/in_wav.c +@@ -24,6 +24,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <string.h> ++#include <strings.h> + #include "../log.h" + #include <stdlib.h> + +--- a/libsigrok4DSL/strutil.c ++++ b/libsigrok4DSL/strutil.c +@@ -21,6 +21,7 @@ + #include "libsigrok-internal.h" + #include <stdlib.h> + #include <string.h> ++#include <strings.h> + #include <stdio.h> + #include "log.h" +
