mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-22 05:23:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

sci-electronics/dsview: drop 1.1.2-r1

Browse Source 
Signed-off-by: Huang Rui <vowstar@gmail.com>
This commit is contained in:
Huang Rui
2022-07-08 12:42:37 +08:00
parent 37d8d1f21f
commit c5013654b1
7 changed files with 0 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
sci-electronics/dsview/dsview-1.1.2-r1.ebuild
View File

@@ -1,121 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
GITHUB_PN="DSView"
MY_PV="$(ver_rs 2 '')" # 'a.b.c' -> 'a.bc'
PYTHON_COMPAT=( python3_{8..11} )
inherit cmake python-r1 toolchain-funcs udev xdg
DESCRIPTION="An open source multi-function instrument"
HOMEPAGE="
https://www.dreamsourcelab.com
https://github.com/DreamSourceLab/DSView
"
if [[ ${PV} == "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/DreamSourceLab/${GITHUB_PN}.git"
else
SRC_URI="https://github.com/DreamSourceLab/${GITHUB_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${GITHUB_PN}-${MY_PV}"
fi
LICENSE="GPL-3"
SLOT="0"
IUSE="static-libs"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
dev-cpp/glibmm:2
dev-libs/boost
dev-libs/glib
dev-libs/libzip
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
dev-qt/qtsvg:5
dev-qt/qtconcurrent:5
sci-libs/fftw:3.0
virtual/libusb:1
"
DEPEND="
${RDEPEND}
"
PATCHES=(
"${FILESDIR}"/${P}-desktop.patch
"${FILESDIR}"/${P}-cmake.patch
"${FILESDIR}"/${P}-fix-qt.patch
"${FILESDIR}"/${P}-fix-segfault.patch
"${FILESDIR}"/${P}-fix-extern-c.patch
"${FILESDIR}"/${P}-fix-python3.patch
)
src_prepare() {
export CC="$(tc-getCC)"
export AR="$(tc-getAR)"
default
local LIBDIR="/usr/$(get_libdir)"
grep -rl "/usr/local/lib" "${S}" | xargs sed -i "s@/usr/local/lib@${LIBDIR}@g" || die
grep -rl "/usr/local" "${S}" | xargs sed -i "s@/usr/local@/usr@g" || die
cd "${S}/libsigrok4DSL" || die
sh ./autogen.sh || die
cd "${S}/libsigrokdecode4DSL" || die
sh ./autogen.sh || die
}
src_configure() {
local LIBDIR="/usr/$(get_libdir)"
cd "${S}/libsigrok4DSL" || die
sh ./configure --libdir=${LIBDIR} --prefix=/usr || die
cd "${S}/libsigrokdecode4DSL" || die
sh ./configure --libdir=${LIBDIR} --prefix=/usr || die
}
src_compile() {
cd "${S}/libsigrok4DSL" || die
emake
cd "${S}/libsigrokdecode4DSL" || die
emake
}
src_install() {
local LIBDIR="/usr/$(get_libdir)"
cd "${S}/libsigrok4DSL" || die
emake DESTDIR="${D}" install
cd "${S}/libsigrokdecode4DSL" || die
emake DESTDIR="${D}" install
cd "${S}/DSView" || die
DESTDIR="${D}" \
PKG_CONFIG_PATH="${D}${LIBDIR}/pkgconfig" \
CFLAGS="-I${D}/usr/include" \
CXXFLAGS="-I${D}/usr/include" \
LDFLAGS="-L${D}${LIBDIR}" \
cmake -DCMAKE_INSTALL_PREFIX=/usr . || die
emake DESTDIR="${D}" install
if ! use static-libs; then
find "${ED}" -name "*.la" -delete || die
find "${ED}" -name "*.a" -delete || die
fi
}
pkg_postinst() {
udev_reload
xdg_pkg_postinst
}
pkg_postrm() {
udev_reload
xdg_pkg_postrm
}

26
sci-electronics/dsview/files/dsview-1.1.2-cmake.patch
View File

@@ -1,26 +0,0 @@
diff --git a/DSView/CMakeLists.txt b/DSView/CMakeLists.txt
index 29f848d..554952f 100755
--- a/DSView/CMakeLists.txt
+++ b/DSView/CMakeLists.txt
@@ -420,15 +420,17 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_
#-------------------------------------------------------------------------------
# Install the executable.
-install(TARGETS ${PROJECT_NAME} DESTINATION bin/)
+install(TARGETS ${PROJECT_NAME} DESTINATION bin)
install(DIRECTORY res DESTINATION share/${PROJECT_NAME})
install(FILES icons/logo.svg DESTINATION share/${PROJECT_NAME} RENAME logo.svg)
+install(FILES icons/logo.svg DESTINATION share/icons/hicolor/scalable/apps RENAME dsview.svg)
+install(FILES icons/logo.svg DESTINATION share/pixmaps RENAME dsview.svg)
install(FILES ../NEWS25 DESTINATION share/${PROJECT_NAME} RENAME NEWS25)
install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31)
install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf)
install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf)
-install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/)
-install(FILES DSView.desktop DESTINATION /usr/share/applications/)
+install(FILES DreamSourceLab.rules DESTINATION /lib/udev/rules.d RENAME 60-dreamsourcelab.rules)
+install(FILES DSView.desktop DESTINATION /usr/share/applications RENAME dsview.desktop)
#===============================================================================
#= Packaging (handled by CPack)

20
sci-electronics/dsview/files/dsview-1.1.2-desktop.patch
View File

@@ -1,20 +0,0 @@
diff --git a/DSView/DSView.desktop b/DSView/DSView.desktop
index fba3202..e114324 100755
--- a/DSView/DSView.desktop
+++ b/DSView/DSView.desktop
@@ -1,9 +1,10 @@
[Desktop Entry]
-Version=0.96
-Exec=/usr/local/bin/DSView
+Type=Application
+Encoding=UTF-8
Name=DSView
Comment=GUI Program for DreamSourceLab USB-based Instruments
-Icon=/usr/local/share/DSView/logo.png
-Type=Application
+TryExec=DSView
+Exec=DSView
+Icon=dsview
Terminal=false
-Categories=Development
+Categories=Development;Electronics;Qt;

42
sci-electronics/dsview/files/dsview-1.1.2-fix-extern-c.patch
View File

@@ -1,42 +0,0 @@
diff --git a/DSView/pv/data/decode/annotation.cpp b/DSView/pv/data/decode/annotation.cpp
index c433a28..7f23e36 100755
--- a/DSView/pv/data/decode/annotation.cpp
+++ b/DSView/pv/data/decode/annotation.cpp
@@ -19,9 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-extern "C" {
#include <libsigrokdecode4DSL/libsigrokdecode.h>
-}
#include <vector>
#include <assert.h>
diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp
index ad943ac..733497f 100755
--- a/DSView/pv/view/decodetrace.cpp
+++ b/DSView/pv/view/decodetrace.cpp
@@ -19,9 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-extern "C" {
#include <libsigrokdecode4DSL/libsigrokdecode.h>
-}
#include <extdef.h>
diff --git a/DSView/pv/widgets/decodergroupbox.cpp b/DSView/pv/widgets/decodergroupbox.cpp
index 79d3cd8..80c4c44 100755
--- a/DSView/pv/widgets/decodergroupbox.cpp
+++ b/DSView/pv/widgets/decodergroupbox.cpp
@@ -18,9 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-extern "C" {
#include <libsigrokdecode4DSL/libsigrokdecode.h>
-}
#include "decodergroupbox.h"
#include "../data/decoderstack.h"

11
sci-electronics/dsview/files/dsview-1.1.2-fix-python3.patch
View File

@@ -1,11 +0,0 @@
--- a/libsigrokdecode4DSL/configure.ac 2020-05-11 21:07:38.000000000 +0800
+++ b/libsigrokdecode4DSL/configure.ac 2021-06-05 01:54:35.937525565 +0800
@@ -90,7 +90,7 @@
# Python 3 is always needed.
SR_PKG_CHECK([python3], [SRD_PKGLIBS],
- [python3 >= 3.2], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2])
+ [python3 >= 3.2], [python-3.10 >= 3.10], [python-3.9 >= 3.9], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2])
AS_IF([test "x$sr_have_python3" = xno],
[AC_MSG_ERROR([Cannot find Python 3 development headers.])])

13
sci-electronics/dsview/files/dsview-1.1.2-fix-qt.patch
View File

@@ -1,13 +0,0 @@
diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp
index 921d3db..16cdce9 100755
--- a/DSView/pv/view/viewport.cpp
+++ b/DSView/pv/view/viewport.cpp
@@ -37,7 +37,7 @@
#include <QMouseEvent>
#include <QStyleOption>
-
+#include <QPainterPath>
#include <math.h>

22
sci-electronics/dsview/files/dsview-1.1.2-fix-segfault.patch
View File

@@ -1,22 +0,0 @@
diff --git a/libsigrokdecode4DSL/instance.c b/libsigrokdecode4DSL/instance.c
index 5ede710..5d96701 100755
--- a/libsigrokdecode4DSL/instance.c
+++ b/libsigrokdecode4DSL/instance.c
@@ -370,6 +370,8 @@ SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess,
}
}
+ gstate = PyGILState_Ensure();
+
/*
* Prepare a default channel map, where samples come in the
* order in which the decoder class defined them.
@@ -389,8 +391,6 @@ SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess,
/* Default to the initial pins being the same as in sample 0. */
oldpins_array_seed(di);
- gstate = PyGILState_Ensure();
-
/* Create a new instance of this decoder class. */
if (!(di->py_inst = PyObject_CallObject(dec->py_dec, NULL))) {
if (PyErr_Occurred())