updating to 1.0.0 with qt5, from stargazers lounge patch

4 files changed, 283 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fa5ae0a9dbd4..245d021bbd22 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = oacapture
-	pkgdesc = oaCapture is a planetary imaging application in Qt4
-	pkgver = 0.5.0
+	pkgdesc = oaCapture is a planetary imaging application using Qt5
+	pkgver = 1.0.0
 	pkgrel = 1
 	url = http://www.openastroproject.org/oacapture/
 	arch = i686
 	arch = x86_64
 	license = GPLv3
-	depends = qt4
+	depends = qt5-base
 	optdepends = fxload: support for QHY5 cameras
-	source = http://www.openastroproject.org/wp-content/uploads/2015/05/oaCapture-0.5.0.tar.bz2
-	source = configure.patch
-	sha1sums = 07bfbceae008fae97814689a97ead0f7246d8b52
-	sha1sums = bd8f1e136c33a444e92abea2ef8fb74fff7b9008
+	source = http://www.openastroproject.org/wp-content/uploads/2016/06/oacapture-1.0.0.tar.bz2
+	source = oacapture-qt5.diff
+	sha1sums = e7afbdb1fd3c095e4a8c52c2240c1fff4077e238
+	sha1sums = ba82f58bccac9898192ea10540219cfe1ae72cf5
 
 pkgname = oacapture
 
diff --git a/PKGBUILD b/PKGBUILD
index 2125f93fd076..f9503c299029 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,31 @@
 pkgname=oacapture
-_realname=oaCapture
-pkgver=0.5.0
+pkgver=1.0.0
 pkgrel=1
-pkgdesc="oaCapture is a planetary imaging application in Qt4"
+pkgdesc="oaCapture is a planetary imaging application using Qt5"
 arch=('i686' 'x86_64')
 license=('GPLv3')
-depends=('qt4')
+depends=('qt5-base')
 url="http://www.openastroproject.org/oacapture/"
 optdepends=('fxload: support for QHY5 cameras')
 
-source=("http://www.openastroproject.org/wp-content/uploads/2015/05/oaCapture-0.5.0.tar.bz2" "configure.patch")
-sha1sums=('07bfbceae008fae97814689a97ead0f7246d8b52' 'bd8f1e136c33a444e92abea2ef8fb74fff7b9008')
+source=("http://www.openastroproject.org/wp-content/uploads/2016/06/oacapture-1.0.0.tar.bz2" "oacapture-qt5.diff")
+sha1sums=('e7afbdb1fd3c095e4a8c52c2240c1fff4077e238' 'ba82f58bccac9898192ea10540219cfe1ae72cf5')
 
 build() {
-	cd "${_realname}-${pkgver}"
-	patch -Np1 < ${srcdir}/configure.patch
+	cd "${pkgname}-${pkgver}"
+	cd "ext/libusb"
 	autoreconf --force --install
-	./configure --prefix=/usr
+	cd "../libdc1394"
+	autoreconf --force --install
+	cd "../.."
+	patch -Np1 < ${srcdir}/oacapture-qt5.diff
+	autoreconf --force --install
+	CXXFLAGS="-fPIC $CXXFLAGS" ./configure --prefix=/usr
 	make
 }
 
 package() {
-	cd "${_realname}-${pkgver}"
+	cd "${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 
 	# removing FFMPEG install, it's already linked in static
diff --git a/configure.patch b/configure.patch
deleted file mode 100644
index c9583fdc393a..000000000000
--- a/configure.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- oaCapture-0.1.0/configure.ac	2014-11-08 15:24:56.000000000 +0100
-+++ /tmp/configure.ac	2015-01-10 01:13:29.877970581 +0100
-@@ -29,8 +29,8 @@
- if ! `$PKG_CONFIG --atleast-version=4.8.0 QtCore`; then
- AC_MSG_ERROR([Qt >= 4.8.0 is required.])
- fi
--AC_CHECK_PROGS(MOC, [moc-qt5 moc-qt4 moc])
--AC_CHECK_PROGS(UIC, [uic-qt5 uic-qt4 uic])
-+AC_CHECK_PROGS(MOC, [moc-qt4])
-+AC_CHECK_PROGS(UIC, [uic-qt4])
- AC_CHECK_PROGS(RCC, [rcc])
- if test -z "$MOC" || test -z "$UIC" || test -z "$RCC"; then
- AC_MSG_ERROR([Qt utility programs moc, uic, and rcc are required.])
-@@ -104,7 +104,7 @@
- 
- FFMPEG_LIBS="\$(top_builddir)/ext/ffmpeg/libavformat/libavformat.a \
-                \$(top_builddir)/ext/ffmpeg/libavcodec/libavcodec.a \
--               \$(top_builddir)/ext/ffmpeg/libavutil/libavutil.a"
-+               \$(top_builddir)/ext/ffmpeg/libavutil/libavutil.a -lva"
- 
- AC_ARG_WITH(ffmpeg-extra-configure, 
-   AC_HELP_STRING([--with-ffmpeg-extra-configure="xxx"],
diff --git a/oacapture-qt5.diff b/oacapture-qt5.diff
new file mode 100644
index 000000000000..65b793291087
--- /dev/null
+++ b/oacapture-qt5.diff
@@ -0,0 +1,262 @@
+diff -ru -N oacapture-1.0.0-orig/oalive/advancedSettings.h oacapture-1.0.0/oalive/advancedSettings.h
+--- oacapture-1.0.0-orig/oalive/advancedSettings.h	2016-06-29 22:31:50.000000000 +0100
++++ oacapture-1.0.0/oalive/advancedSettings.h	2016-08-06 19:06:19.958093691 +0100
+@@ -26,7 +26,7 @@
+ 
+ #pragma once
+ 
+-#include <QtGui>
++#include "qtgui_all_includes.h"
+ 
+ #include <openastro/userConfig.h>
+ 
+diff -ru -N oacapture-1.0.0-orig/oalive/cameraControls.h oacapture-1.0.0/oalive/cameraControls.h
+--- oacapture-1.0.0-orig/oalive/cameraControls.h	2016-06-29 22:31:39.000000000 +0100
++++ oacapture-1.0.0/oalive/cameraControls.h	2016-08-06 19:06:19.958093691 +0100
+@@ -26,7 +26,7 @@
+ 
+ #pragma once
+ 
+-#include <QtGui>
++#include "qtgui_all_includes.h"
+ 
+ extern "C" {
+ #include <openastro/camera.h>
+diff -ru -N oacapture-1.0.0-orig/oalive/captureSettings.h oacapture-1.0.0/oalive/captureSettings.h
+--- oacapture-1.0.0-orig/oalive/captureSettings.h	2016-06-29 22:31:34.000000000 +0100
++++ oacapture-1.0.0/oalive/captureSettings.h	2016-08-06 19:06:19.958093691 +0100
+@@ -26,7 +26,7 @@
+ 
+ #pragma once
+ 
+-#include <QtGui>
++#include "qtgui_all_includes.h"
+ 
+ 
+ class CaptureSettings : public QWidget
+diff -ru -N oacapture-1.0.0-orig/oalive/controlsWidget.h oacapture-1.0.0/oalive/controlsWidget.h
+--- oacapture-1.0.0-orig/oalive/controlsWidget.h	2016-06-29 22:31:32.000000000 +0100
++++ oacapture-1.0.0/oalive/controlsWidget.h	2016-08-06 19:06:19.958093691 +0100
+@@ -26,7 +26,7 @@
+ 
+ #pragma once
+ 
+-#include <QtGui>
++#include "qtgui_all_includes.h"
+ 
+ #include "cameraControls.h"
+ #include "stackingControls.h"
+diff -ru -N oacapture-1.0.0-orig/oalive/demosaicSettings.h oacapture-1.0.0/oalive/demosaicSettings.h
+--- oacapture-1.0.0-orig/oalive/demosaicSettings.h	2016-06-29 22:31:37.000000000 +0100
++++ oacapture-1.0.0/oalive/demosaicSettings.h	2016-08-06 19:06:19.958093691 +0100
+@@ -26,7 +26,7 @@
+ 
+ #pragma once
+ 
+-#include <QtGui>
++#include "qtgui_all_includes.h"
+ 
+ 
+ class DemosaicSettings : public QWidget
+diff -ru -N oacapture-1.0.0-orig/oalive/filterSettings.h oacapture-1.0.0/oalive/filterSettings.h
+--- oacapture-1.0.0-orig/oalive/filterSettings.h	2016-06-29 22:31:38.000000000 +0100
++++ oacapture-1.0.0/oalive/filterSettings.h	2016-08-06 19:06:19.958093691 +0100
+@@ -28,7 +28,7 @@
+ 
+ #include "oa_common.h"
+ 
+-#include <QtGui>
++#include "qtgui_all_includes.h"
+ #include <openastro/filterwheel.h>
+ 
+ 
+diff -ru -N oacapture-1.0.0-orig/oalive/focusOverlay.h oacapture-1.0.0/oalive/focusOverlay.h
+--- oacapture-1.0.0-orig/oalive/focusOverlay.h	2016-06-29 22:31:41.000000000 +0100
++++ oacapture-1.0.0/oalive/focusOverlay.h	2016-08-06 19:06:19.958093691 +0100
+@@ -26,7 +26,7 @@
+ 
+ #pragma once
+ 
+-#include <QtGui>
++#include "qtgui_all_includes.h"
+ 
+ class FocusOverlay : public QWidget
+ {
+diff -ru -N oacapture-1.0.0-orig/oalive/generalSettings.h oacapture-1.0.0/oalive/generalSettings.h
+--- oacapture-1.0.0-orig/oalive/generalSettings.h	2016-06-29 22:31:31.000000000 +0100
++++ oacapture-1.0.0/oalive/generalSettings.h	2016-08-06 19:06:19.958093691 +0100
+@@ -26,7 +26,7 @@
+ 
+ #pragma once
+ 
+-#include <QtGui>
++#include "qtgui_all_includes.h"
+ 
+ #include "version.h"
+ 
+diff -ru -N oacapture-1.0.0-orig/oalive/mainWindow.cc oacapture-1.0.0/oalive/mainWindow.cc
+--- oacapture-1.0.0-orig/oalive/mainWindow.cc	2016-06-29 22:31:33.000000000 +0100
++++ oacapture-1.0.0/oalive/mainWindow.cc	2016-08-06 19:06:19.958093691 +0100
+@@ -99,7 +99,7 @@
+   state.filterWheel->updateAllSearchFilters();
+ 
+   char d[ PATH_MAX ];
+-  state.currentDirectory = QString::fromAscii ( getcwd ( d, PATH_MAX ));
++  state.currentDirectory = QString::fromLocal8Bit ( getcwd ( d, PATH_MAX ));
+ 
+   if ( connectedCameras == 1 && config.connectSoleCamera ) {
+     connectCamera ( 0 );
+@@ -1506,7 +1506,7 @@
+   if ( config.numCustomColours ) {
+     config.customColours.clear();
+     for ( int i = 0; i < config.numCustomColours; i++ ) {
+-      QRgb custCol = colourDialog->customColor ( i );
++      QRgb custCol = colourDialog->customColor ( i ).rgb();
+       config.customColours.append ( QColor ( custCol ));
+     }
+   }
+diff -ru -N oacapture-1.0.0-orig/oalive/mainWindow.h oacapture-1.0.0/oalive/mainWindow.h
+--- oacapture-1.0.0-orig/oalive/mainWindow.h	2016-06-29 22:31:39.000000000 +0100
++++ oacapture-1.0.0/oalive/mainWindow.h	2016-08-06 19:06:19.958093691 +0100
+@@ -26,7 +26,7 @@
+ 
+ #pragma once
+ 
+-#include <QtGui>
++#include "qtgui_all_includes.h"
+ 
+ extern "C" {
+ #include <openastro/camera.h>
+diff -ru -N oacapture-1.0.0-orig/oalive/outputHandler.h oacapture-1.0.0/oalive/outputHandler.h
+--- oacapture-1.0.0-orig/oalive/outputHandler.h	2016-06-29 22:31:36.000000000 +0100
++++ oacapture-1.0.0/oalive/outputHandler.h	2016-08-06 19:06:19.958093691 +0100
+@@ -26,7 +26,7 @@
+ 
+ #pragma once
+ 
+-#include <QtGui>
++#include "qtgui_all_includes.h"
+ 
+ class OutputHandler
+ {
+diff -ru -N oacapture-1.0.0-orig/oalive/profileSettings.h oacapture-1.0.0/oalive/profileSettings.h
+--- oacapture-1.0.0-orig/oalive/profileSettings.h	2016-06-29 22:31:41.000000000 +0100
++++ oacapture-1.0.0/oalive/profileSettings.h	2016-08-06 19:06:19.958093691 +0100
+@@ -26,7 +26,7 @@
+ 
+ #pragma once
+ 
+-#include <QtGui>
++#include "qtgui_all_includes.h"
+ 
+ #include "configuration.h"
+ 
+diff -ru -N oacapture-1.0.0-orig/oalive/qtgui_all_includes.h oacapture-1.0.0/oalive/qtgui_all_includes.h
+--- oacapture-1.0.0-orig/oalive/qtgui_all_includes.h	1970-01-01 01:00:00.000000000 +0100
++++ oacapture-1.0.0/oalive/qtgui_all_includes.h	2016-08-06 19:06:26.807981864 +0100
+@@ -0,0 +1,57 @@
++#ifndef QTGUI_ALL_INCLUDES
++#define QTGUI_ALL_INCLUDES
++
++#include <QAbstractButton>
++#include <QAction>
++#include <QApplication>
++#include <QButtonGroup>
++#include <QCheckBox>
++#include <QColor>
++#include <QColorDialog>
++#include <QComboBox>
++#include <QFileDialog>
++#include <QFrame>
++#include <QGridLayout>
++#include <QHBoxLayout>
++#include <QIcon>
++#include <QImage>
++#include <QKeySequence>
++#include <QLabel>
++#include <QLayout>
++#include <QLayoutItem>
++#include <QLineEdit>
++#include <QList>
++#include <QListWidget>
++#include <QListWidgetItem>
++#include <QMenu>
++#include <QMessageBox>
++#include <QMouseEvent>
++#include <QObject>
++#include <QPaintDevice>
++#include <QPainter>
++#include <QPaintEvent>
++#include <QPushButton>
++#include <QRadioButton>
++#include <QRgb>
++#include <QScrollArea>
++#include <QSignalMapper>
++#include <QSlider>
++#include <QSpinBox>
++#include <QSplitter>
++#include <QStatusBar>
++#include <QString>
++#include <QTabWidget>
++#include <QtCore>
++#include <QtGui>
++#include <QtGuiDepends>
++#include <QtNetwork>
++#include <QTransform>
++#include <QtWidgets>
++#include <QVariant>
++#include <QVBoxLayout>
++#include <QVector>
++#include <QWheelEvent>
++#include <QWidget>
++
++#endif
++
+diff -ru -N oacapture-1.0.0-orig/oalive/saveControls.h oacapture-1.0.0/oalive/saveControls.h
+--- oacapture-1.0.0-orig/oalive/saveControls.h	2016-06-29 22:31:34.000000000 +0100
++++ oacapture-1.0.0/oalive/saveControls.h	2016-08-06 19:06:19.958093691 +0100
+@@ -26,7 +26,7 @@
+ 
+ #pragma once
+ 
+-#include <QtGui>
++#include "qtgui_all_includes.h"
+ 
+ #define	CAPTURE_TIFF	1
+ #define	CAPTURE_FITS	2
+diff -ru -N oacapture-1.0.0-orig/oalive/settingsWidget.h oacapture-1.0.0/oalive/settingsWidget.h
+--- oacapture-1.0.0-orig/oalive/settingsWidget.h	2016-06-29 22:31:31.000000000 +0100
++++ oacapture-1.0.0/oalive/settingsWidget.h	2016-08-06 19:06:19.958093691 +0100
+@@ -26,7 +26,7 @@
+ 
+ #pragma once
+ 
+-#include <QtGui>
++#include "qtgui_all_includes.h"
+ 
+ #include "generalSettings.h"
+ #include "captureSettings.h"
+diff -ru -N oacapture-1.0.0-orig/oalive/stackingControls.h oacapture-1.0.0/oalive/stackingControls.h
+--- oacapture-1.0.0-orig/oalive/stackingControls.h	2016-06-29 22:31:51.000000000 +0100
++++ oacapture-1.0.0/oalive/stackingControls.h	2016-08-06 19:06:19.958093691 +0100
+@@ -26,7 +26,7 @@
+ 
+ #pragma once
+ 
+-#include <QtGui>
++#include "qtgui_all_includes.h"
+ 
+ extern "C" {
+ #include <openastro/camera.h>
+diff -ru -N oacapture-1.0.0-orig/oalive/viewWidget.h oacapture-1.0.0/oalive/viewWidget.h
+--- oacapture-1.0.0-orig/oalive/viewWidget.h	2016-06-29 22:31:34.000000000 +0100
++++ oacapture-1.0.0/oalive/viewWidget.h	2016-08-06 19:06:19.958093691 +0100
+@@ -26,7 +26,7 @@
+ 
+ #pragma once
+ 
+-#include <QtGui>
++#include "qtgui_all_includes.h"
+ 
+ extern "C" {
+ #include <openastro/camera.h>