From 9a10663b63a40a8f7ddeb6e2f65c7557006e49c2 Mon Sep 17 00:00:00 2001 From: yopito Date: Sat, 24 Apr 2021 23:22:05 +0200 Subject: [PATCH] okteta: update to 0.26.6 --- .../patches/cmake.testing.working_dir.patch | 26 +++++++++++++++++++ srcpkgs/okteta/template | 6 ++--- 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/okteta/patches/cmake.testing.working_dir.patch diff --git a/srcpkgs/okteta/patches/cmake.testing.working_dir.patch b/srcpkgs/okteta/patches/cmake.testing.working_dir.patch new file mode 100644 index 000000000000..7a5dc935288b --- /dev/null +++ b/srcpkgs/okteta/patches/cmake.testing.working_dir.patch @@ -0,0 +1,26 @@ +upstream bug: https://bugs.kde.org/show_bug.cgi?id=436128 + +--- kasten/controllers/CMakeLists.txt.ORIG 2021-03-29 13:51:56.000000000 +0200 ++++ kasten/controllers/CMakeLists.txt 2021-04-24 23:12:17.358195447 +0200 +@@ -584,15 +584,12 @@ + LINK_LIBRARIES structureview-tested-srcs Qt5::Test poddecoder-typeeditors + ) + +- # remove useless default definition of QT_TESTCASE_BUILDDIR in interface from imported target Qt5::Test +- get_target_property(qttestdefs Qt5::Test INTERFACE_COMPILE_DEFINITIONS) +- list(FILTER qttestdefs EXCLUDE REGEX [[^QT_TESTCASE_BUILDDIR=]]) +- set_property(TARGET Qt5::Test PROPERTY INTERFACE_COMPILE_DEFINITIONS ${qttestdefs}) +- # set the definition as needed for our tests +- target_compile_definitions(customtostringtest PRIVATE QT_TESTCASE_BUILDDIR="${CMAKE_CURRENT_BINARY_DIR}") +- target_compile_definitions(jsparsertest PRIVATE QT_TESTCASE_BUILDDIR="${CMAKE_CURRENT_BINARY_DIR}") +- # TODO: still fragile once __FILE__ is neither absolute or full relative path to this build dir +- # look into using custom code intead of simple QFINDTESTDATA usage ++ # The tests below are using data files that are pointed via QFINDTESTDATA macro, ++ # that is related to cmake WORKING_DIRECTORY. WORKING_DIRECTORY points the current ++ # directory, while data files are stored in test/ subdirectory. ++ # So set WORKING_DIRECTORY correctly. ++ target_compile_definitions(customtostringtest PRIVATE WORKING_DIRECTORY="${CMAKE_CURRENT_SOURCE_DIR}/test") ++ target_compile_definitions(jsparsertest PRIVATE WORKING_DIRECTORY="${CMAKE_CURRENT_SOURCE_DIR}/test") + + #replace tool unit tests + ecm_add_test( diff --git a/srcpkgs/okteta/template b/srcpkgs/okteta/template index 6cef4e659fe5..a8c011b83522 100644 --- a/srcpkgs/okteta/template +++ b/srcpkgs/okteta/template @@ -1,7 +1,7 @@ # Template file for 'okteta' pkgname=okteta reverts="4.14.3_1" -version=0.26.5 +version=0.26.6 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext python qt5-qmake qt5-host-tools @@ -13,9 +13,9 @@ checkdepends="AppStream" short_desc="Hexadecimal editor for binary files" maintainer="yopito " license="GPL-2.0-or-later, LGPL-2.1-or-later" -homepage="https://kde.org/applications/utilities/org.kde.okteta" +homepage="https://apps.kde.org/okteta/" distfiles="${KDE_SITE}/okteta/${version}/src/okteta-${version}.tar.xz" -checksum=9fc7edfff73e7b0583af540b0c052f9221ca3f11ea3fc3604c2bcedb09c29a97 +checksum=c569cd5b55503e46df1a5b5c9162b08888c426aa52c6f3f2f926c658bee0144c pre_check() { export QT_QPA_PLATFORM=offscreen