Attachment 877406 Details for Bug 872883 – Use system qextserialport instead of bundled one

[patch] Use system qextserialport instead of bundled one

0001-Use-system-qextserialport-instead-of-bundled-one.patch (text/plain), 5.78 KB, created by Ville Skyttä on 2014-03-21 17:38:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-21 17:38:28 UTC

Size: 5.78 KB

patch

obsolete

>From 6a473fdbdb6d92176e65e73ab523ee8da918a7c2 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Fri, 21 Mar 2014 19:35:55 +0200
>Subject: [PATCH] Use system qextserialport instead of bundled one
>
>---
> qlandkartegt-1.7.6-syslibs.patch | 130 +++++++++++++++++++++++++++++++++++++++
> qlandkartegt.spec                |  11 +++-
> 2 files changed, 139 insertions(+), 2 deletions(-)
> create mode 100644 qlandkartegt-1.7.6-syslibs.patch
>
>diff --git a/qlandkartegt-1.7.6-syslibs.patch b/qlandkartegt-1.7.6-syslibs.patch
>new file mode 100644
>index 0000000..e61d76d
>--- /dev/null
>+++ b/qlandkartegt-1.7.6-syslibs.patch
>@@ -0,0 +1,130 @@
>+diff -up qlandkartegt-1.7.6/3rdparty/SerialPort/CMakeLists.txt~ qlandkartegt-1.7.6/3rdparty/SerialPort/CMakeLists.txt
>+--- qlandkartegt-1.7.6/3rdparty/SerialPort/CMakeLists.txt~	2013-03-13 16:50:29.000000000 +0200
>++++ qlandkartegt-1.7.6/3rdparty/SerialPort/CMakeLists.txt	2014-03-21 19:26:54.754306078 +0200
>+@@ -12,18 +12,10 @@ include(${QT_USE_FILE})
>+ 
>+ set(SRCS
>+     ManageSerialPort.cpp
>+-#    posix_qextserialport.cpp
>+-    qextserialbase.cpp
>+-    qextserialport.cpp
>+-#    win_qextserialport.cpp
>+ )
>+ 
>+ set(HDRS
>+     ManageSerialPort.h
>+-#    posix_qextserialport.h
>+-    qextserialbase.h
>+-    qextserialport.h
>+-#    win_qextserialport.h
>+ )
>+ 
>+ set(UIS
>+@@ -35,14 +27,6 @@ set(RCS
>+ 
>+ )
>+ 
>+-if(WIN32)
>+-    set(SRCS ${SRCS} win_qextserialport.cpp)
>+-    set(HDRS ${HDRS} win_qextserialport.h)
>+-else (WIN32)
>+-    set(SRCS ${SRCS} posix_qextserialport.cpp)
>+-    set(HDRS ${HDRS} posix_qextserialport.h)
>+-    add_definitions(-D_TTY_POSIX_)
>+-endif(WIN32)
>+ 
>+ 
>+ qt4_wrap_cpp(MOC_SRCS ${HDRS})
>+@@ -69,5 +53,6 @@ add_library(SerialPort
>+ )
>+ 
>+ target_link_libraries( SerialPort
>++      qextserialport-1.2
>+       ${QT_LIBRARIES}
>+ )
>+diff -up qlandkartegt-1.7.6/3rdparty/SerialPort/ManageSerialPort.cpp~ qlandkartegt-1.7.6/3rdparty/SerialPort/ManageSerialPort.cpp
>+--- qlandkartegt-1.7.6/3rdparty/SerialPort/ManageSerialPort.cpp~	2014-01-07 08:41:55.000000000 +0200
>++++ qlandkartegt-1.7.6/3rdparty/SerialPort/ManageSerialPort.cpp	2014-03-21 19:17:11.441164337 +0200
>+@@ -148,54 +148,7 @@ void ManageSerialPort::setBaudRate(const
>+ 
>+ QString ManageSerialPort::getBaudRate()
>+ {
>+-	switch (extSerialPort.baudRate())
>+-	{
>+-		case BAUD50:
>+-			return QString("50");
>+-		case BAUD75:
>+-			return QString("75");
>+-		case BAUD110:
>+-			return QString("110");
>+-		case BAUD134:
>+-			return QString("134");
>+-		case BAUD150:
>+-			return QString("150");
>+-		case BAUD200:
>+-			return QString("200");
>+-		case BAUD300:
>+-			return QString("300");
>+-		case BAUD600:
>+-			return QString("600");
>+-		case BAUD1200:
>+-			return QString("1200");
>+-		case BAUD1800:
>+-			return QString("1800");
>+-		case BAUD2400:
>+-			return QString("2400");
>+-		case BAUD4800:
>+-			return QString("4800");
>+-		case BAUD9600:
>+-			return QString("9600");
>+-		case BAUD14400:
>+-			return QString("14400");
>+-		case BAUD19200:
>+-			return QString("19200");
>+-		case BAUD38400:
>+-			return QString("38400");
>+-		case BAUD56000:
>+-			return QString("56000");
>+-		case BAUD57600:
>+-			return QString("57600");
>+-		case BAUD76800:
>+-			return QString("76800");
>+-		case BAUD115200:
>+-			return QString("115200");
>+-		case BAUD128000:
>+-			return QString("128000");
>+-		case BAUD256000:
>+-			return QString("256000");
>+-	}
>+-	return 0;
>++	return QString::number(extSerialPort.baudRate());
>+ }
>+ 
>+ 
>+@@ -236,8 +189,6 @@ QString ManageSerialPort::getParity()
>+ 			return QString(tr("Odd"));
>+ 		case PAR_EVEN:
>+ 			return QString(tr("Even"));
>+-		case PAR_MARK:
>+-			return QString(tr("Mark"));
>+ 		case PAR_SPACE:
>+ 			return QString(tr("Space"));
>+ 		}
>+@@ -256,8 +207,6 @@ QString ManageSerialPort::getStopBit()
>+ 	{
>+ 		case STOP_1:
>+ 			return QString("1");
>+-		case STOP_1_5:
>+-			return QString("1.5");
>+ 		case STOP_2:
>+ 			return QString("2");
>+ 		}
>+@@ -287,7 +236,7 @@ QString ManageSerialPort::getFlowControl
>+ 
>+ void ManageSerialPort::setTimeout(ulong seconds, ulong milliseconds)
>+ {
>+-	extSerialPort.setTimeout(seconds,milliseconds);
>++	extSerialPort.setTimeout(seconds * 1000 + milliseconds);
>+ }
>+ 
>+ /*
>diff --git a/qlandkartegt.spec b/qlandkartegt.spec
>index 4f212ca..d59385e 100644
>--- a/qlandkartegt.spec
>+++ b/qlandkartegt.spec
>@@ -1,6 +1,6 @@
> Name: qlandkartegt
> Version: 1.7.6
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> Summary: GPS device mapping tool
> 
> Group: Applications/Communications
>@@ -9,6 +9,7 @@ URL: http://www.qlandkarte.org/
> Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
> # <GL/glu.h> not included by qt >= 4.8
> Patch0: %{name}-1.3.0-glu.patch
>+Patch1: %{name}-1.7.6-syslibs.patch
> Requires: garmindev(interface) = 1.18
> Requires: gpsbabel
> Requires: proj-epsg
>@@ -25,6 +26,7 @@ BuildRequires: libdmtx-devel
> BuildRequires: gpsd-devel
> BuildRequires: qt-webkit-devel
> BuildRequires: qtsoap-devel
>+BuildRequires: qextserialport-devel
> %if 0%{?fedora} >= 16
> BuildRequires: libjpeg-devel
> %endif
>@@ -52,9 +54,10 @@ GDAL tools, but it will simplify their use to the demands of most users.
> %prep
> %setup -q
> %patch0 -p1 -b .glu
>+%patch1 -p1 -b .syslibs
> 
> # remove unbundled stuff
>-rm -rf 3rdparty/qtsoap
>+rm -rf 3rdparty/qtsoap 3rdparty/SerialPort/*qextserial*
> 
> # create build direcotory
> mkdir build
>@@ -62,6 +65,7 @@ mkdir build
> 
> %build
> cd build
>+CXXFLAGS="%{optflags} -I%{_includedir}/QtExtSerialPort"
> %cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DGPX_EXTENSIONS=ON ..
> make VERBOSE=1 %{?_smp_mflags}
> 
>@@ -88,6 +92,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
> 
> 
> %changelog
>+* Fri Mar 21 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 1.7.6-2
>+- Use system qextserialport instead of bundled one
>+
> * Sun Feb 16 2014 Dan HorÃ¡k <dan[at]danny.cz> - 1.7.6-1
> - update to 1.7.6
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 872883: 877406