Date: Tuesday, January 2, 2018 @ 23:00:22
Author: arojas
Revision: 277835
archrelease: copy trunk to community-x86_64
Added:
qmc2/repos/community-x86_64/PKGBUILD
(from rev 277834, qmc2/trunk/PKGBUILD)
Deleted:
qmc2/repos/community-x86_64/PKGBUILD
qmc2/repos/community-x86_64/qmc2-qt5.9.patch
------------------+
PKGBUILD | 66 +++++++++++++++++++++++---------------------------
qmc2-qt5.9.patch | 69 -----------------------------------------------------
2 files changed, 30 insertions(+), 105 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-02 22:59:56 UTC (rev 277834)
+++ PKGBUILD 2018-01-02 23:00:22 UTC (rev 277835)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Sergej Pupykin <[email protected]>
-# Contributor: JJDaNiMoTh <[email protected]>
-
-pkgname=qmc2
-pkgver=0.187
-pkgrel=1
-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 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 $pkgname
- export CTIME=0
- make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr
QMAKE=qmake-qt5 \
- SYSTEM_MINIZIP=1 SYSTEM_ZLIB=1
-}
-
-package() {
- 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"
-}
Copied: qmc2/repos/community-x86_64/PKGBUILD (from rev 277834,
qmc2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-02 23:00:22 UTC (rev 277835)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Antonio Rojas <[email protected]>
+# Contributor: Sergej Pupykin <[email protected]>
+# Contributor: JJDaNiMoTh <[email protected]>
+
+pkgname=qmc2
+pkgver=0.192
+pkgrel=1
+pkgdesc="Qt based UNIX MAME frontend supporting SDLMAME"
+url="http://qmc2.batcom-it.net/";
+license=(GPL)
+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";)
+sha256sums=('63f89a6839121fef5d5381f7b0baae8ca5e401bf5f32f7d36b36c357e85cee87')
+
+build() {
+ cd $pkgname
+ export CTIME=0
+ make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr
QMAKE=qmake-qt5 \
+ SYSTEM_MINIZIP=1 SYSTEM_ZLIB=1
+}
+
+package() {
+ 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"
+}
Deleted: qmc2-qt5.9.patch
===================================================================
--- qmc2-qt5.9.patch 2018-01-02 22:59:56 UTC (rev 277834)
+++ qmc2-qt5.9.patch 2018-01-02 23:00:22 UTC (rev 277835)
@@ -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();
