diff options
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | 0001-Avoid-use-of-jq-argument-argjson-as-it-has-been-remo.patch | 33 | ||||
| -rw-r--r-- | PKGBUILD | 15 |
3 files changed, 46 insertions, 5 deletions
@@ -19,10 +19,11 @@ pkgbase = tageditor depends = libtagparser.so depends = libc++utilities.so depends = desktop-file-utils - depends = xdg-utils 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 + @@ -19,8 +19,8 @@ pkgrel=1 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') pkgdesc='A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska' license=('GPL') -depends=('libqtutilities.so' 'libtagparser.so' 'libc++utilities.so' 'desktop-file-utils' 'xdg-utils') -[[ $_webview_provider == none ]] && [[ $_js_provider == none ]] && depends+=('qt5-base') +depends=('libqtutilities.so' 'libtagparser.so' 'libc++utilities.so' 'desktop-file-utils') +[[ $_webview_provider == none ]] && [[ $_js_provider == none ]] && depends+=('qt5-base' ) [[ $_webview_provider == webkit ]] && depends+=('qt5-webkit') [[ $_webview_provider == webengine ]] && depends+=('qt5-webengine') [[ $_js_provider == script ]] && depends+=('qt5-script') @@ -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}" |