libserial-update.patch

diff --git a/comport.cpp b/comport.cpp
index c30eae6..2d27e21 100644
--- a/comport.cpp
+++ b/comport.cpp
@@ -30,81 +30,74 @@ void CComPort::OpenComPort(QString &comPort, unsigned int baud)
 {
     CloseComPort();
 
-    serialPort = new SerialPort(comPort.toStdString());
-
-    SerialPort::BaudRate baudRate = SerialPort::BAUD_DEFAULT;
+    BaudRate baudRate = BaudRate::BAUD_DEFAULT;
     switch (baud)
     {
       case (50):
-        baudRate = SerialPort::BAUD_50;
+        baudRate = BaudRate::BAUD_50;
         break;
       case (75):
-        baudRate = SerialPort::BAUD_75;
+        baudRate = BaudRate::BAUD_75;
         break;
       case (110):
-        baudRate = SerialPort::BAUD_110;
+        baudRate = BaudRate::BAUD_110;
         break;
       case (134):
-        baudRate = SerialPort::BAUD_134;
+        baudRate = BaudRate::BAUD_134;
         break;
       case (150):
-        baudRate = SerialPort::BAUD_150;
+        baudRate = BaudRate::BAUD_150;
         break;
       case (200):
-        baudRate = SerialPort::BAUD_200;
+        baudRate = BaudRate::BAUD_200;
         break;
       case (300):
-        baudRate = SerialPort::BAUD_300;
+        baudRate = BaudRate::BAUD_300;
         break;
       case (600):
-        baudRate = SerialPort::BAUD_600;
+        baudRate = BaudRate::BAUD_600;
         break;
       case (1200):
-        baudRate = SerialPort::BAUD_1200;
+        baudRate = BaudRate::BAUD_1200;
         break;
       case (1800):
-        baudRate = SerialPort::BAUD_1800;
+        baudRate = BaudRate::BAUD_1800;
         break;
       case (2400):
-        baudRate = SerialPort::BAUD_2400;
+        baudRate = BaudRate::BAUD_2400;
         break;
       case (4800):
-        baudRate = SerialPort::BAUD_4800;
+        baudRate = BaudRate::BAUD_4800;
         break;
       case (9600):
-        baudRate = SerialPort::BAUD_9600;
+        baudRate = BaudRate::BAUD_9600;
         break;
       case (19200):
-        baudRate = SerialPort::BAUD_19200;
+        baudRate = BaudRate::BAUD_19200;
         break;
       case (38400):
-        baudRate = SerialPort::BAUD_38400;
+        baudRate = BaudRate::BAUD_38400;
         break;
       case (57600):
-        baudRate = SerialPort::BAUD_57600;
+        baudRate = BaudRate::BAUD_57600;
         break;
       case (115200):
-        baudRate = SerialPort::BAUD_115200;
+        baudRate = BaudRate::BAUD_115200;
         break;
       case (230400):
-        baudRate = SerialPort::BAUD_230400;
+        baudRate = BaudRate::BAUD_230400;
         break;
     }
 
-    try
-    {
-      serialPort->Open(baudRate, SerialPort::CHAR_SIZE_8, SerialPort::PARITY_NONE, SerialPort::STOP_BITS_1, SerialPort::FLOW_CONTROL_NONE);
-      if (!serialPort->IsOpen())
-      {
-        QString message = "Couldn't open ";
-        message.append(comPort);
-        QMessageBox::warning(NULL, "Socket Error", message, QMessageBox::Ok);
-        CloseComPort();
-      }
-    }
-    catch (SerialPort::OpenFailed of)
+    serialPort = new SerialPort(comPort.toStdString(), baudRate, CharacterSize::CHAR_SIZE_8, FlowControl::FLOW_CONTROL_NONE, Parity::PARITY_NONE, StopBits::STOP_BITS_1);
+
+    serialPort->Open(comPort.toStdString());
+    if (!serialPort->IsOpen())
     {
-      serialPort = NULL;
+      QString message = "Couldn't open ";
+      message.append(comPort);
+      QMessageBox::warning(NULL, "Socket Error", message, QMessageBox::Ok);
+      CloseComPort();
     }
 }
 
@@ -157,7 +150,7 @@ unsigned short CComPort::ReadComPort(char* buffer, int MaxLen)
 {
   if (serialPort != NULL)
   {
-    SerialPort::DataBuffer dataBuffer;
+    DataBuffer dataBuffer;
     serialPort->Read(dataBuffer, MaxLen, 10);
 
     std::copy(dataBuffer.begin(), dataBuffer.end(), buffer);
diff --git a/comport.h b/comport.h
index f344629..f1f0956 100644
--- a/comport.h
+++ b/comport.h
@@ -3,6 +3,7 @@
 
 #include <SerialPort.h>
 #include <SerialStream.h>
+#include <SerialPortConstants.h>
 #include <SerialStreamBuf.h>
 
 using namespace LibSerial;
diff --git a/pic32ubl-qt.pro b/pic32ubl-qt.pro
index 31eab09..a3f00eb 100644
--- a/pic32ubl-qt.pro
+++ b/pic32ubl-qt.pro
@@ -36,9 +36,9 @@ HEADERS  += \
 FORMS    += \
     pic32ubldlg.ui
 
-unix:!macx: LIBS += -lserial
+LIBS += -lserial
+INCLUDEPATH += /usr/include/libserial
 
-unix:!macx: LIBS += -lusb
-
-unix:!macx: LIBS += -lusb-1.0
+LIBS += -lusb
+LIBS += -lusb-1.0