summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2023-12-30 00:07:10 +0100
committerMartchus2023-12-30 00:07:10 +0100
commit0b25c91d7a94b14838383f9033a185fe75c78c6c (patch)
tree5b2b57b52d7cd8b73d668b484bd0bd413e8a4f39
parentb966d7a59df1eb9707fb7c861af987f8f4abd9d5 (diff)
downloadaur-tageditor.tar.gz
Adapt tests to jq update
-rw-r--r--.SRCINFO2
-rw-r--r--0001-Avoid-use-of-jq-argument-argjson-as-it-has-been-remo.patch33
-rw-r--r--PKGBUILD11
3 files changed, 44 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 381cd84172ee..9fbd12d9697e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -23,6 +23,8 @@ pkgbase = tageditor
depends = qt5-webengine
depends = qt5-declarative
source = tageditor-3.9.0.tar.gz::https://github.com/Martchus/tageditor/archive/v3.9.0.tar.gz
+ source = 0001-Avoid-use-of-jq-argument-argjson-as-it-has-been-remo.patch
sha256sums = ebafac24ab7c3833a018b5848b32d9fa2cfa01cafeff1b1ec1a6e30eb7415b1b
+ sha256sums = SKIP
pkgname = tageditor
diff --git a/0001-Avoid-use-of-jq-argument-argjson-as-it-has-been-remo.patch b/0001-Avoid-use-of-jq-argument-argjson-as-it-has-been-remo.patch
new file mode 100644
index 000000000000..da6101718699
--- /dev/null
+++ b/0001-Avoid-use-of-jq-argument-argjson-as-it-has-been-remo.patch
@@ -0,0 +1,33 @@
+From e1e979f9f5df83cd705ff6e47e75f71905e58495 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Fri, 29 Dec 2023 17:58:43 +0100
+Subject: [PATCH] Avoid use of `jq`-argument `--argjson` as it has been removed
+
+Apprently `--slurpfile` is supposed to be used instead.
+---
+ tests/cli.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/cli.cpp b/tests/cli.cpp
+index 123d485..7e5a2cb 100644
+--- a/tests/cli.cpp
++++ b/tests/cli.cpp
+@@ -1164,12 +1164,12 @@ void CliTests::testJsonExport()
+ cout << "\nJSON export" << endl;
+ string stdout, stderr;
+
+- const auto file(testFilePath("matroska_wave1/test3.mkv"));
+- const auto expectedJsonPath(testFilePath("matroska_wave1-test3.json"));
++ const auto file = testFilePath("matroska_wave1/test3.mkv");
++ const auto expectedJson = readFile(testFilePath("matroska_wave1-test3.json"));
+ const char *const args[] = { "tageditor", "export", "--pretty", "-f", file.data(), nullptr };
+ TESTUTILS_ASSERT_EXEC(args);
+ const char *const jqArgs[]
+- = { "jq", "--argfile", "expected", expectedJsonPath.data(), "--argjson", "actual", stdout.data(), "-n", "$actual == $expected", nullptr };
++ = { "jq", "--argjson", "expected", expectedJson.data(), "--argjson", "actual", stdout.data(), "-n", "$actual == $expected", nullptr };
+ const auto *const logJsonExport = std::getenv(PROJECT_VARNAME_UPPER "_LOG_JQ_INVOCATION");
+ execHelperAppInSearchPath("jq", jqArgs, stdout, stderr, !logJsonExport || !std::strlen(logJsonExport));
+ CPPUNIT_ASSERT_EQUAL(""s, stderr);
+--
+2.43.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 961e28718f13..cb35186754ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,8 +29,15 @@ makedepends=('cmake' 'ninja' 'qt5-tools')
[[ $_json_export == ON ]] && makedepends+=('reflective-rapidjson')
checkdepends=('cppunit' 'jq')
url="https://github.com/Martchus/${_reponame}"
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('ebafac24ab7c3833a018b5848b32d9fa2cfa01cafeff1b1ec1a6e30eb7415b1b')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz"
+ 0001-Avoid-use-of-jq-argument-argjson-as-it-has-been-remo.patch)
+sha256sums=('ebafac24ab7c3833a018b5848b32d9fa2cfa01cafeff1b1ec1a6e30eb7415b1b'
+ SKIP)
+
+prepare() {
+ cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+ patch -p1 -i ../0001-Avoid-use-of-jq-argument-argjson-as-it-has-been-remo.patch
+}
build() {
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"