git: 698607cd81cc - 2022Q2 - comms/qsstv: fix build with graphics/openjpeg 2.5 by removing unnecessary patches

The branch 2022Q2 has been updated by vishwin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=698607cd81cc409edca81be363f2f0adf07433f3

commit 698607cd81cc409edca81be363f2f0adf07433f3
Author:     Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2022-05-24 16:32:21 +0000
Commit:     Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2022-05-24 17:38:16 +0000

    comms/qsstv: fix build with graphics/openjpeg 2.5 by removing unnecessary patches
    
    While here, have ourselves a working DEBUG build
    
    Encoding/saving JPEG2000 crashes due to graphics/jasper interaction.
    Not sure if it has ever worked.
    
    Approved by: arrowd (mentor)
    Differential Revision: https://reviews.freebsd.org/D35308
    
    (cherry picked from commit 543d8888c9561ba6e0960a3bb9cc8e9289fb6d11)
---
 comms/qsstv/Makefile                    | 12 ++++++++++++
 comms/qsstv/files/patch-qsstv.pro       | 18 +++++++++++++++++-
 comms/qsstv/files/patch-utils_color.cpp | 11 -----------
 comms/qsstv/files/patch-utils_jp2io.h   | 10 ----------
 comms/qsstv/pkg-plist                   |  3 ---
 5 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile
index 5ede32283ad4..358f83971725 100644
--- a/comms/qsstv/Makefile
+++ b/comms/qsstv/Makefile
@@ -24,6 +24,18 @@ USE_GL=		gl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+PLIST_FILES=	bin/qsstv \
+		share/applications/qsstv.desktop \
+		share/pixmaps/qsstv.png
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_DEBUG)
+BUILD_DEPENDS+=	doxygen:devel/doxygen
+LIB_DEPENDS+=	libqwt6.so:x11-toolkits/qwt6
+PLIST_FILES+=	bin/qsstv.debug
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 			-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
diff --git a/comms/qsstv/files/patch-qsstv.pro b/comms/qsstv/files/patch-qsstv.pro
index 13c56086bec8..d3852f275732 100644
--- a/comms/qsstv/files/patch-qsstv.pro
+++ b/comms/qsstv/files/patch-qsstv.pro
@@ -1,6 +1,13 @@
 --- qsstv.pro.orig	2021-07-31 20:57:03 UTC
 +++ qsstv.pro
-@@ -523,7 +523,7 @@ QMAKE_EXTRA_TARGETS   +=   dox
+@@ -517,13 +517,13 @@ contains(QMAKE_HOST.arch, arm.*):{
+ 
+ 
+ 
+-dox.path=/usr/share/doc/$$TARGET
++dox.path=%%PREFIX%%/share/doc/$$TARGET
+ dox.files= $$PWD/manual/*
+ QMAKE_EXTRA_TARGETS   +=   dox
  
  
  isEmpty(PREFIX) {
@@ -9,3 +16,12 @@
      }
  target.path = $$PREFIX/bin
  
+@@ -605,6 +605,6 @@ FORMS   += scope/scopeoffset.ui \
+ 
+ FORMS   += scope/scopeoffset.ui \
+                 scope/plotform.ui
+-INCLUDEPATH += /usr/include/qwt /usr/include/qt5/qwt
+-LIBS += -lqwt-qt5
++INCLUDEPATH += %%PREFIX%%/include/qt5/qwt6
++LIBS += -L%%PREFIX%%/lib/qt5 -lqwt6
+ }
diff --git a/comms/qsstv/files/patch-utils_color.cpp b/comms/qsstv/files/patch-utils_color.cpp
deleted file mode 100644
index 8174690cee0b..000000000000
--- a/comms/qsstv/files/patch-utils_color.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils/color.cpp.orig	2017-11-16 17:14:48 UTC
-+++ utils/color.cpp
-@@ -41,7 +41,7 @@
- #include <math.h>
- #include <assert.h>
- 
--#include "openjpeg.h"
-+#include "openjpeg-2.4/openjpeg.h"
- #include "color.h"
- 
- 
diff --git a/comms/qsstv/files/patch-utils_jp2io.h b/comms/qsstv/files/patch-utils_jp2io.h
deleted file mode 100644
index f0619483feab..000000000000
--- a/comms/qsstv/files/patch-utils_jp2io.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- utils/jp2io.h.orig	2016-08-23 19:39:12 UTC
-+++ utils/jp2io.h
-@@ -1,6 +1,6 @@
- #ifndef JP2READER_H
- #define JP2READER_H
--#include "openjpeg.h"
-+#include "openjpeg-2.4/openjpeg.h"
- 
- #include <QString>
- #include <QImage>
diff --git a/comms/qsstv/pkg-plist b/comms/qsstv/pkg-plist
deleted file mode 100644
index 043d1cb4ad58..000000000000
--- a/comms/qsstv/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/qsstv
-share/applications/qsstv.desktop
-share/pixmaps/qsstv.png