summarylogtreecommitdiffstats
path: root/7eff90f462c740b527a1484e31383ea707351180.patch
diff options
context:
space:
mode:
authorThomas Weißschuh2022-12-29 13:23:14 +0000
committerThomas Weißschuh2022-12-29 13:49:01 +0000
commit3268efe58f209e35ad13e1f259e90d77dc1291ae (patch)
tree07a06208589cdbb91c02cfa0bdc3ebc3c4e31fd7 /7eff90f462c740b527a1484e31383ea707351180.patch
parent85766c3764fab60aea07b0a04b6efef927022855 (diff)
downloadaur-3268efe58f209e35ad13e1f259e90d77dc1291ae.tar.gz
Version 1.0
* Upstream release * Mark PDF generation dependencies as optional. This removes the need to install more packages from AUR. * Mark akonadi as a hard dependency * Drop i686 support
Diffstat (limited to '7eff90f462c740b527a1484e31383ea707351180.patch')
-rw-r--r--7eff90f462c740b527a1484e31383ea707351180.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/7eff90f462c740b527a1484e31383ea707351180.patch b/7eff90f462c740b527a1484e31383ea707351180.patch
deleted file mode 100644
index 83ac88c09b1f..000000000000
--- a/7eff90f462c740b527a1484e31383ea707351180.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 7eff90f462c740b527a1484e31383ea707351180 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino@tiscali.it>
-Date: Mon, 30 Dec 2019 08:24:25 +0100
-Subject: [PATCH] Check for only for Python 3 for erml2pdf.py
-
-Python 3 has been around for many years, and even not so recent distros
-ship it. Considering Python 2 is EOL since 2020, switch the search for
-the Python interpreter for erml2pdf.py to Python 3 only.
----
- src/reportgenerator.cpp | 14 +++++---------
- 1 file changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/src/reportgenerator.cpp b/src/reportgenerator.cpp
-index 4547319..6ca4dcc 100644
---- a/src/reportgenerator.cpp
-+++ b/src/reportgenerator.cpp
-@@ -484,7 +484,7 @@ QStringList ReportGenerator::findTrml2Pdf( )
- p += QLatin1String("/tools/erml2pdf.py");
- // qDebug () << "Found erml2pdf from KRAFT_HOME: " << p;
- if( QFile::exists( p ) ) {
-- retList << "python";
-+ retList << "python3";
- retList << p;
- mHavePdfMerge = true;
- }
-@@ -492,14 +492,10 @@ QStringList ReportGenerator::findTrml2Pdf( )
- const QString ermlpy = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kraft/tools/erml2pdf.py" );
- // qDebug () << "Ermlpy: " << ermlpy;
- if( ! ermlpy.isEmpty() ) {
-- // need the python interpreter
-- // First check for python2 in python3 times.
-- QString python = QStandardPaths::findExecutable(QLatin1String("python2"));
-+ // need the python3 interpreter, check for it
-+ QString python = QStandardPaths::findExecutable(QLatin1String("python3"));
- if( python.isEmpty() ) {
-- python = QStandardPaths::findExecutable(QLatin1String("python"));
-- }
-- if( python.isEmpty() ) {
-- qCritical() << "ERR: Unable to find python, thats a problem";
-+ qCritical() << "ERR: Unable to find python3, thats a problem";
- } else {
- // qDebug () << "Using python: " << python;
- retList << python;
-@@ -543,7 +539,7 @@ void ReportGenerator::runTrml2Pdf( const QString& rmlFile, const QString& docID,
- {
- mErrors.clear();
- // findTrml2Pdf returns a list of command line parts for the converter, such as
-- // /usr/bin/pyhton /usr/local/share/erml2pdf.py
-+ // /usr/bin/pyhton3 /usr/local/share/erml2pdf.py
- QStringList rmlbin = findTrml2Pdf();
-
- if ( ! rmlbin.size() ) {