Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F110218875
D35308.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
2 KB
Referenced Files
None
Subscribers
None
D35308.diff
View Options
diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile
--- a/comms/qsstv/Makefile
+++ b/comms/qsstv/Makefile
@@ -24,6 +24,18 @@
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
--- 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
--- 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
--- 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
--- a/comms/qsstv/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/qsstv
-share/applications/qsstv.desktop
-share/pixmaps/qsstv.png
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Feb 16, 6:55 AM (15 h, 4 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16670458
Default Alt Text
D35308.diff (2 KB)
Attached To
Mode
D35308: comms/qsstv: fix build with graphics/openjpeg 2.5 by removing unnecessary patches
Attached
Detach File
Event Timeline
Log In to Comment