Date: Tuesday, January 2, 2018 @ 22:59:56 Author: arojas Revision: 277834
Update to 0.192 Modified: qmc2/trunk/PKGBUILD Deleted: qmc2/trunk/qmc2-qt5.9.patch ------------------+ PKGBUILD | 14 +++------- qmc2-qt5.9.patch | 69 ----------------------------------------------------- 2 files changed, 4 insertions(+), 79 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-01-02 22:54:15 UTC (rev 277833) +++ PKGBUILD 2018-01-02 22:59:56 UTC (rev 277834) @@ -1,10 +1,10 @@ # $Id$ -# Maintainer: +# Maintainer: Antonio Rojas <[email protected]> # Contributor: Sergej Pupykin <[email protected]> # Contributor: JJDaNiMoTh <[email protected]> pkgname=qmc2 -pkgver=0.187 +pkgver=0.192 pkgrel=1 pkgdesc="Qt based UNIX MAME frontend supporting SDLMAME" url="http://qmc2.batcom-it.net/"; @@ -12,15 +12,9 @@ arch=(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') +source=("http://downloads.sourceforge.net/project/qmc2/qmc2/$pkgver/qmc2-$pkgver.tar.bz2";) +sha256sums=('63f89a6839121fef5d5381f7b0baae8ca5e401bf5f32f7d36b36c357e85cee87') -prepare() { - cd $pkgname - patch -p2 -i ../qmc2-qt5.9.patch # Fix build with Qt 5.9 -} - build() { cd $pkgname export CTIME=0 Deleted: qmc2-qt5.9.patch =================================================================== --- qmc2-qt5.9.patch 2018-01-02 22:54:15 UTC (rev 277833) +++ qmc2-qt5.9.patch 2018-01-02 22:59:56 UTC (rev 277834) @@ -1,69 +0,0 @@ ---- 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();
