From 5967c97470cb206ff80efd5e77cb9941b9c8416d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Thu, 7 May 2020 13:15:48 +0200 Subject: [PATCH] actiona: update to 3.10.1 --- srcpkgs/actiona/files/actiona.desktop | 14 ------------ ...2ed0d265fe610915b5447ca61f4bfaf01715.patch | 22 ------------------- .../actiona/patches/use-lrelease-qt5.patch | 20 +++++++++++++++++ srcpkgs/actiona/template | 10 +++------ 4 files changed, 23 insertions(+), 43 deletions(-) delete mode 100644 srcpkgs/actiona/files/actiona.desktop delete mode 100644 srcpkgs/actiona/patches/0cfe2ed0d265fe610915b5447ca61f4bfaf01715.patch create mode 100644 srcpkgs/actiona/patches/use-lrelease-qt5.patch diff --git a/srcpkgs/actiona/files/actiona.desktop b/srcpkgs/actiona/files/actiona.desktop deleted file mode 100644 index 775705c235e..00000000000 --- a/srcpkgs/actiona/files/actiona.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Name=Actiona -GenericName=Automation Tool -GenericName[fr]=Outil d'automatisation -Comment=Automate tasks -Comment[fr]=Automatise des tâches -Exec=actiona %f -Terminal=false -Icon=actiona -Type=Application -Categories=Utility; -Version=1.0 -MimeType=application/actiona-script;application/actiona-code;application/actionaz-script;application/actionaz-code; -Keywords=automate;bot;macro;script;action;asrc;acod; diff --git a/srcpkgs/actiona/patches/0cfe2ed0d265fe610915b5447ca61f4bfaf01715.patch b/srcpkgs/actiona/patches/0cfe2ed0d265fe610915b5447ca61f4bfaf01715.patch deleted file mode 100644 index 1d9ea7c0047..00000000000 --- a/srcpkgs/actiona/patches/0cfe2ed0d265fe610915b5447ca61f4bfaf01715.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0cfe2ed0d265fe610915b5447ca61f4bfaf01715 Mon Sep 17 00:00:00 2001 -From: Jonathan Mercier-Ganady -Date: Tue, 17 Mar 2020 22:40:09 +0000 -Subject: [PATCH] Add a missing include - ---- - actiontools/keyboardkeyedit.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/actiontools/keyboardkeyedit.cpp b/actiontools/keyboardkeyedit.cpp -index 80eaa8d9..377385af 100644 ---- actiontools/keyboardkeyedit.cpp -+++ actiontools/keyboardkeyedit.cpp -@@ -20,6 +20,8 @@ - - #include "keyboardkeyedit.h" - -+#include -+ - namespace ActionTools - { - KeyboardKeyEdit::KeyboardKeyEdit(QWidget *parent): diff --git a/srcpkgs/actiona/patches/use-lrelease-qt5.patch b/srcpkgs/actiona/patches/use-lrelease-qt5.patch new file mode 100644 index 00000000000..5123691334d --- /dev/null +++ b/srcpkgs/actiona/patches/use-lrelease-qt5.patch @@ -0,0 +1,20 @@ +--- actiona.pro 2020-05-07 12:41:07.738401940 +0200 ++++ actiona.pro 2020-05-07 12:47:22.744386988 +0200 +@@ -15,7 +15,7 @@ + + isEmpty(QMAKE_LRELEASE) { + win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe +- else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease ++ else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease-qt5 + } + + locale_release.name = lrelease-qt5 +@@ -18,7 +18,7 @@ + else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease + } + +-locale_release.name = lrelease ++locale_release.name = lrelease-qt5 + locale_release.commands = \ + $$QMAKE_LRELEASE tools/tools.pro && \ + $$QMAKE_LRELEASE actiontools/actiontools.pro && \ diff --git a/srcpkgs/actiona/template b/srcpkgs/actiona/template index e90d9c6e013..bd14f268aae 100644 --- a/srcpkgs/actiona/template +++ b/srcpkgs/actiona/template @@ -1,6 +1,6 @@ # Template file for 'actiona' pkgname=actiona -version=3.10.0 +version=3.10.1 revision=1 build_style=qmake hostmakedepends="pkg-config qt5-plugin-mysql qt5-qmake" @@ -13,7 +13,7 @@ maintainer="Jürgen Buchmüller " license="GPL-3.0-or-later" homepage="https://actiona.tools/" distfiles="https://github.com/Jmgr/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=7f7a6ecef82ec51fc5d92e41a9d39d1de190135b1fb6293318feb1d88ceb8757 +checksum=447065e380f8f37db4c8af01df8e1b9d7189cd256205f758845b71d8de6f37ea if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel qt5-multimedia-devel qt5-script-devel qt5-speech-devel" @@ -21,10 +21,6 @@ if [ -n "$CROSS_BUILD" ]; then fi post_build() { - lrelease locale/*.ts + lrelease-qt5 locale/*.ts } -post_install() { - vmkdir usr/share/applications - vinstall ${FILESDIR}/actiona.desktop 644 usr/share/applications -}