From 70997796278554942ca9170c62c611f205ab47af Mon Sep 17 00:00:00 2001 From: yopito Date: Sun, 1 Nov 2020 19:21:24 +0100 Subject: [PATCH] okteta: update to 0.26.4, support testing --- .../patches/cmake.testing.working_dir.patch | 36 +++++++++++++++++++ srcpkgs/okteta/template | 8 ++--- 2 files changed, 40 insertions(+), 4 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 0000000000..b2fae6dcca --- /dev/null +++ b/srcpkgs/okteta/patches/cmake.testing.working_dir.patch @@ -0,0 +1,36 @@ +fix https://invent.kde.org/utilities/okteta/-/issues/1 + +--- kasten/controllers/CMakeLists.txt.ORIG 2020-07-28 23:41:01.000000000 +0200 ++++ kasten/controllers/CMakeLists.txt 2020-11-01 11:15:35.947523996 +0100 +@@ -583,14 +583,29 @@ + test/scriptvalueconvertertest.cpp + test/osdparsertest.cpp + test/commonparsertest.cpp +- test/jsparsertest.cpp +- test/customtostringtest.cpp + test/locktooffsettest.cpp + + NAME_PREFIX structures- + LINK_LIBRARIES structureview-tested-srcs Qt5::Test poddecoder-typeeditors + ) + ++ #these tests are using QFINDTESTDATA, that does not work since managed by ++ #CMake from this parent directory: WORKING_DIRECTORY must be set accordindly ++ add_executable(jsparsertest test/jsparsertest.cpp) ++ add_test( ++ NAME structures-jsparsertest ++ COMMAND jsparsertest ++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test ++ ) ++ target_link_libraries(jsparsertest structureview-tested-srcs Qt5::Test poddecoder-typeeditors) ++ add_executable(customtostringtest test/customtostringtest.cpp) ++ add_test( ++ NAME structures-customtostringtest ++ COMMAND customtostringtest ++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test ++ ) ++ target_link_libraries(customtostringtest structureview-tested-srcs Qt5::Test poddecoder-typeeditors) ++ + #replace tool unit tests + ecm_add_test( + view/search/searchjob.cpp diff --git a/srcpkgs/okteta/template b/srcpkgs/okteta/template index 05605a353b..41881760f0 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.3 +version=0.26.4 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules gettext python qt5-qmake qt5-host-tools @@ -9,16 +9,16 @@ hostmakedepends="extra-cmake-modules gettext python qt5-qmake qt5-host-tools makedepends="qt5-devel qt5-script-devel qca-qt5-devel kbookmarks-devel kcodecs-devel kcompletion-devel kconfigwidgets-devel kcrash-devel kcmutils-devel knewstuff-devel kparts-devel" +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" distfiles="${KDE_SITE}/okteta/${version}/src/okteta-${version}.tar.xz" -checksum=29dc30fd71dfc5337c7d2f814feed1ced5799337c5b1fb5098539ba30941a490 +checksum=ef22b096c4d8a682b5467ee7d8e9e05ede44cde116daef804312745c4bfd0f03 pre_check() { - #this one requires xserver running - sed -i /parts/d build/CTestTestfile.cmake + export QT_QPA_PLATFORM=offscreen } okteta-devel_package() {