* Re: [PR PATCH] [Updated] okteta: update to 0.26.4
2020-09-15 4:41 [PR PATCH] okteta: update to 0.26.4 yopito
@ 2020-09-17 20:12 ` yopito
2020-09-17 20:12 ` yopito
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: yopito @ 2020-09-17 20:12 UTC (permalink / raw)
To: ml
[-- 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: 1667 bytes --]
From 13481312a33a4147fa8c9d4744b6fd0b3146ce7e Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Tue, 15 Sep 2020 06:30:17 +0200
Subject: [PATCH] okteta: update to 0.26.4
---
srcpkgs/okteta/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/okteta/template b/srcpkgs/okteta/template
index 05605a353be..d088d063824 100644
--- a/srcpkgs/okteta/template
+++ b/srcpkgs/okteta/template
@@ -1,24 +1,26 @@
# Template file for 'okteta'
pkgname=okteta
reverts="4.14.3_1"
-version=0.26.3
+version=0.26.4
revision=1
build_style=cmake
+# tests disabled, see do_check() below
+configure_args="-DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules gettext python qt5-qmake qt5-host-tools
kdoctools kconfig kcoreaddons kparts"
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
+do_check() {
+ echo "check/tests DISABLED: some are non-functional, one requires qt5 graphical env."
}
okteta-devel_package() {
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: okteta: update to 0.26.4
2020-09-15 4:41 [PR PATCH] okteta: update to 0.26.4 yopito
2020-09-17 20:12 ` [PR PATCH] [Updated] " yopito
@ 2020-09-17 20:12 ` yopito
2020-09-18 20:51 ` Chocimier
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: yopito @ 2020-09-17 20:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New comment by yopito on void-packages repository
https://github.com/void-linux/void-packages/pull/24920#issuecomment-694474260
Comment:
@Piraty : special dedicace regarding do_check() ;)
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: okteta: update to 0.26.4
2020-09-15 4:41 [PR PATCH] okteta: update to 0.26.4 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
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Chocimier @ 2020-09-18 20:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/24920#issuecomment-695080365
Comment:
If you do `export QT_QPA_PLATFORM=offscreen` in pre_check, x server is not required. Two tests will still fail because of misbehaving QFINDTESTDATA. Options are to: disable, fix or merge with failing test for now and solve QFINDTESTDATA later.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: okteta: update to 0.26.4
2020-09-15 4:41 [PR PATCH] okteta: update to 0.26.4 yopito
` (2 preceding siblings ...)
2020-09-18 20:51 ` Chocimier
@ 2020-09-19 6:06 ` yopito
2020-11-01 18:21 ` [PR PATCH] [Updated] " yopito
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: yopito @ 2020-09-19 6:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New comment by yopito on void-packages repository
https://github.com/void-linux/void-packages/pull/24920#issuecomment-695170765
Comment:
@Chocimier : thanks for pointing this. Let's digg into.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] okteta: update to 0.26.4
2020-09-15 4:41 [PR PATCH] okteta: update to 0.26.4 yopito
` (3 preceding siblings ...)
2020-09-19 6:06 ` yopito
@ 2020-11-01 18:21 ` yopito
2020-11-01 18:27 ` yopito
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: yopito @ 2020-11-01 18:21 UTC (permalink / raw)
To: ml
[-- 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() {
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: okteta: update to 0.26.4
2020-09-15 4:41 [PR PATCH] okteta: update to 0.26.4 yopito
` (4 preceding siblings ...)
2020-11-01 18:21 ` [PR PATCH] [Updated] " yopito
@ 2020-11-01 18:27 ` yopito
2020-11-02 18:21 ` Chocimier
2020-11-02 18:21 ` [PR PATCH] [Merged]: " Chocimier
7 siblings, 0 replies; 9+ messages in thread
From: yopito @ 2020-11-01 18:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
New comment by yopito on void-packages repository
https://github.com/void-linux/void-packages/pull/24920#issuecomment-720131534
Comment:
check/testing is functional now, took ages to find a way to make it working ...
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: okteta: update to 0.26.4
2020-09-15 4:41 [PR PATCH] okteta: update to 0.26.4 yopito
` (5 preceding siblings ...)
2020-11-01 18:27 ` yopito
@ 2020-11-02 18:21 ` Chocimier
2020-11-02 18:21 ` [PR PATCH] [Merged]: " Chocimier
7 siblings, 0 replies; 9+ messages in thread
From: Chocimier @ 2020-11-02 18:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 256 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/24920#issuecomment-720643833
Comment:
Thanks for solving problem with tests. I'll try to apply your solution to keditbookmarks, that have same problem.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Merged]: okteta: update to 0.26.4
2020-09-15 4:41 [PR PATCH] okteta: update to 0.26.4 yopito
` (6 preceding siblings ...)
2020-11-02 18:21 ` Chocimier
@ 2020-11-02 18:21 ` Chocimier
7 siblings, 0 replies; 9+ messages in thread
From: Chocimier @ 2020-11-02 18:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
There's a merged pull request on the void-packages repository
okteta: update to 0.26.4
https://github.com/void-linux/void-packages/pull/24920
Description:
^ permalink raw reply [flat|nested] 9+ messages in thread