Attachment 194343 Details for Bug 229094 – patch

[patch] patch

cutecom.patch (text/plain), 8.90 KB, created by Yuri Victorovich on 2018-06-17 23:43:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2018-06-17 23:43:10 UTC

Size: 8.90 KB

patch

obsolete

>Index: comms/cutecom/Makefile
>===================================================================
>--- comms/cutecom/Makefile	(revision 472659)
>+++ comms/cutecom/Makefile	(working copy)
>@@ -2,17 +2,27 @@
> # $FreeBSD$
> 
> PORTNAME=	cutecom
>-PORTVERSION=	0.20.0
>-PORTREVISION=	2
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	0.45.0
> CATEGORIES=	comms
>-MASTER_SITES=	http://cutecom.sourceforge.net/
> 
> MAINTAINER=	jwb@FreeBSD.org
> COMMENT=	Graphical serial terminal
> 
>+LICENSE=	GPLv3
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
> RUN_DEPENDS=	lsz:comms/lrzsz
> 
>-USE_QT4=	qt3support qmake_build moc_build rcc_build uic_build
>-USES=		cmake
>+USES=		cmake:outsource desktop-file-utils
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	neundorf
>+GH_PROJECT=	CuteCom
>+GNU_CONFIGURE=	yes
>+USE_QT5=	core gui serialport widgets qmake_build buildtools_build
> 
>+PLIST_FILES=	bin/cutecom \
>+		man/man1/cutecom.1.gz \
>+		share/applications/cutecom.desktop
>+
> .include <bsd.port.mk>
>Index: comms/cutecom/distinfo
>===================================================================
>--- comms/cutecom/distinfo	(revision 472659)
>+++ comms/cutecom/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (cutecom-0.20.0.tar.gz) = 44bf6c3a827b5d3b3a2b201010215faebde6af42dc16f5e0f877c858c6e19fe0
>-SIZE (cutecom-0.20.0.tar.gz) = 22217
>+TIMESTAMP = 1529278052
>+SHA256 (neundorf-CuteCom-v0.45.0_GH0.tar.gz) = 30cc6a800231684446ef5ebea78092462b2662d06238c146d0b9e24b86685cea
>+SIZE (neundorf-CuteCom-v0.45.0_GH0.tar.gz) = 1152960
>Index: comms/cutecom/files/patch-CMakeLists.txt
>===================================================================
>--- comms/cutecom/files/patch-CMakeLists.txt	(revision 472659)
>+++ comms/cutecom/files/patch-CMakeLists.txt	(working copy)
>@@ -1,14 +1,11 @@
>---- ./CMakeLists.txt.orig	2008-03-13 00:09:49.000000000 +0300
>-+++ ./CMakeLists.txt	2009-04-25 21:48:15.000000000 +0400
>-@@ -19,10 +19,4 @@
>+--- CMakeLists.txt.orig	2018-06-17 19:56:07 UTC
>++++ CMakeLists.txt
>+@@ -76,5 +76,8 @@ set (CPACK_SOURCE_IGNORE_FILES
>+        "${CMAKE_CURRENT_BINARY_DIR};/.git/;~$;${CPACK_SOURCE_IGNORE_FILES}")
>+ include (CPack)
>  
>- install(FILES cutecom.1 DESTINATION man/man1 )
>++install(FILES cutecom.desktop DESTINATION share/applications)
>++install(FILES cutecom.1 DESTINATION man/man1 )
>++
>+ add_custom_target(dist COMMAND git archive --format tar --prefix=cutecom-${CuteCom_VERSION}/ HEAD | gzip > ${CMAKE_CURRENT_BINARY_DIR}/${CPACK_SOURCE_PACKAGE_FILE_NAME}.tgz WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
>  
>--find_program(KDECONFIG_EXECUTABLE NAMES kde-config )
>--
>--if (KDECONFIG_EXECUTABLE)
>--   # then ask kde-config for the kde data dirs
>--   exec_program(${KDECONFIG_EXECUTABLE} ARGS --install apps --expandvars OUTPUT_VARIABLE _apps_DIR )
>--   install(FILES cutecom.desktop DESTINATION ${_apps_DIR}/Utilities)
>--endif (KDECONFIG_EXECUTABLE)
>-+install(FILES cutecom.desktop DESTINATION share/applications)
>Index: comms/cutecom/files/patch-cutecommdlg.ui
>===================================================================
>--- comms/cutecom/files/patch-cutecommdlg.ui	(revision 472659)
>+++ comms/cutecom/files/patch-cutecommdlg.ui	(nonexistent)
>@@ -1,14 +0,0 @@
>---- cutecommdlg.ui.orig	2008-03-12 16:09:50.000000000 -0500
>-+++ cutecommdlg.ui	2009-03-28 12:46:04.000000000 -0500
>-@@ -220,11 +220,6 @@
>-        </item>
>-        <item>
>-         <property name="text" >
>--         <string>576000</string>
>--        </property>
>--       </item>
>--       <item>
>--        <property name="text" >
>-          <string>921600</string>
>-         </property>
>-        </item>
>
>Property changes on: comms/cutecom/files/patch-cutecommdlg.ui
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: comms/cutecom/files/patch-qcppdialogimpl.cpp
>===================================================================
>--- comms/cutecom/files/patch-qcppdialogimpl.cpp	(revision 472659)
>+++ comms/cutecom/files/patch-qcppdialogimpl.cpp	(nonexistent)
>@@ -1,29 +0,0 @@
>---- qcppdialogimpl.cpp.orig	2009-03-28 12:42:56.000000000 -0500
>-+++ qcppdialogimpl.cpp	2009-03-28 12:44:32.000000000 -0500
>-@@ -243,11 +243,10 @@
>-    bool entryFound=false;
>-    QStringList devices=settings.readListEntry("/cutecom/AllDevices", &entryFound);
>-    if (!entryFound)
>--      devices<<"/dev/ttyS0"<<"/dev/ttyS1"<<"/dev/ttyS2"<<"/dev/ttyS3";
>-+      devices<<DEVLIST;
>- 
>-    m_deviceCb->insertStringList(devices);
>--
>--   m_deviceCb->setCurrentText(settings.readEntry("/cutecom/CurrentDevice", "/dev/ttyS0"));
>-+   m_deviceCb->setCurrentText(settings.readEntry("/cutecom/CurrentDevice", DEFAULT_DEV));
>- 
>-    QStringList history=settings.readListEntry("/cutecom/History");
>- 
>-@@ -932,9 +931,9 @@
>-    case 460800:
>-       _baud=B460800;
>-       break;
>--   case 576000:
>--      _baud=B576000;
>--      break;
>-+//   case 576000:
>-+//      _baud=B576000;
>-+//      break;
>-    case 921600:
>-       _baud=B921600;
>-       break;
>
>Property changes on: comms/cutecom/files/patch-qcppdialogimpl.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: comms/cutecom/files/patch-qcppdialogimpl.h
>===================================================================
>--- comms/cutecom/files/patch-qcppdialogimpl.h	(revision 472659)
>+++ comms/cutecom/files/patch-qcppdialogimpl.h	(nonexistent)
>@@ -1,24 +0,0 @@
>---- qcppdialogimpl.h.orig	2008-03-12 16:09:50.000000000 -0500
>-+++ qcppdialogimpl.h	2009-03-28 09:05:42.000000000 -0500
>-@@ -103,4 +103,21 @@
>- 
>- };
>- 
>-+#if defined(__FreeBSD__)
>-+
>-+#define	DEVLIST	"/dev/cuaU0"<<"/dev/cuaU1"<<"/dev/cuad0"<<"/dev/cuad1";
>-+#define DEFAULT_DEV "/dev/cuaU0"
>-+
>-+#elif defined(__APPLE__)
>-+
>-+#define	DEVLIST	"/dev/cu.usbserial"<<"/dev/cu.KeySerial1";
>-+#define DEFAULT_DEV "/dev/cu.usbserial"
>-+
>-+#else	// Default to Linux devices.
>-+
>-+#define	DEVLIST	"/dev/ttyS0"<<"/dev/ttyS1"<<"/dev/ttyS2"<<"/dev/ttyS3";
>-+#define DEFAULT_DEV "/dev/ttyS0"
>-+
>-+#endif
>-+
>- #endif
>
>Property changes on: comms/cutecom/files/patch-qcppdialogimpl.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: comms/cutecom/files/patch-settings.cpp
>===================================================================
>--- comms/cutecom/files/patch-settings.cpp	(nonexistent)
>+++ comms/cutecom/files/patch-settings.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- settings.cpp.orig	2018-06-17 23:39:46 UTC
>++++ settings.cpp
>+@@ -173,7 +173,7 @@ void Settings::readSessionSettings(QSett
>+                                ? static_cast<QIODevice::OpenModeFlag>(value)
>+                                : QIODevice::ReadWrite;
>+         // the recovering default for the device its Linux specific but I can live with that
>+-        session.device = settings.value("Device", QStringLiteral("/dev/ttyUSB0")).toString();
>++        session.device = settings.value("Device", QStringLiteral("/dev/cuaU0")).toString();
>+         session.showCtrlCharacters = settings.value("showCtrlCharacters", false).toBool();
>+         session.showTimestamp = settings.value("showTimestamp", false).toBool();
>+         session.command_history = settings.value("History").toStringList();
>
>Property changes on: comms/cutecom/files/patch-settings.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: comms/cutecom/pkg-descr
>===================================================================
>--- comms/cutecom/pkg-descr	(revision 472659)
>+++ comms/cutecom/pkg-descr	(working copy)
>@@ -1,4 +1,4 @@
> CuteCom is a QT-based graphical serial terminal ideally suited to embedded
> programming and robotics.
> 
>-WWW: http://cutecom.sourceforge.net/
>+WWW: https://github.com/neundorf/CuteCom
>Index: comms/cutecom/pkg-plist
>===================================================================
>--- comms/cutecom/pkg-plist	(revision 472659)
>+++ comms/cutecom/pkg-plist	(nonexistent)
>@@ -1,3 +0,0 @@
>-bin/cutecom
>-man/man1/cutecom.1.gz
>-share/applications/cutecom.desktop
>
>Property changes on: comms/cutecom/pkg-plist
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 229094: 194343