[packages/qpxtool] - up to 0.8.0
baggins
baggins at pld-linux.org
Sat Jun 6 10:46:22 CEST 2026
commit 63ddc51c80e43714ac2177a11adc0a05c329644f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Jun 6 10:46:12 2026 +0200
- up to 0.8.0
bad-compare.patch | 11 ++++
iwyu.patch | 10 ++++
qpxtool-libpng15.patch | 137 -------------------------------------------------
qpxtool.spec | 31 ++++++-----
4 files changed, 40 insertions(+), 149 deletions(-)
---
diff --git a/qpxtool.spec b/qpxtool.spec
index 55f28d6..e6f23f2 100644
--- a/qpxtool.spec
+++ b/qpxtool.spec
@@ -6,19 +6,22 @@
Summary: CD/DVD quality checker
Summary(pl.UTF-8): Tester jakości płyt CD/DVD
Name: qpxtool
-Version: 0.7.1_002
-Release: 6
+Version: 0.8.0
+Release: 1
License: GPL v2
Group: X11/Applications
Source0: http://downloads.sourceforge.net/qpxtool/%{name}-%{version}.tar.bz2
-# Source0-md5: 755321a0196b16d06857550aac74ff50
-Patch0: %{name}-libpng15.patch
+# Source0-md5: f4b09f8d5aa533f680c8bcce19c1072e
+Patch0: bad-compare.patch
+Patch1: iwyu.patch
URL: http://qpxtool.sourceforge.net/
-BuildRequires: QtGui-devel
-BuildRequires: QtNetwork-devel
-BuildRequires: qt4-build
-BuildRequires: qt4-linguist
-BuildRequires: qt4-qmake
+BuildRequires: Qt5Core-devel
+BuildRequires: Qt5Gui-devel
+BuildRequires: Qt5Network-devel
+BuildRequires: Qt5PrintSupport-devel
+BuildRequires: qt5-build
+BuildRequires: qt5-linguist
+BuildRequires: qt5-qmake
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -37,13 +40,17 @@ dla sprzętu, co zwiększy szanse długiego życia zapisanych danych.
%prep
%setup -q
%patch -P0 -p1
-sed -e 's|lrelease|lrelease-qt4|' -i configure
+%patch -P1 -p1
+sed -e 's|lrelease|lrelease-qt5|' -i configure
%build
./configure \
- --prefix="%{_prefix}" \
+ --prefix=%{_prefix} \
+ --libdir=%{_libdir} \
+ --mandir=%{_mandir} \
+ --qmake=qmake-qt5 \
%{?debug:enable-debug}
-CXXFLAGS="%{rpmcflags}" \
+CXXFLAGS="%{rpmcxxflags}" \
CXX="%{__cxx}" \
%{__make}
diff --git a/bad-compare.patch b/bad-compare.patch
new file mode 100644
index 0000000..c3f7c52
--- /dev/null
+++ b/bad-compare.patch
@@ -0,0 +1,11 @@
+--- qpxtool-0.8.0/gui/src/mainwindow.cpp~ 2020-01-28 17:56:02.000000000 +0100
++++ qpxtool-0.8.0/gui/src/mainwindow.cpp 2026-06-06 10:31:26.470515113 +0200
+@@ -427,7 +427,7 @@
+ int idx;
+ QAction *act = (QAction*) sender();
+ idx = act_sblist.indexOf(act);
+- if (act<0) return;
++ if (idx<0) return;
+ mwidget->selectTab(idx);
+ }
+
diff --git a/iwyu.patch b/iwyu.patch
new file mode 100644
index 0000000..63262a4
--- /dev/null
+++ b/iwyu.patch
@@ -0,0 +1,10 @@
+--- qpxtool-0.8.0/gui/include/device.h~ 2020-01-28 17:56:02.000000000 +0100
++++ qpxtool-0.8.0/gui/include/device.h 2026-06-06 10:37:47.729083219 +0200
+@@ -17,6 +17,7 @@
+ #include <QStringList>
+ #include <QList>
+ #include <QMutex>
++#include <QIODevice>
+
+ #include <sys/time.h>
+ #include <inttypes.h>
diff --git a/qpxtool-libpng15.patch b/qpxtool-libpng15.patch
deleted file mode 100644
index 7caa253..0000000
--- a/qpxtool-libpng15.patch
+++ /dev/null
@@ -1,137 +0,0 @@
---- qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp~ 2009-11-25 08:55:44.000000000 +0100
-+++ qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp 2012-02-12 10:44:07.958932065 +0100
-@@ -88,12 +88,13 @@
- png_infop info_ptr;
- uint32_t number_of_passes;
- png_bytep png_row_pointer = NULL;
-+ png_colorp png_palette;
- unsigned char *raw_row_pointer;
- // unsigned char *tp = NULL;
-
- // int width;
- uint32_t row, col;
-- int c;
-+ int c, num_palette;
- int32_t r,g,b;
-
- if (fread(header, 1, 8, fp) < 8) {
-@@ -129,28 +130,28 @@
-
- png_read_info(png_ptr, info_ptr);
-
-- printf("Image size: %ld x %ld\n", info_ptr->width, info_ptr->height);
-+ printf("Image size: %ld x %ld\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 +169,50 @@
- 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);
-+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
-+ png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);
-+ printf("Palette : %d colors\n", num_palette);
- } else {
- printf("Palette : NO\n");
- }
-- printf("ROW bytes : %ld\n", info_ptr->rowbytes);
-+ printf("ROW bytes : %ld\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 = png_palette[c].red;
-+ g = png_palette[c].green;
-+ b = png_palette[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 +221,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 +230,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;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qpxtool.git/commitdiff/63ddc51c80e43714ac2177a11adc0a05c329644f
More information about the pld-cvs-commit
mailing list