actiona: update to 3.9.1

This commit is contained in:
Jürgen Buchmüller 2015-11-05 08:20:12 +01:00
parent 022e24217e
commit cdc61ba9c5
3 changed files with 2 additions and 112 deletions

View file

@ -1,20 +0,0 @@
--- gui/mainwindow.cpp
+++ gui/mainwindow.cpp
@@ -128,11 +128,16 @@ MainWindow::MainWindow(QxtCommandOptions *commandOptions, ProgressSplashScreen *
ui->setupUi(this);
+ mScriptProgressDialog->close();
mScriptProgressDialog->setWindowModality(Qt::ApplicationModal);
mScriptProgressDialog->setCancelButton(0);
mScriptProgressDialog->setAutoClose(false);
mScriptProgressDialog->setMinimumDuration(0);
+#ifndef ACT_NO_UPDATER
+ mUpdaterProgressDialog->close();
+#endif
+
if(Global::ACTIONA_VERSION >= Tools::Version(1, 0, 0))
ui->reportBugPushButton->setVisible(false);

View file

@ -1,90 +0,0 @@
--- actiontools/version.cpp 2015-06-22 17:22:46.000000000 +0200
+++ actiontools/version.cpp 2015-10-08 11:03:52.104274402 +0200
@@ -20,6 +20,7 @@
#include "version.h"
+#include <QDataStream>
#include <QRegExp>
#include <QStringList>
--- tools/version.cpp 2015-06-22 17:22:46.000000000 +0200
+++ tools/version.cpp 2015-10-08 11:10:09.000244997 +0200
@@ -20,6 +20,7 @@
#include "version.h"
+#include <QDataStream>
#include <QRegExp>
#include <QStringList>
--- actiontools/qtsingleapplication/qtlocalpeer.h 2015-06-22 17:22:46.000000000 +0200
+++ actiontools/qtsingleapplication/qtlocalpeer.h 2015-10-08 11:27:48.169162361 +0200
@@ -48,6 +48,7 @@
#include <QtNetwork/QLocalServer>
#include <QtNetwork/QLocalSocket>
#include <QtCore/QDir>
+#include <QDataStream>
namespace QtLP_Private {
#include "qtlockedfile.h"
--- actiontools/datacopyactioninstance.h 2015-06-22 17:22:46.000000000 +0200
+++ actiontools/datacopyactioninstance.h 2015-10-08 11:30:36.177149253 +0200
@@ -24,6 +24,7 @@
#include "actiontools_global.h"
#include "actioninstance.h"
+#include <QDataStream>
#include <QTimer>
namespace ActionTools
--- actiontools/parameter.h 2015-06-22 17:22:46.000000000 +0200
+++ actiontools/parameter.h 2015-10-08 11:37:16.880117991 +0200
@@ -24,6 +24,7 @@
#include "subparameter.h"
#include "actiontools_global.h"
+#include <QDataStream>
#include <QSharedData>
namespace ActionTools
--- actiontools/actionexception.cpp 2015-06-22 17:22:46.000000000 +0200
+++ actiontools/actionexception.cpp 2015-10-08 11:40:59.383100631 +0200
@@ -21,6 +21,7 @@
#include "actionexception.h"
#include <QDebug>
+#include <QDataStream>
namespace ActionTools
{
--- actiontools/subparameter.h 2015-06-22 17:22:46.000000000 +0200
+++ actiontools/subparameter.h 2015-10-08 11:43:23.632089377 +0200
@@ -23,6 +23,7 @@
#include "actiontools_global.h"
+#include <QDataStream>
#include <QSharedData>
#include <QVariant>
--- actiontools/qxtsmtp/qxtmailattachment.h 2015-06-22 17:22:46.000000000 +0200
+++ actiontools/qxtsmtp/qxtmailattachment.h 2015-10-08 11:21:06.874193670 +0200
@@ -28,6 +28,7 @@
#include "qxtglobal.h"
+#include <QIODevice>
#include <QStringList>
#include <QHash>
#include <QByteArray>
--- actiontools/numberformat.h 2015-06-22 17:22:46.000000000 +0200
+++ actiontools/numberformat.h 2015-10-08 11:33:13.130137008 +0200
@@ -24,6 +24,7 @@
#include "actiontools_global.h"
#include <QString>
+#include <QObject>
namespace ActionTools
{

View file

@ -1,6 +1,6 @@
# Template file for 'actiona' # Template file for 'actiona'
pkgname=actiona pkgname=actiona
version=3.9.0 version=3.9.1
revision=1 revision=1
build_style=qmake build_style=qmake
hostmakedepends="pkg-config qt5-qmake qt5-plugin-mysql" hostmakedepends="pkg-config qt5-qmake qt5-plugin-mysql"
@ -12,7 +12,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-3" license="GPL-3"
homepage="https://actiona.tools/" homepage="https://actiona.tools/"
distfiles="https://github.com/Jmgr/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" distfiles="https://github.com/Jmgr/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=b41859018b6b20083aa53a352f4aa7c00e36a9913e280242ffe099a497c3f698 checksum=46ddc28a6cc4bb951a1ea4bd65832e7cb2f10d4397e18475bb872c83b5c60188
post_install() { post_install() {
vmkdir usr/share/applications vmkdir usr/share/applications