Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] okteta: update to 0.26.6
@ 2021-04-24 21:26 yopito
  2021-04-25  3:11 ` [PR PATCH] [Merged]: " ericonr
  0 siblings, 1 reply; 2+ messages in thread
From: yopito @ 2021-04-24 21:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]

There is a new pull request by yopito against master on the void-packages repository

https://github.com/yopito/void-packages okteta.0266
https://github.com/void-linux/void-packages/pull/30480

okteta: update to 0.26.6
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30480.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-okteta.0266-30480.patch --]
[-- Type: text/x-diff, Size: 3340 bytes --]

From 9a10663b63a40a8f7ddeb6e2f65c7557006e49c2 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
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 <pierre.bourgin@free.fr>"
 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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: okteta: update to 0.26.6
  2021-04-24 21:26 [PR PATCH] okteta: update to 0.26.6 yopito
@ 2021-04-25  3:11 ` ericonr
  0 siblings, 0 replies; 2+ messages in thread
From: ericonr @ 2021-04-25  3:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1435 bytes --]

There's a merged pull request on the void-packages repository

okteta: update to 0.26.6
https://github.com/void-linux/void-packages/pull/30480

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-04-25  3:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-24 21:26 [PR PATCH] okteta: update to 0.26.6 yopito
2021-04-25  3:11 ` [PR PATCH] [Merged]: " ericonr

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).