From: yopito <yopito@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] okteta: update to 0.26.4
Date: Sun, 01 Nov 2020 19:21:48 +0100 [thread overview]
Message-ID: <20201101182148.iisGazB_fPKpo5Q5TtogXT1wM0_O7sKRa1h3E7bUuMs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24920@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is an updated pull request by yopito against master on the void-packages repository
https://github.com/yopito/void-packages okteta.0264
https://github.com/void-linux/void-packages/pull/24920
okteta: update to 0.26.4
A patch file from https://github.com/void-linux/void-packages/pull/24920.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-okteta.0264-24920.patch --]
[-- Type: text/x-diff, Size: 3433 bytes --]
From 465810f3f237d6cf185f9dc5a42b38c12d21f427 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
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 00000000000..b2fae6dccaf
--- /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 05605a353be..41881760f00 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 <pierre.bourgin@free.fr>"
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() {
next prev parent reply other threads:[~2020-11-01 18:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 4:41 [PR PATCH] " yopito
2020-09-17 20:12 ` [PR PATCH] [Updated] " yopito
2020-09-17 20:12 ` yopito
2020-09-18 20:51 ` Chocimier
2020-09-19 6:06 ` yopito
2020-11-01 18:21 ` yopito [this message]
2020-11-01 18:27 ` yopito
2020-11-02 18:21 ` Chocimier
2020-11-02 18:21 ` [PR PATCH] [Merged]: " Chocimier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201101182148.iisGazB_fPKpo5Q5TtogXT1wM0_O7sKRa1h3E7bUuMs@z \
--to=yopito@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).