diff --git a/misc/openhantek/Makefile b/misc/openhantek/Makefile index d484f3b54dd8..6e5f4bb7b146 100644 --- a/misc/openhantek/Makefile +++ b/misc/openhantek/Makefile @@ -1,33 +1,33 @@ PORTNAME= openhantek -DISTVERSION= 3.2.1 +DISTVERSION= 3.2.2 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org COMMENT= Digital Software Oscilloscope (DSO) software for Hantek oscilloscopes LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfftw3.so:math/fftw3 USES= cmake compiler:c++11-lang gl localbase qt:5 USE_GITHUB= yes GH_ACCOUNT= OpenHantek GH_PROJECT= OpenHantek6022 # there's also the openhantek project which OpenHantek6022 is a fork of USE_QT= core gui opengl printsupport widgets buildtools_build linguist_build qmake_build USE_GL= gl glu OPTIONS_DEFINE= HANTEK_AC HANTEK_AC_DESC= Allow AC input with a modified hardware HANTEK_AC_CMAKE_ON= -DHANTEK_AC=1 PLIST_FILES= bin/OpenHantek \ etc/devd/openhantek.conf \ share/applications/OpenHantek.desktop \ share/icons/hicolor/48x48/apps/OpenHantek.png \ share/icons/hicolor/scalable/apps/OpenHantek.svg PORTSCOUT= limit:^.*[1-9]\. # prevent words like 'unstable' .include diff --git a/misc/openhantek/distinfo b/misc/openhantek/distinfo index d6e60f2a0878..ac362f90e088 100644 --- a/misc/openhantek/distinfo +++ b/misc/openhantek/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617730196 -SHA256 (OpenHantek-OpenHantek6022-3.2.1_GH0.tar.gz) = ef37e5c8ae269df46b17d73b536732fa36ab269def3769eef033ba8b72c81116 -SIZE (OpenHantek-OpenHantek6022-3.2.1_GH0.tar.gz) = 19806171 +TIMESTAMP = 1618797814 +SHA256 (OpenHantek-OpenHantek6022-3.2.2_GH0.tar.gz) = e0abedc817425ff9912abd06cd9ebbd14f66861b15f0124508d9ecb7e90e6024 +SIZE (OpenHantek-OpenHantek6022-3.2.2_GH0.tar.gz) = 19821546 diff --git a/misc/openhantek/files/patch-openhantek_src_main.cpp b/misc/openhantek/files/patch-openhantek_src_main.cpp deleted file mode 100644 index 778711748d4e..000000000000 --- a/misc/openhantek/files/patch-openhantek_src_main.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- openhantek/src/main.cpp.orig 2020-07-01 17:59:30 UTC -+++ openhantek/src/main.cpp -@@ -163,8 +163,10 @@ int main( int argc, char *argv[] ) { - SelectSupportedDevice().showLibUSBFailedDialogModel( error ); - return -1; - } -+#if !defined(__FreeBSD__) // see https://github.com/OpenHantek/OpenHantek6022/issues/101 - if ( useLocale ) // localize USB error messages, supported: "en", "nl", "fr", "ru" - libusb_setlocale( QLocale::system().name().toLocal8Bit().constData() ); -+#endif - - // SelectSupportedDevive returns a real device unless demoMode is true - scopeDevice = SelectSupportedDevice().showSelectDeviceModal( context );