update to 0.8.0

4 files changed, 48 insertions, 146 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3e11e0201e6f..a0f540c4a6e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = qpxtool
 	pkgdesc = Allows better controll over optical drives to include QChecks and optimization settings.
-	pkgver = 0.7.2
-	pkgrel = 6
+	pkgver = 0.8.0
+	pkgrel = 1
 	url = http://qpxtool.sourceforge.net/
 	arch = x86_64
 	license = GPL
-	depends = qt4
-	source = http://downloads.sourceforge.net/sourceforge/qpxtool/qpxtool-0.7.2.tar.bz2
-	source = libpng15.patch
-	md5sums = b1235e74b8ef4fe087a6b64f5cfca14a
-	md5sums = ab9af7610277652c77c6d114422b2266
+	depends = qt5-base
+	source = http://downloads.sourceforge.net/sourceforge/qpxtool/qpxtool-0.8.0.tar.bz2
+	source = 0001-add-needed-qiodevice-include.patch
+	md5sums = f4b09f8d5aa533f680c8bcce19c1072e
+	md5sums = e494a876eea1078e822d850c8f477487
 
 pkgname = qpxtool
 
diff --git a/0001-add-needed-qiodevice-include.patch b/0001-add-needed-qiodevice-include.patch
new file mode 100644
index 000000000000..b1ebeaef1ea9
--- /dev/null
+++ b/0001-add-needed-qiodevice-include.patch
@@ -0,0 +1,24 @@
+From a22962a46799ed894b29561a961736fec47830c1 Mon Sep 17 00:00:00 2001
+From: Ryan Farley <ryan.farley@gmx.com>
+Date: Sun, 26 Apr 2020 09:52:54 -0500
+Subject: [PATCH] add needed qiodevice include
+
+---
+ gui/include/device.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gui/include/device.h b/gui/include/device.h
+index 85cc9d2..1ca5ece 100644
+--- a/gui/include/device.h
++++ b/gui/include/device.h
+@@ -17,6 +17,7 @@
+ #include <QStringList>
+ #include <QList>
+ #include <QMutex>
++#include <QIODevice>
+ 
+ #include <sys/time.h>
+ #include <inttypes.h>
+-- 
+2.25.0.232.gd8437c57fa
+
diff --git a/PKGBUILD b/PKGBUILD
index 6fa101973748..850325c8576f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,28 +4,33 @@
 # Contributor: Krzysztof Stasiorowski <krzysiekst@gmail.com>
 
 pkgname=qpxtool
-pkgver=0.7.2
-pkgrel=6
+pkgver=0.8.0
+pkgrel=1
 pkgdesc="Allows better controll over optical drives to include QChecks and optimization settings."
 arch=('x86_64')
 url="http://qpxtool.sourceforge.net/"
 license=('GPL')
-depends=('qt4')
+depends=('qt5-base')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-	libpng15.patch)
-md5sums=('b1235e74b8ef4fe087a6b64f5cfca14a'
-         'ab9af7610277652c77c6d114422b2266')
+        0001-add-needed-qiodevice-include.patch)
+md5sums=('f4b09f8d5aa533f680c8bcce19c1072e'
+         'e494a876eea1078e822d850c8f477487')
 
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch --forward --strip=1 --input "${srcdir}/0001-add-needed-qiodevice-include.patch"
+}
 build() {
   cd "$srcdir"/$pkgname-$pkgver
   # Fix strict aliasing warnings
   export CFLAGS="$CFLAGS -fno-strict-aliasing"
-  sed -i \
-    -e 's|lib64|lib|' \
-    -e 's|lrelease|lrelease-qt4|' \
-    configure
-  patch -p1 <"$srcdir"/libpng15.patch
-  ./configure --prefix=/usr --sbindir=/usr/bin --qmake=/usr/lib/qt4/bin/qmake
+  #sed -i \
+  #  -e 's|lib64|lib|' \
+  #  -e 's|lrelease|lrelease-qt4|' \
+  #  configure
+  #patch -p1 <"$srcdir"/libpng15.patch
+  ./configure --prefix=/usr --sbindir=/usr/bin --libdir=/usr/lib
   make
 }
 
diff --git a/libpng15.patch b/libpng15.patch
deleted file mode 100644
index 05e6f49d27d3..000000000000
--- a/libpng15.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -wbBur qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp
---- qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp	2009-11-25 10:55:44.000000000 +0300
-+++ qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp	2012-01-23 13:53:37.000000000 +0400
-@@ -129,28 +129,28 @@
- 
- 	png_read_info(png_ptr, info_ptr);
- 
--	printf("Image size: %ld x %ld\n", info_ptr->width, info_ptr->height);
-+	printf("Image size: %u x %u\n", png_get_image_width(png_ptr, info_ptr), png_get_image_height(png_ptr, info_ptr));
- 
--	if (info_ptr->width != 3744U || info_ptr->height != rows ) {
-+	if (png_get_image_width(png_ptr, info_ptr) != 3744U || png_get_image_height(png_ptr, info_ptr) != rows ) {
- 		printf("Image should be 3744 x %d", rows);
- 		return 1;
- 	}
- 
--//	width = info_ptr->width;
--//	height = info_ptr->height;
--//	bit_depth = info_ptr->bit_depth;
-+//	width = png_get_image_width(png_ptr, info_ptr);
-+//	height = png_get_image_height(png_ptr, info_ptr);
-+//	bit_depth = png_get_bit_depth(png_ptr, info_ptr);
- 
- 	number_of_passes = png_set_interlace_handling(png_ptr);
- 	png_read_update_info(png_ptr, info_ptr);
- 
--	printf("Color type: [%d] ", info_ptr->color_type);
--	switch (info_ptr->color_type) {
-+	printf("Color type: [%d] ", png_get_color_type(png_ptr, info_ptr));
-+	switch (png_get_color_type(png_ptr, info_ptr)) {
- 	    case PNG_COLOR_TYPE_GRAY:
- 			printf("PNG_COLOR_TYPE_GRAY\n");
- 			break;
- 	    case PNG_COLOR_TYPE_PALETTE:
- 			printf("PNG_COLOR_TYPE_PALETTE\n");
--			if (!(info_ptr->valid & PNG_INFO_PLTE)) {
-+			if (!(png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE))) {
- 				printf("PNG color type is indexed, but no palette found!");
- 				goto err_read_png;
- 			}
-@@ -168,49 +168,53 @@
- 			printf("unlnown PNG color type!\n");
- 			goto err_read_png;
- 	}
--	printf("Bit depth : %d\n", info_ptr->bit_depth);
--	if (info_ptr->bit_depth != 8) {
-+	printf("Bit depth : %d\n", png_get_bit_depth(png_ptr, info_ptr));
-+	if (png_get_bit_depth(png_ptr, info_ptr) != 8) {
- 		printf("Unsupported bit depth!\n");
- 		goto err_read_png;
- 	}
--	if (info_ptr->valid & PNG_INFO_PLTE) {
--		printf("Palette   : %d colors\n", info_ptr->num_palette);
-+
-+	int num_palette;
-+	png_colorp plte;
-+	png_get_PLTE(png_ptr, info_ptr, &plte, &num_palette);
-+
-+	if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
-+		printf("Palette   : %d colors\n", num_palette);
- 	} else {
- 		printf("Palette   : NO\n");
- 	}
--	printf("ROW bytes : %ld\n", info_ptr->rowbytes);
--
-+	printf("ROW bytes : %d\n", png_get_rowbytes(png_ptr, info_ptr));
- 
- 	raw_row_pointer = buf;
--	png_row_pointer = (png_byte*) malloc(info_ptr->rowbytes);
-+	png_row_pointer = (png_byte*) malloc(png_get_rowbytes(png_ptr, info_ptr));
- 	for (row=0; row<rows; row++) {
- 		if (setjmp(png_jmpbuf(png_ptr))) {
- 			printf("png_jmpbuf failed!\n");
- 			goto err_read_png;
- 		}
- 		png_read_row(png_ptr, png_row_pointer, NULL);
--		if (info_ptr->width < 3744U)
-+		if (png_get_image_width(png_ptr, info_ptr) < 3744U)
- 			memset(raw_row_pointer, 0, 3744);
- 
--		switch (info_ptr->color_type) {
-+		switch (png_get_color_type(png_ptr, info_ptr)) {
- 		    case PNG_COLOR_TYPE_GRAY:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					raw_row_pointer[col] = png_row_pointer[col] ^ 0xFF;
- //					memcpy(raw_row_pointer, png_row_pointer, 3744);
- 				}
- 				break;
- 		    case PNG_COLOR_TYPE_PALETTE:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					c = png_row_pointer[col];
--					r = info_ptr->palette[c].red;
--					g = info_ptr->palette[c].green;
--					b = info_ptr->palette[c].blue;
-+					r = plte[c].red;
-+					g = plte[c].green;
-+					b = plte[c].blue;
- 					c = (r*11 + g*16 + b*5) / 32;
- 					raw_row_pointer[col] = c ^ 0xFF;
- 				}
- 				break;
- 		    case PNG_COLOR_TYPE_RGB:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					r = png_row_pointer[col*3];
- 					g = png_row_pointer[col*3+1];
- 					b = png_row_pointer[col*3+2];
-@@ -219,7 +223,7 @@
- 				}
- 				break;
- 		    case PNG_COLOR_TYPE_RGB_ALPHA:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					r = png_row_pointer[col*4];
- 					g = png_row_pointer[col*4+1];
- 					b = png_row_pointer[col*4+2];
-@@ -228,7 +232,7 @@
- 				}
- 				break;
- 		    case PNG_COLOR_TYPE_GRAY_ALPHA:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					raw_row_pointer[col] = png_row_pointer[col*2] ^ 0xFF;
- 				}
- 				break;