* [PR PATCH] imhex: update to 1.35.3.
@ 2024-07-07 15:01 Johnnynator
2024-07-07 23:54 ` [PR REVIEW] " Calandracas606
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Johnnynator @ 2024-07-07 15:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]
There is a new pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages imhex
https://github.com/void-linux/void-packages/pull/51139
imhex: update to 1.35.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/51139.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imhex-51139.patch --]
[-- Type: text/x-diff, Size: 3332 bytes --]
From 338768effa15e7048ccfdfb04a6282c3e6984332 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Jul 2024 14:58:49 +0200
Subject: [PATCH] imhex: update to 1.35.3.
---
srcpkgs/imhex/patches/no-werreor.patch | 11 +++++++++++
srcpkgs/imhex/template | 16 +++++++++-------
2 files changed, 20 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/imhex/patches/no-werreor.patch
diff --git a/srcpkgs/imhex/patches/no-werreor.patch b/srcpkgs/imhex/patches/no-werreor.patch
new file mode 100644
index 00000000000000..35a631c11c3f01
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-werreor.patch
@@ -0,0 +1,11 @@
+--- ImHex/cmake/build_helpers.cmake 2024-06-29 21:58:36.000000000 +0200
++++ - 2024-07-07 16:33:35.648149255 +0200
+@@ -563,7 +563,7 @@
+ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+ # Define strict compilation flags
+ if (IMHEX_STRICT_WARNINGS)
+- set(IMHEX_COMMON_FLAGS "${IMHEX_COMMON_FLAGS} -Wall -Wextra -Wpedantic -Werror")
++ set(IMHEX_COMMON_FLAGS "${IMHEX_COMMON_FLAGS} -Wall -Wextra -Wpedantic")
+ endif()
+
+ if (UNIX AND NOT APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU")
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..0353c322acadaf 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,17 +1,17 @@
# Template file for 'imhex'
pkgname=imhex
-version=1.30.1
-revision=3
+version=1.35.3
+revision=1
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
-DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
-hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+hostmakedepends="pkg-config clang-tools-extra18"
+makedepends="libcurl-devel fmt-devel llvm18-devel jansson-devel yara-devel json-c++
freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ clang-tools-extra18 capstone-devel"
short_desc="Hex editor for reverse engineers and programmers"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
@@ -19,9 +19,10 @@ homepage="https://imhex.werwolv.net/"
changelog="https://github.com/WerWolv/ImHex/releases"
distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="371c36f57c82b36e44069c91448891d1f0795962604246539f9ae38f330c11af
+ 39b660b168f06fc80a990a85fca474a07fbd135530779ea16aba9c6587f4fa14"
patch_args="-Np1 -d $build_wrksrc"
+python_version=3
if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
broken="uses i128"
@@ -39,6 +40,7 @@ do_check() {
}
post_install() {
+ rm ${DESTDIR}/usr/bin/imhex-updater
vmkdir usr/share/imhex
for d in constants encodings includes magic patterns yara; do
vcopy ../ImHex-Patterns-ImHex-v${version}/$d usr/share/imhex
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR REVIEW] imhex: update to 1.35.3.
2024-07-07 15:01 [PR PATCH] imhex: update to 1.35.3 Johnnynator
@ 2024-07-07 23:54 ` Calandracas606
2024-07-07 23:55 ` Calandracas606
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Calandracas606 @ 2024-07-07 23:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New review comment by Calandracas606 on void-packages repository
https://github.com/void-linux/void-packages/pull/51139#discussion_r1667794990
Comment:
```suggestion
capstone-devel"
```
`llvm18-devel` will pull in `clang-tools-extra18`
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: imhex: update to 1.35.3.
2024-07-07 15:01 [PR PATCH] imhex: update to 1.35.3 Johnnynator
2024-07-07 23:54 ` [PR REVIEW] " Calandracas606
@ 2024-07-07 23:55 ` Calandracas606
2024-07-09 12:52 ` [PR PATCH] [Updated] " Johnnynator
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Calandracas606 @ 2024-07-07 23:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 249 bytes --]
New comment by Calandracas606 on void-packages repository
https://github.com/void-linux/void-packages/pull/51139#issuecomment-2212622717
Comment:
This PR has patches to fix cross compilation: https://github.com/void-linux/void-packages/pull/50183
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] imhex: update to 1.35.3.
2024-07-07 15:01 [PR PATCH] imhex: update to 1.35.3 Johnnynator
2024-07-07 23:54 ` [PR REVIEW] " Calandracas606
2024-07-07 23:55 ` Calandracas606
@ 2024-07-09 12:52 ` Johnnynator
2024-07-09 13:08 ` [PR PATCH] [Merged]: " Johnnynator
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Johnnynator @ 2024-07-09 12:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages imhex
https://github.com/void-linux/void-packages/pull/51139
imhex: update to 1.35.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/51139.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imhex-51139.patch --]
[-- Type: text/x-diff, Size: 3523 bytes --]
From 4fb78caf2bab8c8ec4b621e89df8b817f3463db4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Jul 2024 14:58:49 +0200
Subject: [PATCH] imhex: update to 1.35.3.
---
srcpkgs/imhex/patches/cross.patch | 15 +++++++++++++++
srcpkgs/imhex/template | 22 +++++++++++++---------
2 files changed, 28 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/imhex/patches/cross.patch
diff --git a/srcpkgs/imhex/patches/cross.patch b/srcpkgs/imhex/patches/cross.patch
new file mode 100644
index 00000000000000..8f33f7e6416a65
--- /dev/null
+++ b/srcpkgs/imhex/patches/cross.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,12 @@
+ set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
+ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
+
++# Void Linux flags for cross compiling libromfs
++set(NATIVE_CMAKE_C_COMPILER "$ENV{CC_host}")
++set(NATIVE_CMAKE_CXX_COMPILER "$ENV{CXX_host}")
++set(NATIVE_CMAKE_C_FLAGS "$ENV{CFLAGS_host}")
++set(NATIVE_CMAKE_CXX_FLAGS "$ENV{CXXFLAGS_host}")
++
+ # Setup project
+ loadVersion(IMHEX_VERSION)
+ setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..4484d56810062a 100644
--- a/srcpkgs/imhex/template
+++ b/srcpkgs/imhex/template
@@ -1,17 +1,19 @@
# Template file for 'imhex'
pkgname=imhex
-version=1.30.1
-revision=3
+version=1.35.3
+revision=1
build_wrksrc="ImHex"
build_style=cmake
build_helper=qemu
configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
- -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
- -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
-hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+ -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
+ -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON
+ -DIMHEX_ENABLE_UNIT_TESTS=ON -DIMHEX_COMPRESS_DEBUG_INFO=OFF
+ -DIMHEX_STRICT_WARNINGS=OFF -DIMHEX_ENABLE_LTO=OFF"
+hostmakedepends="pkg-config clang-tools-extra18"
+makedepends="libcurl-devel fmt-devel llvm18-devel jansson-devel yara-devel json-c++
freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ capstone-devel"
short_desc="Hex editor for reverse engineers and programmers"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
@@ -19,9 +21,10 @@ homepage="https://imhex.werwolv.net/"
changelog="https://github.com/WerWolv/ImHex/releases"
distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="371c36f57c82b36e44069c91448891d1f0795962604246539f9ae38f330c11af
+ 39b660b168f06fc80a990a85fca474a07fbd135530779ea16aba9c6587f4fa14"
patch_args="-Np1 -d $build_wrksrc"
+python_version=3
if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
broken="uses i128"
@@ -39,6 +42,7 @@ do_check() {
}
post_install() {
+ rm ${DESTDIR}/usr/bin/imhex-updater
vmkdir usr/share/imhex
for d in constants encodings includes magic patterns yara; do
vcopy ../ImHex-Patterns-ImHex-v${version}/$d usr/share/imhex
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: imhex: update to 1.35.3.
2024-07-07 15:01 [PR PATCH] imhex: update to 1.35.3 Johnnynator
` (2 preceding siblings ...)
2024-07-09 12:52 ` [PR PATCH] [Updated] " Johnnynator
@ 2024-07-09 13:08 ` Johnnynator
2024-07-10 2:20 ` Vinfall
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Johnnynator @ 2024-07-09 13:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1085 bytes --]
There's a merged pull request on the void-packages repository
imhex: update to 1.35.3.
https://github.com/void-linux/void-packages/pull/51139
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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] 8+ messages in thread
* Re: imhex: update to 1.35.3.
2024-07-07 15:01 [PR PATCH] imhex: update to 1.35.3 Johnnynator
` (3 preceding siblings ...)
2024-07-09 13:08 ` [PR PATCH] [Merged]: " Johnnynator
@ 2024-07-10 2:20 ` Vinfall
2024-07-10 17:33 ` Johnnynator
2024-07-11 1:01 ` Vinfall
6 siblings, 0 replies; 8+ messages in thread
From: Vinfall @ 2024-07-10 2:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
New comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/51139#issuecomment-2219355845
Comment:
A bit late but [1.35.4](https://github.com/WerWolv/ImHex/releases/tag/v1.35.4) is just released before this is merged.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: imhex: update to 1.35.3.
2024-07-07 15:01 [PR PATCH] imhex: update to 1.35.3 Johnnynator
` (4 preceding siblings ...)
2024-07-10 2:20 ` Vinfall
@ 2024-07-10 17:33 ` Johnnynator
2024-07-11 1:01 ` Vinfall
6 siblings, 0 replies; 8+ messages in thread
From: Johnnynator @ 2024-07-10 17:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 428 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/51139#issuecomment-2221086204
Comment:
> A bit late but [1.35.4](https://github.com/WerWolv/ImHex/releases/tag/v1.35.4) is just released before this is merged.
I'm aware, but 1.35.4 requires updated glfw. (Indirectly, it breaks with our current split `glfw` - `glfw-wayland` setup).
I pushed 1.35.3 first due to that.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: imhex: update to 1.35.3.
2024-07-07 15:01 [PR PATCH] imhex: update to 1.35.3 Johnnynator
` (5 preceding siblings ...)
2024-07-10 17:33 ` Johnnynator
@ 2024-07-11 1:01 ` Vinfall
6 siblings, 0 replies; 8+ messages in thread
From: Vinfall @ 2024-07-11 1:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/51139#issuecomment-2221790066
Comment:
Ah, that makes sense. Did not notice #51173 when posting, my bad.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-07-11 1:01 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-07 15:01 [PR PATCH] imhex: update to 1.35.3 Johnnynator
2024-07-07 23:54 ` [PR REVIEW] " Calandracas606
2024-07-07 23:55 ` Calandracas606
2024-07-09 12:52 ` [PR PATCH] [Updated] " Johnnynator
2024-07-09 13:08 ` [PR PATCH] [Merged]: " Johnnynator
2024-07-10 2:20 ` Vinfall
2024-07-10 17:33 ` Johnnynator
2024-07-11 1:01 ` Vinfall
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).