qmc2: fix build, merge qmc2-data

Also remove noarch from its dependencies.

srcpkgs/qmc2-data

@@ -1 +0,0 @@
-qmc2

srcpkgs/qmc2-flyers/template

@@ -1,15 +1,14 @@
 # Template file for 'qmc2-flyers'
 pkgname=qmc2-flyers
 version=20160702
-revision=1
+revision=2
 create_wrksrc=yes
 short_desc="Qt M.A.M.E. Catalog/Launcher II - flyers"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://qmc2.arcadehits.net/wordpress/"
-distfiles="http://distfiles.voidlinux.de/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
+distfiles="https://distfiles.voidlinux.de/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
 checksum="599660060753ce7118d9abc4b77f4644985d1341e1f3ca7c1f34d1a7a2e8030d"
-archs=noarch
 
 do_install() {
 	mkdir -p ${DESTDIR}/usr/share/qmc2

srcpkgs/qmc2-snapshots/template

@@ -1,15 +1,14 @@
 # Template file for 'qmc2-snapshots'
 pkgname=qmc2-snapshots
 version=20160702
-revision=1
+revision=2
 create_wrksrc=yes
 short_desc="Qt M.A.M.E. Catalog/Launcher II - snapshots"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://qmc2.arcadehits.net/wordpress/"
-distfiles="http://distfiles.voidlinux.de/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
+distfiles="https://distfiles.voidlinux.de/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
 checksum="97684b11d4811ca1c3c24d31c359b7ac6ac90436e3fbce9e4966670697516d4f"
-archs=noarch
 
 do_install() {
 	mkdir -p ${DESTDIR}/usr/share/qmc2

srcpkgs/qmc2/patches/qt5.15.patch

@@ -0,0 +1,11 @@
+--- softwareimagewidget.cpp.orig	2020-11-27 08:21:37.481871758 +0700
++++ softwareimagewidget.cpp	2020-11-27 08:21:54.164406384 +0700
+@@ -3,6 +3,8 @@
+ #include <QHash>
+ #include <QDir>
+ #include <QClipboard>
++#include <QPainter>
++#include <QPainterPath>
+ 
+ #include "softwarelist.h"
+ #include "softwaresnapshot.h"

srcpkgs/qmc2/template

@@ -1,30 +1,31 @@
 # Template file for 'qmc2'
 pkgname=qmc2
 version=0.195
-revision=1
+revision=2
 wrksrc=${pkgname}
 build_style=gnu-makefile
-make_build_args="PREFIX=/usr DATADIR=/usr/share MAN_DIR=/usr/share/man TARGET=qmc2-mame"
+build_helper=qmake
+make_build_args="PREFIX=/usr DATADIR=/usr/share MAN_DIR=/usr/share/man
+ TARGET=qmc2-mame SYSTEM_MINIZIP=1 SYSTEM_ZLIB=1 LIBARCHIVE=1"
 make_install_args="${make_build_args}"
-hostmakedepends="rsync unzip"
+hostmakedepends="rsync unzip pkg-config qt5-host-tools qt5-qmake
+ qt5-multimedia-devel qt5-script-devel qt5-svg-devel qt5-webkit-devel
+ qt5-xmlpatterns-devel qt5-x11extras-devel"
 makedepends="SDL2-devel qt5-multimedia-devel qt5-script-devel qt5-svg-devel
- qt5-webkit-devel qt5-xmlpatterns-devel qt5-x11extras-devel pulseaudio-devel"
+ qt5-webkit-devel qt5-xmlpatterns-devel qt5-x11extras-devel pulseaudio-devel
-depends="qt5-plugin-sqlite rsync ${pkgname}-data qmc2-flyers qmc2-snapshots"
+ minizip-devel zlib-devel libarchive-devel"
+depends="qt5-plugin-sqlite rsync qmc2-flyers qmc2-snapshots"
 conf_files="/etc/${pkgname}/${pkgname}.ini"
 short_desc="Qt M.A.M.E. Catalog/Launcher II"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://qmc2.batcom-it.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
 checksum=44b36a80ab7cd23e0efc3e0296ea680b38dd122319379bf6a4dcb9c2111183e7
-broken="lots of build errors"
+replaces="qmc2-data>=0"
 
-if [ -n "$CROSS_BUILD" ]; then
+post_patch() {
-	hostmakedepends+=" qt5-host-tools qt5-multimedia-devel qt5-script-devel qt5-svg-devel"
+	sed -i -e "s/ True/ x_lzma_True/g;s/ False/ x_lzma_False/g" lzma/*
-	hostmakedepends+=" qt5-webkit-devel qt5-xmlpatterns-devel qt5-x11extras-devel"
-fi
-
-pre_build() {
 	# Replace sdl-config with sdl2-config
 	sed -e "s;sdl-config;sdl2-config;g" -i scripts/sdl-version.sh
 	# Replace obsolete -sdlmame suffix
@@ -80,15 +81,3 @@ do_install() {
 		-e "s;DATADIR;/usr/share;" \
 		> ${DESTDIR}/usr/share/applications/qchdman.desktop
 }
-qmc2-data_package() {
-	archs=noarch
-	short_desc+=" - data files"
-	pkg_install() {
-		local _ddir
-		vmove usr/share/qmc2
-		for _ddir in opt img doc prv fly ico cat cab ctl \
-			mrq ttl sws swn gmn js; do
-			cp -aR data/$_ddir ${PKGDESTDIR}/usr/share/qmc2
-		done
-	}
-}