aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuang Rui <vowstar@gmail.com>2021-05-09 03:40:22 +0800
committerHuang Rui <vowstar@gmail.com>2021-05-09 03:40:22 +0800
commitb26e5a664b0300b7c50b259849b5946fa78a4ec5 (patch)
tree6cd3b7e71f774b82ffc57ee2edee26db05ee17eb /sci-electronics/dsview/dsview-1.12.ebuild
parentdev-python/vttlib: use a proper fix for toml (diff)
downloadguru-b26e5a664b0300b7c50b259849b5946fa78a4ec5.tar.gz
guru-b26e5a664b0300b7c50b259849b5946fa78a4ec5.tar.bz2
guru-b26e5a664b0300b7c50b259849b5946fa78a4ec5.zip
sci-electronics/dsview: fix gcc-11 compile
* fix extern-c error when compile * fix qt compile error * fix segfault * remove useless patches Closes: https://bugs.gentoo.org/787674 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Huang Rui <vowstar@gmail.com>
Diffstat (limited to 'sci-electronics/dsview/dsview-1.12.ebuild')
-rw-r--r--sci-electronics/dsview/dsview-1.12.ebuild13
1 files changed, 7 insertions, 6 deletions
diff --git a/sci-electronics/dsview/dsview-1.12.ebuild b/sci-electronics/dsview/dsview-1.12.ebuild
index ad5e51153b..dbcb96bbc3 100644
--- a/sci-electronics/dsview/dsview-1.12.ebuild
+++ b/sci-electronics/dsview/dsview-1.12.ebuild
@@ -47,9 +47,11 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-1.01-viewport.patch
- "${FILESDIR}"/${PN}-1.12-desktop.patch
- "${FILESDIR}"/${PN}-1.12-cmake.patch
+ "${FILESDIR}"/${P}-desktop.patch
+ "${FILESDIR}"/${P}-cmake.patch
+ "${FILESDIR}"/${P}-fix-qt.patch
+ "${FILESDIR}"/${P}-fix-segfault.patch
+ "${FILESDIR}"/${P}-fix-extern-c.patch
)
src_prepare() {
@@ -79,10 +81,9 @@ src_configure() {
src_compile() {
cd "${S}/libsigrok4DSL" || die
- emake DESTDIR="${D}"
+ emake
cd "${S}/libsigrokdecode4DSL" || die
- emake DESTDIR="${D}"
- cd "${S}"
+ emake
}
src_install() {