[arch-commits] Commit in qmc2/trunk (PKGBUILD qmc2-qt5.9.patch)

[Antonio Rojas]

    Date: Tuesday, October 31, 2017 @ 21:44:22
  Author: arojas
Revision: 264942

Update to 0.187

Added:
  qmc2/trunk/qmc2-qt5.9.patch
Modified:
  qmc2/trunk/PKGBUILD

------------------+
 PKGBUILD         |   32 +++++++++++++++---------
 qmc2-qt5.9.patch |   69 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-31 21:11:38 UTC (rev 264941)
+++ PKGBUILD	2017-10-31 21:44:22 UTC (rev 264942)
@@ -1,27 +1,35 @@
 # $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer:
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
 # Contributor: JJDaNiMoTh <jjdanimoth at gmail.com>
 
 pkgname=qmc2
-pkgver=0.71
+pkgver=0.187
 pkgrel=1
-pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME"
+pkgdesc="Qt based UNIX MAME frontend supporting SDLMAME"
 url="http://qmc2.batcom-it.net/"
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('qt5-webkit' 'qt5-svg' 'qt5-multimedia' 'phonon-qt5' 'sdl')
-makedepends=('rsync' 'mesa')
-source=("http://downloads.sourceforge.net/project/qmc2/qmc2/$pkgver/qmc2-$pkgver.tar.bz2")
-sha256sums=('4233d8aaf679f9f752348990eb5ebe3ab801e28a17dc624ba9b6eb77d54a82f0')
+license=(GPL)
+arch=(i686 x86_64)
+depends=(qt5-webkit qt5-svg qt5-multimedia sdl2 minizip)
+makedepends=(rsync)
+source=("http://downloads.sourceforge.net/project/qmc2/qmc2/$pkgver/qmc2-$pkgver.tar.bz2" qmc2-qt5.9.patch)
+sha256sums=('8db7e4e8fb22b40c65869e70f8517c6897e20bcf2c78026b09a443a8c4459092'
+            '2eadfc85654bd7a3908e6e9d12f509a735d2fb359f299f07f367f1fc9602c7e0')
 
+prepare() {
+  cd $pkgname
+  patch -p2 -i ../qmc2-qt5.9.patch # Fix build with Qt 5.9
+}
+
 build() {
-  cd "$srcdir/$pkgname"
+  cd $pkgname
   export CTIME=0
-  make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr QMAKE=qmake-qt5
+  make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr QMAKE=qmake-qt5 \
+    SYSTEM_MINIZIP=1 SYSTEM_ZLIB=1
 }
 
 package() {
-  cd "$srcdir/$pkgname"
+  cd $pkgname
   make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr QMAKE=qmake-qt5 DESTDIR="$pkgdir" install
   install -d "$pkgdir"/usr/share/{applications,pixmaps}
   install -D -m644 "$srcdir/qmc2/data/img/mame.png" "$pkgdir/usr/share/pixmaps"

Added: qmc2-qt5.9.patch
===================================================================
--- qmc2-qt5.9.patch	                        (rev 0)
+++ qmc2-qt5.9.patch	2017-10-31 21:44:22 UTC (rev 264942)
@@ -0,0 +1,69 @@
+--- a/trunk/emuopt.cpp
++++ b/trunk/emuopt.cpp
+@@ -1196,12 +1196,13 @@
+ 	QString choiceEntity("choice");
+ 	QString ignoreOS(QString("ignore.%1").arg(QMC2_OS_NAME));
+ 	validChoices.clear();
++	QString trueStr("true");
+ 	while ( !xmlReader->atEnd() && readNext ) {
+ 		if ( !xmlReader->hasError() ) {
+ 			if ( xmlReader->isStartElement() ) {
+ 				QString elementType(xmlReader->name().toString());
+ 				if ( choiceEntity.compare(elementType) == 0 ) {
+-					if ( xmlReader->attributes().value("ignore").compare("true") != 0 && xmlReader->attributes().value(ignoreOS).compare("true") != 0 )
++					if ( xmlReader->attributes().value("ignore").compare(trueStr) != 0 && xmlReader->attributes().value(ignoreOS).compare(QString("true")) != 0 )
+ 						validChoices.append(xmlReader->attributes().value("name").toString());
+ 				} else
+ 					readNext = false;
+@@ -1240,6 +1241,8 @@
+ 		QString templateEntity("template");
+ 		QString ignoreOS(QString("ignore.%1").arg(QMC2_OS_NAME));
+ 		QString defaultOS(QString("default.%1").arg(QMC2_OS_NAME));
++		QString trueStr("true");
++		QString choiceStr("choice");
+ 		bool readNext = true;
+ 		while ( !xmlReader.atEnd() ) {
+ 			if ( readNext )
+@@ -1255,9 +1258,9 @@
+ 					if ( sectionEntity.compare(elementType) == 0 ) {
+ 						bool ignore = false;
+ 						if ( xmlReader.attributes().hasAttribute("ignore") )
+-							ignore = xmlReader.attributes().value("ignore").compare("true") == 0;
++							ignore = xmlReader.attributes().value("ignore").compare(trueStr) == 0;
+ 						if ( xmlReader.attributes().hasAttribute(ignoreOS) )
+-							ignore |= xmlReader.attributes().value(ignoreOS).compare("true") == 0;
++							ignore |= xmlReader.attributes().value(ignoreOS).compare(trueStr) == 0;
+ 						if ( !ignore ) {
+ 							sectionTitle = readDescription(&xmlReader, lang, &readNext);
+ 							templateMap[sectionTitle].clear();
+@@ -1267,17 +1270,17 @@
+ 					if ( optionEntity.compare(elementType) == 0 ) {
+ 						bool ignore = false;
+ 						if ( xmlReader.attributes().hasAttribute("ignore") )
+-							ignore = xmlReader.attributes().value("ignore").compare("true") == 0;
++							ignore = xmlReader.attributes().value("ignore").compare(trueStr) == 0;
+ 						if ( xmlReader.attributes().hasAttribute(ignoreOS) )
+-							ignore |= xmlReader.attributes().value(ignoreOS).compare("true") == 0;
++							ignore |= xmlReader.attributes().value(ignoreOS).compare(trueStr) == 0;
+ 						if ( !ignore ) {
+ 							bool visible = true;
+ 							bool wip = false;
+ 							int decimals = QMC2_EMUOPT_DFLT_DECIMALS;
+ 							if ( xmlReader.attributes().hasAttribute("wip") )
+-								wip = xmlReader.attributes().value("wip").compare("true") == 0;
++								wip = xmlReader.attributes().value("wip").compare(trueStr) == 0;
+ 							if ( xmlReader.attributes().hasAttribute("visible") )
+-								visible = xmlReader.attributes().value("visible").compare("true") == 0;
++								visible = xmlReader.attributes().value("visible").compare(trueStr) == 0;
+ 							if ( xmlReader.attributes().hasAttribute("decimals") )
+ 								decimals = xmlReader.attributes().value("decimals").toString().toInt();
+ 							QString type(xmlReader.attributes().value("type").toString());
+@@ -1288,7 +1291,7 @@
+ 								defaultValue = xmlReader.attributes().value("default").toString();
+ 							QString optionDescription(readDescription(&xmlReader, lang, &readNext));
+ 							optionChoices.clear();
+-							if ( type.compare("combo") == 0 && xmlReader.name().compare("choice") == 0 )
++							if ( type.compare("combo") == 0 && xmlReader.name().compare(choiceStr) == 0 )
+ 								optionChoices = readChoices(&xmlReader);
+ 							optionPart.clear();
+ 							optionRelativeTo.clear();