* [PR PATCH] New package: imhex-1.17.0
@ 2022-05-03 6:28 classabbyamp
2022-05-03 6:54 ` [PR PATCH] [Updated] " classabbyamp
` (31 more replies)
0 siblings, 32 replies; 33+ messages in thread
From: classabbyamp @ 2022-05-03 6:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.17.0
closes #36954
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 4758 bytes --]
From e01298aa3a504305a635486f49dcc5899f6b0146 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.17.0
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 21 +++++++++
srcpkgs/imhex/template | 63 +++++++++++++++++++++++++++
3 files changed, 85 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..42cb7ad49c0f
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,21 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+@@ -35,6 +35,3 @@
+
+ # Configure packaging
+ createPackage()
+-
+-# Download and install all current files from the ImHex-Patterns repo
+-downloadImHexPatternsFiles()
+\ No newline at end of file
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..365b44ac9efb
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,63 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+version=1.17.0
+revision=1
+_capstone_version=5.0-rc2
+_nativefiledialog_version=28ade5a5cc5d17cea8fe4034572cac8fd54eb53f
+_libromfs_version=f14e88a72759f7121cb611abb7afa6d6a126c7cf
+_patternlanguage_version=49bafd82a7501cdaf1c75a1c5c36790aefe1a9f2
+_patterns_version=4ec37dea3757d400844378a7d2c6b2f7b812a6a2
+_xdgpp_version=f01f810714443d0f10c333d4d1d9c0383be41375
+create_wrksrc=yes
+build_wrksrc="ImHex-${version}"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+homepage="https://imhex.werwolv.net/"
+changelog="https://github.com/WerWolv/ImHex/releases"
+distfiles="https://github.com/WerWolv/ImHex/archive/refs/tags/v${version}.tar.gz
+ https://github.com/capstone-engine/capstone/archive/refs/tags/${_capstone_version}.tar.gz
+ https://github.com/btzy/nativefiledialog-extended/archive/${_nativefiledialog_version}.tar.gz
+ https://github.com/WerWolv/libromfs/archive/${_libromfs_version}.tar.gz
+ https://github.com/WerWolv/PatternLanguage/archive/${_patternlanguage_version}.tar.gz
+ https://github.com/WerWolv/ImHex-Patterns/archive/${_patterns_version}.tar.gz
+ https://git.sr.ht/~danyspin97/xdgpp/blob/${_xdgpp_version}/xdg.hpp"
+checksum="08e7c6c2b43708e71ad8a2de01d8f4b200e6fb7d17fd29cc9eba76f4f82e03c0
+ 869d94813a887329bc11b4bf1f4410a7a2b7f270176439e90b158127d5a215dd
+ cf2b63e4d004bd15a44f5ce2d99e8c623addc5f316bb0a2a4a3b518a5b1b4380
+ 0531b60880ed1312197ecca20a9f893d0025b8d0456df4a2d5b2acccf940d0db
+ b0f6de8c95ad54819259e4441fc36331383c096b232e2e4213f7b53a218e0f70
+ 146ed4e56e5673ed286967bc67e509d78554976cb61dd28843b4eede670d3490
+ 2e08ce74adb71ff9b9aa9e1c999733fccd4b00967b9cf0c0e51dbf049392a9ec"
+patch_args="-Np1 --directory=$build_wrksrc"
+skip_extraction="xdg.hpp"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+post_extract() {
+ mv capstone-${_capstone_version}/* $build_wrksrc/lib/external/capstone
+ mv nativefiledialog-extended-${_nativefiledialog_version}/* \
+ $build_wrksrc/lib/external/nativefiledialog
+ mv libromfs-${_libromfs_version}/* $build_wrksrc/lib/external/libromfs
+ mv PatternLanguage-${_patternlanguage_version}/* \
+ $build_wrksrc/lib/external/pattern_language
+ mv ${XBPS_SRCDISTDIR}/${pkgname}-${version}/xdg.hpp \
+ $build_wrksrc/lib/external/xdgpp
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.17.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
@ 2022-05-03 6:54 ` classabbyamp
2022-05-03 7:06 ` classabbyamp
` (30 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-05-03 6:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.17.0
closes #36954
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 6703 bytes --]
From fabbe2dd60211610b5832d99538d0808f227b2a2 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.17.0
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 21 +++++++++
srcpkgs/imhex/patches/no-Werror.patch | 37 +++++++++++++++
srcpkgs/imhex/template | 65 +++++++++++++++++++++++++++
4 files changed, 124 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..42cb7ad49c0f
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,21 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+@@ -35,6 +35,3 @@
+
+ # Configure packaging
+ createPackage()
+-
+-# Download and install all current files from the ImHex-Patterns repo
+-downloadImHexPatternsFiles()
+\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..36b9ddd52803
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,65 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+version=1.17.0
+revision=1
+_capstone_version=5.0-rc2
+_nativefiledialog_version=28ade5a5cc5d17cea8fe4034572cac8fd54eb53f
+_libromfs_version=f14e88a72759f7121cb611abb7afa6d6a126c7cf
+_patternlanguage_version=49bafd82a7501cdaf1c75a1c5c36790aefe1a9f2
+_patterns_version=4ec37dea3757d400844378a7d2c6b2f7b812a6a2
+_xdgpp_version=f01f810714443d0f10c333d4d1d9c0383be41375
+create_wrksrc=yes
+build_wrksrc="ImHex-${version}"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+homepage="https://imhex.werwolv.net/"
+changelog="https://github.com/WerWolv/ImHex/releases"
+distfiles="https://github.com/WerWolv/ImHex/archive/refs/tags/v${version}.tar.gz
+ https://github.com/capstone-engine/capstone/archive/refs/tags/${_capstone_version}.tar.gz
+ https://github.com/btzy/nativefiledialog-extended/archive/${_nativefiledialog_version}.tar.gz
+ https://github.com/WerWolv/libromfs/archive/${_libromfs_version}.tar.gz
+ https://github.com/WerWolv/PatternLanguage/archive/${_patternlanguage_version}.tar.gz
+ https://github.com/WerWolv/ImHex-Patterns/archive/${_patterns_version}.tar.gz
+ https://git.sr.ht/~danyspin97/xdgpp/blob/${_xdgpp_version}/xdg.hpp"
+checksum="08e7c6c2b43708e71ad8a2de01d8f4b200e6fb7d17fd29cc9eba76f4f82e03c0
+ 869d94813a887329bc11b4bf1f4410a7a2b7f270176439e90b158127d5a215dd
+ cf2b63e4d004bd15a44f5ce2d99e8c623addc5f316bb0a2a4a3b518a5b1b4380
+ 0531b60880ed1312197ecca20a9f893d0025b8d0456df4a2d5b2acccf940d0db
+ b0f6de8c95ad54819259e4441fc36331383c096b232e2e4213f7b53a218e0f70
+ 146ed4e56e5673ed286967bc67e509d78554976cb61dd28843b4eede670d3490
+ 2e08ce74adb71ff9b9aa9e1c999733fccd4b00967b9cf0c0e51dbf049392a9ec"
+# does not run properly, is only unit tests
+make_check=no
+patch_args="-Np1 --directory=$build_wrksrc"
+skip_extraction="xdg.hpp"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+post_extract() {
+ mv capstone-${_capstone_version}/* $build_wrksrc/lib/external/capstone
+ mv nativefiledialog-extended-${_nativefiledialog_version}/* \
+ $build_wrksrc/lib/external/nativefiledialog
+ mv libromfs-${_libromfs_version}/* $build_wrksrc/lib/external/libromfs
+ mv PatternLanguage-${_patternlanguage_version}/* \
+ $build_wrksrc/lib/external/pattern_language
+ mv ${XBPS_SRCDISTDIR}/${pkgname}-${version}/xdg.hpp \
+ $build_wrksrc/lib/external/xdgpp
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.17.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
2022-05-03 6:54 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-05-03 7:06 ` classabbyamp
2022-05-03 7:14 ` classabbyamp
` (29 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-05-03 7:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.17.0
closes #36954
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 6850 bytes --]
From c90a2ec8665070dfbf7d5a3d7027cbcfa05a574c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.17.0
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 21 ++++++++
srcpkgs/imhex/patches/no-Werror.patch | 37 ++++++++++++++
srcpkgs/imhex/template | 72 +++++++++++++++++++++++++++
4 files changed, 131 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..42cb7ad49c0f
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,21 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+@@ -35,6 +35,3 @@
+
+ # Configure packaging
+ createPackage()
+-
+-# Download and install all current files from the ImHex-Patterns repo
+-downloadImHexPatternsFiles()
+\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..dc1fc81dad59
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,72 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+version=1.17.0
+revision=1
+_capstone_version=5.0-rc2
+_nativefiledialog_version=28ade5a5cc5d17cea8fe4034572cac8fd54eb53f
+_libromfs_version=f14e88a72759f7121cb611abb7afa6d6a126c7cf
+_patternlanguage_version=49bafd82a7501cdaf1c75a1c5c36790aefe1a9f2
+_patterns_version=4ec37dea3757d400844378a7d2c6b2f7b812a6a2
+_xdgpp_version=f01f810714443d0f10c333d4d1d9c0383be41375
+create_wrksrc=yes
+build_wrksrc="ImHex-${version}"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+homepage="https://imhex.werwolv.net/"
+changelog="https://github.com/WerWolv/ImHex/releases"
+distfiles="https://github.com/WerWolv/ImHex/archive/refs/tags/v${version}.tar.gz
+ https://github.com/capstone-engine/capstone/archive/refs/tags/${_capstone_version}.tar.gz
+ https://github.com/btzy/nativefiledialog-extended/archive/${_nativefiledialog_version}.tar.gz
+ https://github.com/WerWolv/libromfs/archive/${_libromfs_version}.tar.gz
+ https://github.com/WerWolv/PatternLanguage/archive/${_patternlanguage_version}.tar.gz
+ https://github.com/WerWolv/ImHex-Patterns/archive/${_patterns_version}.tar.gz
+ https://git.sr.ht/~danyspin97/xdgpp/blob/${_xdgpp_version}/xdg.hpp"
+checksum="08e7c6c2b43708e71ad8a2de01d8f4b200e6fb7d17fd29cc9eba76f4f82e03c0
+ 869d94813a887329bc11b4bf1f4410a7a2b7f270176439e90b158127d5a215dd
+ cf2b63e4d004bd15a44f5ce2d99e8c623addc5f316bb0a2a4a3b518a5b1b4380
+ 0531b60880ed1312197ecca20a9f893d0025b8d0456df4a2d5b2acccf940d0db
+ b0f6de8c95ad54819259e4441fc36331383c096b232e2e4213f7b53a218e0f70
+ 146ed4e56e5673ed286967bc67e509d78554976cb61dd28843b4eede670d3490
+ 2e08ce74adb71ff9b9aa9e1c999733fccd4b00967b9cf0c0e51dbf049392a9ec"
+# does not build/run properly, is only unit tests
+make_check=no
+patch_args="-Np1 --directory=$build_wrksrc"
+skip_extraction="xdg.hpp"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+post_extract() {
+ mv capstone-${_capstone_version}/* $build_wrksrc/lib/external/capstone
+ mv nativefiledialog-extended-${_nativefiledialog_version}/* \
+ $build_wrksrc/lib/external/nativefiledialog
+ mv libromfs-${_libromfs_version}/* $build_wrksrc/lib/external/libromfs
+ mv PatternLanguage-${_patternlanguage_version}/* \
+ $build_wrksrc/lib/external/pattern_language
+ mv ${XBPS_SRCDISTDIR}/${pkgname}-${version}/xdg.hpp \
+ $build_wrksrc/lib/external/xdgpp
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.17.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
2022-05-03 6:54 ` [PR PATCH] [Updated] " classabbyamp
2022-05-03 7:06 ` classabbyamp
@ 2022-05-03 7:14 ` classabbyamp
2022-05-03 12:38 ` dmarto
` (28 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-05-03 7:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1488 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.17.0
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2) and if WerWolv/ImHex#504 is addressed.
most of the arch limitations have been informed by alpine's template for this.
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 6852 bytes --]
From cc6703c2422f990bf89aff67ab78981192cefaa0 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.17.0
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 21 ++++++++
srcpkgs/imhex/patches/no-Werror.patch | 37 ++++++++++++++
srcpkgs/imhex/template | 73 +++++++++++++++++++++++++++
4 files changed, 132 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..42cb7ad49c0f
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,21 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+@@ -35,6 +35,3 @@
+
+ # Configure packaging
+ createPackage()
+-
+-# Download and install all current files from the ImHex-Patterns repo
+-downloadImHexPatternsFiles()
+\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..5d8a30432a63
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,73 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+version=1.17.0
+revision=1
+_capstone_version=5.0-rc2
+_nativefiledialog_version=28ade5a5cc5d17cea8fe4034572cac8fd54eb53f
+_libromfs_version=f14e88a72759f7121cb611abb7afa6d6a126c7cf
+_patternlanguage_version=49bafd82a7501cdaf1c75a1c5c36790aefe1a9f2
+_patterns_version=4ec37dea3757d400844378a7d2c6b2f7b812a6a2
+_xdgpp_version=f01f810714443d0f10c333d4d1d9c0383be41375
+create_wrksrc=yes
+build_wrksrc="ImHex-${version}"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+homepage="https://imhex.werwolv.net/"
+changelog="https://github.com/WerWolv/ImHex/releases"
+distfiles="https://github.com/WerWolv/ImHex/archive/refs/tags/v${version}.tar.gz
+ https://github.com/capstone-engine/capstone/archive/refs/tags/${_capstone_version}.tar.gz
+ https://github.com/btzy/nativefiledialog-extended/archive/${_nativefiledialog_version}.tar.gz
+ https://github.com/WerWolv/libromfs/archive/${_libromfs_version}.tar.gz
+ https://github.com/WerWolv/PatternLanguage/archive/${_patternlanguage_version}.tar.gz
+ https://github.com/WerWolv/ImHex-Patterns/archive/${_patterns_version}.tar.gz
+ https://git.sr.ht/~danyspin97/xdgpp/blob/${_xdgpp_version}/xdg.hpp"
+checksum="08e7c6c2b43708e71ad8a2de01d8f4b200e6fb7d17fd29cc9eba76f4f82e03c0
+ 869d94813a887329bc11b4bf1f4410a7a2b7f270176439e90b158127d5a215dd
+ cf2b63e4d004bd15a44f5ce2d99e8c623addc5f316bb0a2a4a3b518a5b1b4380
+ 0531b60880ed1312197ecca20a9f893d0025b8d0456df4a2d5b2acccf940d0db
+ b0f6de8c95ad54819259e4441fc36331383c096b232e2e4213f7b53a218e0f70
+ 146ed4e56e5673ed286967bc67e509d78554976cb61dd28843b4eede670d3490
+ 2e08ce74adb71ff9b9aa9e1c999733fccd4b00967b9cf0c0e51dbf049392a9ec"
+
+# does not build/run properly, is only unit tests
+make_check=no
+patch_args="-Np1 --directory=$build_wrksrc"
+skip_extraction="xdg.hpp"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+post_extract() {
+ mv capstone-${_capstone_version}/* $build_wrksrc/lib/external/capstone
+ mv nativefiledialog-extended-${_nativefiledialog_version}/* \
+ $build_wrksrc/lib/external/nativefiledialog
+ mv libromfs-${_libromfs_version}/* $build_wrksrc/lib/external/libromfs
+ mv PatternLanguage-${_patternlanguage_version}/* \
+ $build_wrksrc/lib/external/pattern_language
+ mv ${XBPS_SRCDISTDIR}/${pkgname}-${version}/xdg.hpp \
+ $build_wrksrc/lib/external/xdgpp
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: New package: imhex-1.17.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (2 preceding siblings ...)
2022-05-03 7:14 ` classabbyamp
@ 2022-05-03 12:38 ` dmarto
2022-05-03 17:09 ` [PR PATCH] [Updated] " classabbyamp
` (27 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: dmarto @ 2022-05-03 12:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
New comment by dmarto on void-packages repository
https://github.com/void-linux/void-packages/pull/36967#issuecomment-1116052177
Comment:
I know you need only one file, but I saw your question in IRC and wanted to mention that sourcehut actually gives out archives - https://git.sr.ht/~danyspin97/xdgpp/archive/f01f810714443d0f10c333d4d1d9c0383be41375.tar.gz (you can use any valid git ref)
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.17.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (3 preceding siblings ...)
2022-05-03 12:38 ` dmarto
@ 2022-05-03 17:09 ` classabbyamp
2022-05-03 17:09 ` classabbyamp
` (26 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-05-03 17:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.17.0
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2) and if WerWolv/ImHex#504 is addressed.
most of the arch limitations have been informed by [alpine's template](https://git.alpinelinux.org/aports/tree/testing/imhex/APKBUILD)
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 6837 bytes --]
From f86f665e8eeecc454e54cbca3dfe310a64048bf6 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.17.0
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 21 ++++++++
srcpkgs/imhex/patches/no-Werror.patch | 37 ++++++++++++++
srcpkgs/imhex/template | 73 +++++++++++++++++++++++++++
4 files changed, 132 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..42cb7ad49c0f
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,21 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+@@ -35,6 +35,3 @@
+
+ # Configure packaging
+ createPackage()
+-
+-# Download and install all current files from the ImHex-Patterns repo
+-downloadImHexPatternsFiles()
+\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..dfdb6f54b8b9
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,73 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+version=1.17.0
+revision=1
+_capstone_version=5.0-rc2
+_nativefiledialog_version=28ade5a5cc5d17cea8fe4034572cac8fd54eb53f
+_libromfs_version=f14e88a72759f7121cb611abb7afa6d6a126c7cf
+_patternlanguage_version=49bafd82a7501cdaf1c75a1c5c36790aefe1a9f2
+_patterns_version=4ec37dea3757d400844378a7d2c6b2f7b812a6a2
+_xdgpp_version=f01f810714443d0f10c333d4d1d9c0383be41375
+create_wrksrc=yes
+build_wrksrc="ImHex-${version}"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+homepage="https://imhex.werwolv.net/"
+changelog="https://github.com/WerWolv/ImHex/releases"
+distfiles="https://github.com/WerWolv/ImHex/archive/refs/tags/v${version}.tar.gz
+ https://github.com/capstone-engine/capstone/archive/refs/tags/${_capstone_version}.tar.gz
+ https://github.com/btzy/nativefiledialog-extended/archive/${_nativefiledialog_version}.tar.gz
+ https://github.com/WerWolv/libromfs/archive/${_libromfs_version}.tar.gz
+ https://github.com/WerWolv/PatternLanguage/archive/${_patternlanguage_version}.tar.gz
+ https://github.com/WerWolv/ImHex-Patterns/archive/${_patterns_version}.tar.gz
+ https://git.sr.ht/~danyspin97/xdgpp/archive/${_xdgpp_version}.tar.gz"
+checksum="08e7c6c2b43708e71ad8a2de01d8f4b200e6fb7d17fd29cc9eba76f4f82e03c0
+ 869d94813a887329bc11b4bf1f4410a7a2b7f270176439e90b158127d5a215dd
+ cf2b63e4d004bd15a44f5ce2d99e8c623addc5f316bb0a2a4a3b518a5b1b4380
+ 0531b60880ed1312197ecca20a9f893d0025b8d0456df4a2d5b2acccf940d0db
+ b0f6de8c95ad54819259e4441fc36331383c096b232e2e4213f7b53a218e0f70
+ 146ed4e56e5673ed286967bc67e509d78554976cb61dd28843b4eede670d3490
+ 45a20965180fee5d09fde386ba63d6782de949d3ea4854076d9cc1aca3553dd1"
+
+# does not build/run properly, is only unit tests
+make_check=no
+patch_args="-Np1 --directory=$build_wrksrc"
+skip_extraction="xdg.hpp"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+post_extract() {
+ mv capstone-${_capstone_version}/* $build_wrksrc/lib/external/capstone
+ mv nativefiledialog-extended-${_nativefiledialog_version}/* \
+ $build_wrksrc/lib/external/nativefiledialog
+ mv libromfs-${_libromfs_version}/* $build_wrksrc/lib/external/libromfs
+ mv PatternLanguage-${_patternlanguage_version}/* \
+ $build_wrksrc/lib/external/pattern_language
+ mv xdgpp-${_xdgpp_version}/xdg.hpp \
+ $build_wrksrc/lib/external/xdgpp
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: New package: imhex-1.17.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (4 preceding siblings ...)
2022-05-03 17:09 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-05-03 17:09 ` classabbyamp
2022-05-07 20:58 ` [PR PATCH] [Updated] " classabbyamp
` (25 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-05-03 17:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 199 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/36967#issuecomment-1116342000
Comment:
ah, would be nice if they exposed that in the UI....
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.17.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (5 preceding siblings ...)
2022-05-03 17:09 ` classabbyamp
@ 2022-05-07 20:58 ` classabbyamp
2022-05-17 17:07 ` classabbyamp
` (24 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-05-07 20:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.17.0
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2) and if WerWolv/ImHex#504 is addressed.
most of the arch limitations have been informed by [alpine's template](https://git.alpinelinux.org/aports/tree/testing/imhex/APKBUILD)
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 6837 bytes --]
From 41a43c3d8f9fd3fd7312e5afe5ade5b85739e5bf Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.17.0
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 21 ++++++++
srcpkgs/imhex/patches/no-Werror.patch | 37 ++++++++++++++
srcpkgs/imhex/template | 73 +++++++++++++++++++++++++++
4 files changed, 132 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..42cb7ad49c0f
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,21 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+@@ -35,6 +35,3 @@
+
+ # Configure packaging
+ createPackage()
+-
+-# Download and install all current files from the ImHex-Patterns repo
+-downloadImHexPatternsFiles()
+\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..dfdb6f54b8b9
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,73 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+version=1.17.0
+revision=1
+_capstone_version=5.0-rc2
+_nativefiledialog_version=28ade5a5cc5d17cea8fe4034572cac8fd54eb53f
+_libromfs_version=f14e88a72759f7121cb611abb7afa6d6a126c7cf
+_patternlanguage_version=49bafd82a7501cdaf1c75a1c5c36790aefe1a9f2
+_patterns_version=4ec37dea3757d400844378a7d2c6b2f7b812a6a2
+_xdgpp_version=f01f810714443d0f10c333d4d1d9c0383be41375
+create_wrksrc=yes
+build_wrksrc="ImHex-${version}"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+homepage="https://imhex.werwolv.net/"
+changelog="https://github.com/WerWolv/ImHex/releases"
+distfiles="https://github.com/WerWolv/ImHex/archive/refs/tags/v${version}.tar.gz
+ https://github.com/capstone-engine/capstone/archive/refs/tags/${_capstone_version}.tar.gz
+ https://github.com/btzy/nativefiledialog-extended/archive/${_nativefiledialog_version}.tar.gz
+ https://github.com/WerWolv/libromfs/archive/${_libromfs_version}.tar.gz
+ https://github.com/WerWolv/PatternLanguage/archive/${_patternlanguage_version}.tar.gz
+ https://github.com/WerWolv/ImHex-Patterns/archive/${_patterns_version}.tar.gz
+ https://git.sr.ht/~danyspin97/xdgpp/archive/${_xdgpp_version}.tar.gz"
+checksum="08e7c6c2b43708e71ad8a2de01d8f4b200e6fb7d17fd29cc9eba76f4f82e03c0
+ 869d94813a887329bc11b4bf1f4410a7a2b7f270176439e90b158127d5a215dd
+ cf2b63e4d004bd15a44f5ce2d99e8c623addc5f316bb0a2a4a3b518a5b1b4380
+ 0531b60880ed1312197ecca20a9f893d0025b8d0456df4a2d5b2acccf940d0db
+ b0f6de8c95ad54819259e4441fc36331383c096b232e2e4213f7b53a218e0f70
+ 146ed4e56e5673ed286967bc67e509d78554976cb61dd28843b4eede670d3490
+ 45a20965180fee5d09fde386ba63d6782de949d3ea4854076d9cc1aca3553dd1"
+
+# does not build/run properly, is only unit tests
+make_check=no
+patch_args="-Np1 --directory=$build_wrksrc"
+skip_extraction="xdg.hpp"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+post_extract() {
+ mv capstone-${_capstone_version}/* $build_wrksrc/lib/external/capstone
+ mv nativefiledialog-extended-${_nativefiledialog_version}/* \
+ $build_wrksrc/lib/external/nativefiledialog
+ mv libromfs-${_libromfs_version}/* $build_wrksrc/lib/external/libromfs
+ mv PatternLanguage-${_patternlanguage_version}/* \
+ $build_wrksrc/lib/external/pattern_language
+ mv xdgpp-${_xdgpp_version}/xdg.hpp \
+ $build_wrksrc/lib/external/xdgpp
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.17.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (6 preceding siblings ...)
2022-05-07 20:58 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-05-17 17:07 ` classabbyamp
2022-05-28 6:56 ` classabbyamp
` (23 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-05-17 17:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.17.0
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2) and if WerWolv/ImHex#504 is addressed.
most of the arch limitations have been informed by [alpine's template](https://git.alpinelinux.org/aports/tree/testing/imhex/APKBUILD)
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 6837 bytes --]
From 9fce4f17d4c6327160886870965d6b0041b99f3c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.17.0
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 21 ++++++++
srcpkgs/imhex/patches/no-Werror.patch | 37 ++++++++++++++
srcpkgs/imhex/template | 73 +++++++++++++++++++++++++++
4 files changed, 132 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..42cb7ad49c0f
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,21 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+@@ -35,6 +35,3 @@
+
+ # Configure packaging
+ createPackage()
+-
+-# Download and install all current files from the ImHex-Patterns repo
+-downloadImHexPatternsFiles()
+\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..dfdb6f54b8b9
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,73 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+version=1.17.0
+revision=1
+_capstone_version=5.0-rc2
+_nativefiledialog_version=28ade5a5cc5d17cea8fe4034572cac8fd54eb53f
+_libromfs_version=f14e88a72759f7121cb611abb7afa6d6a126c7cf
+_patternlanguage_version=49bafd82a7501cdaf1c75a1c5c36790aefe1a9f2
+_patterns_version=4ec37dea3757d400844378a7d2c6b2f7b812a6a2
+_xdgpp_version=f01f810714443d0f10c333d4d1d9c0383be41375
+create_wrksrc=yes
+build_wrksrc="ImHex-${version}"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+homepage="https://imhex.werwolv.net/"
+changelog="https://github.com/WerWolv/ImHex/releases"
+distfiles="https://github.com/WerWolv/ImHex/archive/refs/tags/v${version}.tar.gz
+ https://github.com/capstone-engine/capstone/archive/refs/tags/${_capstone_version}.tar.gz
+ https://github.com/btzy/nativefiledialog-extended/archive/${_nativefiledialog_version}.tar.gz
+ https://github.com/WerWolv/libromfs/archive/${_libromfs_version}.tar.gz
+ https://github.com/WerWolv/PatternLanguage/archive/${_patternlanguage_version}.tar.gz
+ https://github.com/WerWolv/ImHex-Patterns/archive/${_patterns_version}.tar.gz
+ https://git.sr.ht/~danyspin97/xdgpp/archive/${_xdgpp_version}.tar.gz"
+checksum="08e7c6c2b43708e71ad8a2de01d8f4b200e6fb7d17fd29cc9eba76f4f82e03c0
+ 869d94813a887329bc11b4bf1f4410a7a2b7f270176439e90b158127d5a215dd
+ cf2b63e4d004bd15a44f5ce2d99e8c623addc5f316bb0a2a4a3b518a5b1b4380
+ 0531b60880ed1312197ecca20a9f893d0025b8d0456df4a2d5b2acccf940d0db
+ b0f6de8c95ad54819259e4441fc36331383c096b232e2e4213f7b53a218e0f70
+ 146ed4e56e5673ed286967bc67e509d78554976cb61dd28843b4eede670d3490
+ 45a20965180fee5d09fde386ba63d6782de949d3ea4854076d9cc1aca3553dd1"
+
+# does not build/run properly, is only unit tests
+make_check=no
+patch_args="-Np1 --directory=$build_wrksrc"
+skip_extraction="xdg.hpp"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+post_extract() {
+ mv capstone-${_capstone_version}/* $build_wrksrc/lib/external/capstone
+ mv nativefiledialog-extended-${_nativefiledialog_version}/* \
+ $build_wrksrc/lib/external/nativefiledialog
+ mv libromfs-${_libromfs_version}/* $build_wrksrc/lib/external/libromfs
+ mv PatternLanguage-${_patternlanguage_version}/* \
+ $build_wrksrc/lib/external/pattern_language
+ mv xdgpp-${_xdgpp_version}/xdg.hpp \
+ $build_wrksrc/lib/external/xdgpp
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.17.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (7 preceding siblings ...)
2022-05-17 17:07 ` classabbyamp
@ 2022-05-28 6:56 ` classabbyamp
2022-05-28 19:43 ` classabbyamp
` (22 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-05-28 6:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.17.0
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2) and if WerWolv/ImHex#504 is addressed.
most of the arch limitations have been informed by [alpine's template](https://git.alpinelinux.org/aports/tree/testing/imhex/APKBUILD)
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 6837 bytes --]
From 73882ba9e89fc5f2d0b02234f8864e9fea995611 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.17.0
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 21 ++++++++
srcpkgs/imhex/patches/no-Werror.patch | 37 ++++++++++++++
srcpkgs/imhex/template | 73 +++++++++++++++++++++++++++
4 files changed, 132 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..42cb7ad49c0f
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,21 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+@@ -35,6 +35,3 @@
+
+ # Configure packaging
+ createPackage()
+-
+-# Download and install all current files from the ImHex-Patterns repo
+-downloadImHexPatternsFiles()
+\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..dfdb6f54b8b9
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,73 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+version=1.17.0
+revision=1
+_capstone_version=5.0-rc2
+_nativefiledialog_version=28ade5a5cc5d17cea8fe4034572cac8fd54eb53f
+_libromfs_version=f14e88a72759f7121cb611abb7afa6d6a126c7cf
+_patternlanguage_version=49bafd82a7501cdaf1c75a1c5c36790aefe1a9f2
+_patterns_version=4ec37dea3757d400844378a7d2c6b2f7b812a6a2
+_xdgpp_version=f01f810714443d0f10c333d4d1d9c0383be41375
+create_wrksrc=yes
+build_wrksrc="ImHex-${version}"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+homepage="https://imhex.werwolv.net/"
+changelog="https://github.com/WerWolv/ImHex/releases"
+distfiles="https://github.com/WerWolv/ImHex/archive/refs/tags/v${version}.tar.gz
+ https://github.com/capstone-engine/capstone/archive/refs/tags/${_capstone_version}.tar.gz
+ https://github.com/btzy/nativefiledialog-extended/archive/${_nativefiledialog_version}.tar.gz
+ https://github.com/WerWolv/libromfs/archive/${_libromfs_version}.tar.gz
+ https://github.com/WerWolv/PatternLanguage/archive/${_patternlanguage_version}.tar.gz
+ https://github.com/WerWolv/ImHex-Patterns/archive/${_patterns_version}.tar.gz
+ https://git.sr.ht/~danyspin97/xdgpp/archive/${_xdgpp_version}.tar.gz"
+checksum="08e7c6c2b43708e71ad8a2de01d8f4b200e6fb7d17fd29cc9eba76f4f82e03c0
+ 869d94813a887329bc11b4bf1f4410a7a2b7f270176439e90b158127d5a215dd
+ cf2b63e4d004bd15a44f5ce2d99e8c623addc5f316bb0a2a4a3b518a5b1b4380
+ 0531b60880ed1312197ecca20a9f893d0025b8d0456df4a2d5b2acccf940d0db
+ b0f6de8c95ad54819259e4441fc36331383c096b232e2e4213f7b53a218e0f70
+ 146ed4e56e5673ed286967bc67e509d78554976cb61dd28843b4eede670d3490
+ 45a20965180fee5d09fde386ba63d6782de949d3ea4854076d9cc1aca3553dd1"
+
+# does not build/run properly, is only unit tests
+make_check=no
+patch_args="-Np1 --directory=$build_wrksrc"
+skip_extraction="xdg.hpp"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+post_extract() {
+ mv capstone-${_capstone_version}/* $build_wrksrc/lib/external/capstone
+ mv nativefiledialog-extended-${_nativefiledialog_version}/* \
+ $build_wrksrc/lib/external/nativefiledialog
+ mv libromfs-${_libromfs_version}/* $build_wrksrc/lib/external/libromfs
+ mv PatternLanguage-${_patternlanguage_version}/* \
+ $build_wrksrc/lib/external/pattern_language
+ mv xdgpp-${_xdgpp_version}/xdg.hpp \
+ $build_wrksrc/lib/external/xdgpp
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.17.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (8 preceding siblings ...)
2022-05-28 6:56 ` classabbyamp
@ 2022-05-28 19:43 ` classabbyamp
2022-05-28 19:52 ` classabbyamp
` (21 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-05-28 19:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.17.0
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2) and if WerWolv/ImHex#504 is addressed.
most of the arch limitations have been informed by [alpine's template](https://git.alpinelinux.org/aports/tree/testing/imhex/APKBUILD)
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 6837 bytes --]
From a8eed5a93ab807523177bc58ef899ed1a94c3b64 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.18.1
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 21 ++++++++
srcpkgs/imhex/patches/no-Werror.patch | 37 ++++++++++++++
srcpkgs/imhex/template | 73 +++++++++++++++++++++++++++
4 files changed, 132 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..42cb7ad49c0f
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,21 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+@@ -35,6 +35,3 @@
+
+ # Configure packaging
+ createPackage()
+-
+-# Download and install all current files from the ImHex-Patterns repo
+-downloadImHexPatternsFiles()
+\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..344bc6b92b13
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,73 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+version=1.18.1
+revision=1
+_capstone_version=5.0-rc2
+_nativefiledialog_version=28ade5a5cc5d17cea8fe4034572cac8fd54eb53f
+_libromfs_version=f14e88a72759f7121cb611abb7afa6d6a126c7cf
+_patternlanguage_version=23ec4e4ef18d55b7201363b3b3ce8ab8635599b8
+_patterns_version=68edebbe4f13434fa480a1a9bc44c0bc7735407a
+_xdgpp_version=f01f810714443d0f10c333d4d1d9c0383be41375
+create_wrksrc=yes
+build_wrksrc="ImHex-${version}"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+homepage="https://imhex.werwolv.net/"
+changelog="https://github.com/WerWolv/ImHex/releases"
+distfiles="https://github.com/WerWolv/ImHex/archive/refs/tags/v${version}.tar.gz
+ https://github.com/capstone-engine/capstone/archive/refs/tags/${_capstone_version}.tar.gz
+ https://github.com/btzy/nativefiledialog-extended/archive/${_nativefiledialog_version}.tar.gz
+ https://github.com/WerWolv/libromfs/archive/${_libromfs_version}.tar.gz
+ https://github.com/WerWolv/PatternLanguage/archive/${_patternlanguage_version}.tar.gz
+ https://github.com/WerWolv/ImHex-Patterns/archive/${_patterns_version}.tar.gz
+ https://git.sr.ht/~danyspin97/xdgpp/archive/${_xdgpp_version}.tar.gz"
+checksum="08e7c6c2b43708e71ad8a2de01d8f4b200e6fb7d17fd29cc9eba76f4f82e03c0
+ 869d94813a887329bc11b4bf1f4410a7a2b7f270176439e90b158127d5a215dd
+ cf2b63e4d004bd15a44f5ce2d99e8c623addc5f316bb0a2a4a3b518a5b1b4380
+ 0531b60880ed1312197ecca20a9f893d0025b8d0456df4a2d5b2acccf940d0db
+ b0f6de8c95ad54819259e4441fc36331383c096b232e2e4213f7b53a218e0f70
+ 146ed4e56e5673ed286967bc67e509d78554976cb61dd28843b4eede670d3490
+ 45a20965180fee5d09fde386ba63d6782de949d3ea4854076d9cc1aca3553dd1"
+
+# does not build/run properly, is only unit tests
+make_check=no
+patch_args="-Np1 --directory=$build_wrksrc"
+skip_extraction="xdg.hpp"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+post_extract() {
+ mv capstone-${_capstone_version}/* $build_wrksrc/lib/external/capstone
+ mv nativefiledialog-extended-${_nativefiledialog_version}/* \
+ $build_wrksrc/lib/external/nativefiledialog
+ mv libromfs-${_libromfs_version}/* $build_wrksrc/lib/external/libromfs
+ mv PatternLanguage-${_patternlanguage_version}/* \
+ $build_wrksrc/lib/external/pattern_language
+ mv xdgpp-${_xdgpp_version}/xdg.hpp \
+ $build_wrksrc/lib/external/xdgpp
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.17.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (9 preceding siblings ...)
2022-05-28 19:43 ` classabbyamp
@ 2022-05-28 19:52 ` classabbyamp
2022-05-28 20:11 ` classabbyamp
` (20 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-05-28 19:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.17.0
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2) and if WerWolv/ImHex#504 is addressed.
most of the arch limitations have been informed by [alpine's template](https://git.alpinelinux.org/aports/tree/testing/imhex/APKBUILD)
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 6837 bytes --]
From 6052209d9fa15ba33aff0fc42dbdc4d6ef6a2317 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.18.1
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 21 ++++++++
srcpkgs/imhex/patches/no-Werror.patch | 37 ++++++++++++++
srcpkgs/imhex/template | 73 +++++++++++++++++++++++++++
4 files changed, 132 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..42cb7ad49c0f
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,21 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+@@ -35,6 +35,3 @@
+
+ # Configure packaging
+ createPackage()
+-
+-# Download and install all current files from the ImHex-Patterns repo
+-downloadImHexPatternsFiles()
+\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..1782e799b446
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,73 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+version=1.18.1
+revision=1
+_capstone_version=5.0-rc2
+_nativefiledialog_version=28ade5a5cc5d17cea8fe4034572cac8fd54eb53f
+_libromfs_version=f14e88a72759f7121cb611abb7afa6d6a126c7cf
+_patternlanguage_version=23ec4e4ef18d55b7201363b3b3ce8ab8635599b8
+_patterns_version=68edebbe4f13434fa480a1a9bc44c0bc7735407a
+_xdgpp_version=f01f810714443d0f10c333d4d1d9c0383be41375
+create_wrksrc=yes
+build_wrksrc="ImHex-${version}"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+homepage="https://imhex.werwolv.net/"
+changelog="https://github.com/WerWolv/ImHex/releases"
+distfiles="https://github.com/WerWolv/ImHex/archive/refs/tags/v${version}.tar.gz
+ https://github.com/capstone-engine/capstone/archive/refs/tags/${_capstone_version}.tar.gz
+ https://github.com/btzy/nativefiledialog-extended/archive/${_nativefiledialog_version}.tar.gz
+ https://github.com/WerWolv/libromfs/archive/${_libromfs_version}.tar.gz
+ https://github.com/WerWolv/PatternLanguage/archive/${_patternlanguage_version}.tar.gz
+ https://github.com/WerWolv/ImHex-Patterns/archive/${_patterns_version}.tar.gz
+ https://git.sr.ht/~danyspin97/xdgpp/archive/${_xdgpp_version}.tar.gz"
+checksum="55159316af07042d494570d0f6f8fcfdc9bbc0d3ebd35fe7d202d0f90d116b1e
+ 869d94813a887329bc11b4bf1f4410a7a2b7f270176439e90b158127d5a215dd
+ cf2b63e4d004bd15a44f5ce2d99e8c623addc5f316bb0a2a4a3b518a5b1b4380
+ 0531b60880ed1312197ecca20a9f893d0025b8d0456df4a2d5b2acccf940d0db
+ ba1c6a24e65bc8b3c3229e4ef6cf756998711389b0073602c12ce0ca0a4a19ee
+ 283545bcf4380b25d52e8a78da23f924256acad93dd5e99f38940cbb59facd8b
+ 45a20965180fee5d09fde386ba63d6782de949d3ea4854076d9cc1aca3553dd1"
+
+# does not build/run properly, is only unit tests
+make_check=no
+patch_args="-Np1 --directory=$build_wrksrc"
+skip_extraction="xdg.hpp"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+post_extract() {
+ mv capstone-${_capstone_version}/* $build_wrksrc/lib/external/capstone
+ mv nativefiledialog-extended-${_nativefiledialog_version}/* \
+ $build_wrksrc/lib/external/nativefiledialog
+ mv libromfs-${_libromfs_version}/* $build_wrksrc/lib/external/libromfs
+ mv PatternLanguage-${_patternlanguage_version}/* \
+ $build_wrksrc/lib/external/pattern_language
+ mv xdgpp-${_xdgpp_version}/xdg.hpp \
+ $build_wrksrc/lib/external/xdgpp
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.17.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (10 preceding siblings ...)
2022-05-28 19:52 ` classabbyamp
@ 2022-05-28 20:11 ` classabbyamp
2022-06-04 15:31 ` [PR PATCH] [Updated] New package: imhex-1.18.1 classabbyamp
` (19 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-05-28 20:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.17.0
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2) and if WerWolv/ImHex#504 is addressed.
most of the arch limitations have been informed by [alpine's template](https://git.alpinelinux.org/aports/tree/testing/imhex/APKBUILD)
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 6808 bytes --]
From 51aa79ab0d2f83276d0500a14d2f81bb6b272390 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.18.1
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 20 ++++++++
srcpkgs/imhex/patches/no-Werror.patch | 37 ++++++++++++++
srcpkgs/imhex/template | 73 +++++++++++++++++++++++++++
4 files changed, 131 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..cfc209e8dcca
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,20 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+@@ -36,6 +36,3 @@
+
+ # Configure packaging
+ createPackage()
+-
+-# Download and install all current files from the ImHex-Patterns repo
+-downloadImHexPatternsFiles()
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..1782e799b446
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,73 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+version=1.18.1
+revision=1
+_capstone_version=5.0-rc2
+_nativefiledialog_version=28ade5a5cc5d17cea8fe4034572cac8fd54eb53f
+_libromfs_version=f14e88a72759f7121cb611abb7afa6d6a126c7cf
+_patternlanguage_version=23ec4e4ef18d55b7201363b3b3ce8ab8635599b8
+_patterns_version=68edebbe4f13434fa480a1a9bc44c0bc7735407a
+_xdgpp_version=f01f810714443d0f10c333d4d1d9c0383be41375
+create_wrksrc=yes
+build_wrksrc="ImHex-${version}"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+homepage="https://imhex.werwolv.net/"
+changelog="https://github.com/WerWolv/ImHex/releases"
+distfiles="https://github.com/WerWolv/ImHex/archive/refs/tags/v${version}.tar.gz
+ https://github.com/capstone-engine/capstone/archive/refs/tags/${_capstone_version}.tar.gz
+ https://github.com/btzy/nativefiledialog-extended/archive/${_nativefiledialog_version}.tar.gz
+ https://github.com/WerWolv/libromfs/archive/${_libromfs_version}.tar.gz
+ https://github.com/WerWolv/PatternLanguage/archive/${_patternlanguage_version}.tar.gz
+ https://github.com/WerWolv/ImHex-Patterns/archive/${_patterns_version}.tar.gz
+ https://git.sr.ht/~danyspin97/xdgpp/archive/${_xdgpp_version}.tar.gz"
+checksum="55159316af07042d494570d0f6f8fcfdc9bbc0d3ebd35fe7d202d0f90d116b1e
+ 869d94813a887329bc11b4bf1f4410a7a2b7f270176439e90b158127d5a215dd
+ cf2b63e4d004bd15a44f5ce2d99e8c623addc5f316bb0a2a4a3b518a5b1b4380
+ 0531b60880ed1312197ecca20a9f893d0025b8d0456df4a2d5b2acccf940d0db
+ ba1c6a24e65bc8b3c3229e4ef6cf756998711389b0073602c12ce0ca0a4a19ee
+ 283545bcf4380b25d52e8a78da23f924256acad93dd5e99f38940cbb59facd8b
+ 45a20965180fee5d09fde386ba63d6782de949d3ea4854076d9cc1aca3553dd1"
+
+# does not build/run properly, is only unit tests
+make_check=no
+patch_args="-Np1 --directory=$build_wrksrc"
+skip_extraction="xdg.hpp"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+post_extract() {
+ mv capstone-${_capstone_version}/* $build_wrksrc/lib/external/capstone
+ mv nativefiledialog-extended-${_nativefiledialog_version}/* \
+ $build_wrksrc/lib/external/nativefiledialog
+ mv libromfs-${_libromfs_version}/* $build_wrksrc/lib/external/libromfs
+ mv PatternLanguage-${_patternlanguage_version}/* \
+ $build_wrksrc/lib/external/pattern_language
+ mv xdgpp-${_xdgpp_version}/xdg.hpp \
+ $build_wrksrc/lib/external/xdgpp
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.18.1
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (11 preceding siblings ...)
2022-05-28 20:11 ` classabbyamp
@ 2022-06-04 15:31 ` classabbyamp
2022-06-04 19:48 ` classabbyamp
` (18 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-06-04 15:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.18.1
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2) and if WerWolv/ImHex#504 is addressed.
most of the arch limitations have been informed by [alpine's template](https://git.alpinelinux.org/aports/tree/testing/imhex/APKBUILD)
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 6808 bytes --]
From 88822dc51053eefbefd1ce5deb13f68cfe18793b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.18.1
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 20 ++++++++
srcpkgs/imhex/patches/no-Werror.patch | 37 ++++++++++++++
srcpkgs/imhex/template | 73 +++++++++++++++++++++++++++
4 files changed, 131 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..cfc209e8dcca
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,20 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+@@ -36,6 +36,3 @@
+
+ # Configure packaging
+ createPackage()
+-
+-# Download and install all current files from the ImHex-Patterns repo
+-downloadImHexPatternsFiles()
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..8a5878387fa5
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,73 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+version=1.18.2
+revision=1
+_capstone_version=5.0-rc2
+_nativefiledialog_version=28ade5a5cc5d17cea8fe4034572cac8fd54eb53f
+_libromfs_version=f14e88a72759f7121cb611abb7afa6d6a126c7cf
+_patternlanguage_version=23ec4e4ef18d55b7201363b3b3ce8ab8635599b8
+_patterns_version=68edebbe4f13434fa480a1a9bc44c0bc7735407a
+_xdgpp_version=f01f810714443d0f10c333d4d1d9c0383be41375
+create_wrksrc=yes
+build_wrksrc="ImHex-${version}"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+homepage="https://imhex.werwolv.net/"
+changelog="https://github.com/WerWolv/ImHex/releases"
+distfiles="https://github.com/WerWolv/ImHex/archive/refs/tags/v${version}.tar.gz
+ https://github.com/capstone-engine/capstone/archive/refs/tags/${_capstone_version}.tar.gz
+ https://github.com/btzy/nativefiledialog-extended/archive/${_nativefiledialog_version}.tar.gz
+ https://github.com/WerWolv/libromfs/archive/${_libromfs_version}.tar.gz
+ https://github.com/WerWolv/PatternLanguage/archive/${_patternlanguage_version}.tar.gz
+ https://github.com/WerWolv/ImHex-Patterns/archive/${_patterns_version}.tar.gz
+ https://git.sr.ht/~danyspin97/xdgpp/archive/${_xdgpp_version}.tar.gz"
+checksum="ed62731cc3725146c51f8ea45517d600a93df1616d75722f754a9bc7d4b62ee3
+ 869d94813a887329bc11b4bf1f4410a7a2b7f270176439e90b158127d5a215dd
+ cf2b63e4d004bd15a44f5ce2d99e8c623addc5f316bb0a2a4a3b518a5b1b4380
+ 0531b60880ed1312197ecca20a9f893d0025b8d0456df4a2d5b2acccf940d0db
+ ba1c6a24e65bc8b3c3229e4ef6cf756998711389b0073602c12ce0ca0a4a19ee
+ 283545bcf4380b25d52e8a78da23f924256acad93dd5e99f38940cbb59facd8b
+ 45a20965180fee5d09fde386ba63d6782de949d3ea4854076d9cc1aca3553dd1"
+
+# does not build/run properly, is only unit tests
+make_check=no
+patch_args="-Np1 --directory=$build_wrksrc"
+skip_extraction="xdg.hpp"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+post_extract() {
+ mv capstone-${_capstone_version}/* $build_wrksrc/lib/external/capstone
+ mv nativefiledialog-extended-${_nativefiledialog_version}/* \
+ $build_wrksrc/lib/external/nativefiledialog
+ mv libromfs-${_libromfs_version}/* $build_wrksrc/lib/external/libromfs
+ mv PatternLanguage-${_patternlanguage_version}/* \
+ $build_wrksrc/lib/external/pattern_language
+ mv xdgpp-${_xdgpp_version}/xdg.hpp \
+ $build_wrksrc/lib/external/xdgpp
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.18.1
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (12 preceding siblings ...)
2022-06-04 15:31 ` [PR PATCH] [Updated] New package: imhex-1.18.1 classabbyamp
@ 2022-06-04 19:48 ` classabbyamp
2022-06-23 22:35 ` New package: imhex-1.18.2 iTrooz
` (17 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-06-04 19:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.18.1
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2) and if WerWolv/ImHex#504 is addressed.
most of the arch limitations have been informed by [alpine's template](https://git.alpinelinux.org/aports/tree/testing/imhex/APKBUILD)
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 6808 bytes --]
From 5114a1b97c978615df78e9d566422c0d13bf655e Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.18.1
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 20 ++++++++
srcpkgs/imhex/patches/no-Werror.patch | 37 ++++++++++++++
srcpkgs/imhex/template | 73 +++++++++++++++++++++++++++
4 files changed, 131 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..cfc209e8dcca
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,20 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+@@ -36,6 +36,3 @@
+
+ # Configure packaging
+ createPackage()
+-
+-# Download and install all current files from the ImHex-Patterns repo
+-downloadImHexPatternsFiles()
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..8a5878387fa5
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,73 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+version=1.18.2
+revision=1
+_capstone_version=5.0-rc2
+_nativefiledialog_version=28ade5a5cc5d17cea8fe4034572cac8fd54eb53f
+_libromfs_version=f14e88a72759f7121cb611abb7afa6d6a126c7cf
+_patternlanguage_version=23ec4e4ef18d55b7201363b3b3ce8ab8635599b8
+_patterns_version=68edebbe4f13434fa480a1a9bc44c0bc7735407a
+_xdgpp_version=f01f810714443d0f10c333d4d1d9c0383be41375
+create_wrksrc=yes
+build_wrksrc="ImHex-${version}"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+homepage="https://imhex.werwolv.net/"
+changelog="https://github.com/WerWolv/ImHex/releases"
+distfiles="https://github.com/WerWolv/ImHex/archive/refs/tags/v${version}.tar.gz
+ https://github.com/capstone-engine/capstone/archive/refs/tags/${_capstone_version}.tar.gz
+ https://github.com/btzy/nativefiledialog-extended/archive/${_nativefiledialog_version}.tar.gz
+ https://github.com/WerWolv/libromfs/archive/${_libromfs_version}.tar.gz
+ https://github.com/WerWolv/PatternLanguage/archive/${_patternlanguage_version}.tar.gz
+ https://github.com/WerWolv/ImHex-Patterns/archive/${_patterns_version}.tar.gz
+ https://git.sr.ht/~danyspin97/xdgpp/archive/${_xdgpp_version}.tar.gz"
+checksum="ed62731cc3725146c51f8ea45517d600a93df1616d75722f754a9bc7d4b62ee3
+ 869d94813a887329bc11b4bf1f4410a7a2b7f270176439e90b158127d5a215dd
+ cf2b63e4d004bd15a44f5ce2d99e8c623addc5f316bb0a2a4a3b518a5b1b4380
+ 0531b60880ed1312197ecca20a9f893d0025b8d0456df4a2d5b2acccf940d0db
+ ba1c6a24e65bc8b3c3229e4ef6cf756998711389b0073602c12ce0ca0a4a19ee
+ 283545bcf4380b25d52e8a78da23f924256acad93dd5e99f38940cbb59facd8b
+ 45a20965180fee5d09fde386ba63d6782de949d3ea4854076d9cc1aca3553dd1"
+
+# does not build/run properly, is only unit tests
+make_check=no
+patch_args="-Np1 --directory=$build_wrksrc"
+skip_extraction="xdg.hpp"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+post_extract() {
+ mv capstone-${_capstone_version}/* $build_wrksrc/lib/external/capstone
+ mv nativefiledialog-extended-${_nativefiledialog_version}/* \
+ $build_wrksrc/lib/external/nativefiledialog
+ mv libromfs-${_libromfs_version}/* $build_wrksrc/lib/external/libromfs
+ mv PatternLanguage-${_patternlanguage_version}/* \
+ $build_wrksrc/lib/external/pattern_language
+ mv xdgpp-${_xdgpp_version}/xdg.hpp \
+ $build_wrksrc/lib/external/xdgpp
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: New package: imhex-1.18.2
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (13 preceding siblings ...)
2022-06-04 19:48 ` classabbyamp
@ 2022-06-23 22:35 ` iTrooz
2022-06-23 22:58 ` classabbyamp
` (16 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: iTrooz @ 2022-06-23 22:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 306 bytes --]
New comment by iTrooz on void-packages repository
https://github.com/void-linux/void-packages/pull/36967#issuecomment-1164978908
Comment:
Hey, we updated Imhex to include a tarball with all sources. Currently, it would look like that : https://github.com/iTrooz/ImHex/releases
Is that okay with you ?
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: New package: imhex-1.18.2
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (14 preceding siblings ...)
2022-06-23 22:35 ` New package: imhex-1.18.2 iTrooz
@ 2022-06-23 22:58 ` classabbyamp
2022-07-05 15:00 ` [PR PATCH] [Updated] " classabbyamp
` (15 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-06-23 22:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/36967#issuecomment-1164991301
Comment:
works for me :)
I can update the template when the next release happens
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.18.2
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (15 preceding siblings ...)
2022-06-23 22:58 ` classabbyamp
@ 2022-07-05 15:00 ` classabbyamp
2022-07-07 15:58 ` classabbyamp
` (14 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-07-05 15:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.18.2
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2) and if WerWolv/ImHex#504 is addressed.
most of the arch limitations have been informed by [alpine's template](https://git.alpinelinux.org/aports/tree/testing/imhex/APKBUILD)
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 5677 bytes --]
From 181e6695d4356d2336d3787efc7ca946d8c007b0 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.19.0
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 23 ++++++++++++++
srcpkgs/imhex/patches/no-Werror.patch | 37 +++++++++++++++++++++
srcpkgs/imhex/template | 46 +++++++++++++++++++++++++++
4 files changed, 107 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..818e3b14c75c
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,23 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+--- a/cmake/build_helpers.cmake
++++ b/cmake/build_helpers.cmake
+@@ -225,7 +225,6 @@
+ install(FILES ${CMAKE_SOURCE_DIR}/dist/imhex.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+ install(FILES ${CMAKE_SOURCE_DIR}/resources/icon.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME imhex.png)
+ install(FILES "$<TARGET_FILE:libimhex>" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+- downloadImHexPatternsFiles("./share/imhex")
+ endif()
+
+ if (CREATE_BUNDLE)
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..1db53f098c37
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,46 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+version=1.19.0
+revision=1
+_patterns_version=48dd8f68ca04f56a6111b4c0e936648f271638de
+create_wrksrc=yes
+build_wrksrc="ImHex"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+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/${_patterns_version}.tar.gz"
+checksum="079ef97ef17d7f4c99a0b957cac1c36870b1c349e737f0f1f9400ad49582c092
+ d456f564247c012ec8bd6c8ec06d5714ece824380f806276fd30a1b0e310ac0e"
+
+# does not build/run properly, is only unit tests
+make_check=no
+patch_args="-Np1 -d $build_wrksrc"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.18.2
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (16 preceding siblings ...)
2022-07-05 15:00 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-07-07 15:58 ` classabbyamp
2022-07-18 5:20 ` [PR PATCH] [Updated] New package: imhex-1.19.1 classabbyamp
` (13 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-07-07 15:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.18.2
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2) and if WerWolv/ImHex#504 is addressed.
most of the arch limitations have been informed by [alpine's template](https://git.alpinelinux.org/aports/tree/testing/imhex/APKBUILD)
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 5677 bytes --]
From d943f5a09bb89efb8b75d79abc5988ffea48b2d3 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.19.1
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 23 ++++++++++++++
srcpkgs/imhex/patches/no-Werror.patch | 37 +++++++++++++++++++++
srcpkgs/imhex/template | 46 +++++++++++++++++++++++++++
4 files changed, 107 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..818e3b14c75c
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,23 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+--- a/cmake/build_helpers.cmake
++++ b/cmake/build_helpers.cmake
+@@ -225,7 +225,6 @@
+ install(FILES ${CMAKE_SOURCE_DIR}/dist/imhex.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+ install(FILES ${CMAKE_SOURCE_DIR}/resources/icon.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME imhex.png)
+ install(FILES "$<TARGET_FILE:libimhex>" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+- downloadImHexPatternsFiles("./share/imhex")
+ endif()
+
+ if (CREATE_BUNDLE)
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..f7c0a3a9c1eb
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,46 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+version=1.19.1
+revision=1
+_patterns_version=48dd8f68ca04f56a6111b4c0e936648f271638de
+create_wrksrc=yes
+build_wrksrc="ImHex"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+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/${_patterns_version}.tar.gz"
+checksum="b6f1195986402bae72c3776fb092ebfe6adf4365939e1744b29d29e49039042e
+ d456f564247c012ec8bd6c8ec06d5714ece824380f806276fd30a1b0e310ac0e"
+
+# does not build/run properly, is only unit tests
+make_check=no
+patch_args="-Np1 -d $build_wrksrc"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.19.1
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (17 preceding siblings ...)
2022-07-07 15:58 ` classabbyamp
@ 2022-07-18 5:20 ` classabbyamp
2022-08-03 15:52 ` classabbyamp
` (12 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-07-18 5:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.19.1
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2) and if WerWolv/ImHex#504 is addressed.
most of the arch limitations have been informed by [alpine's template](https://git.alpinelinux.org/aports/tree/testing/imhex/APKBUILD)
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 5677 bytes --]
From d2b898b60f92ade3abd4669f10d2289a3641c728 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.19.1
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 23 ++++++++++++++
srcpkgs/imhex/patches/no-Werror.patch | 37 +++++++++++++++++++++
srcpkgs/imhex/template | 46 +++++++++++++++++++++++++++
4 files changed, 107 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..818e3b14c75c
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,23 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+--- a/cmake/build_helpers.cmake
++++ b/cmake/build_helpers.cmake
+@@ -225,7 +225,6 @@
+ install(FILES ${CMAKE_SOURCE_DIR}/dist/imhex.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+ install(FILES ${CMAKE_SOURCE_DIR}/resources/icon.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME imhex.png)
+ install(FILES "$<TARGET_FILE:libimhex>" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+- downloadImHexPatternsFiles("./share/imhex")
+ endif()
+
+ if (CREATE_BUNDLE)
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..f7c0a3a9c1eb
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,46 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+version=1.19.1
+revision=1
+_patterns_version=48dd8f68ca04f56a6111b4c0e936648f271638de
+create_wrksrc=yes
+build_wrksrc="ImHex"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+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/${_patterns_version}.tar.gz"
+checksum="b6f1195986402bae72c3776fb092ebfe6adf4365939e1744b29d29e49039042e
+ d456f564247c012ec8bd6c8ec06d5714ece824380f806276fd30a1b0e310ac0e"
+
+# does not build/run properly, is only unit tests
+make_check=no
+patch_args="-Np1 -d $build_wrksrc"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.19.1
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (18 preceding siblings ...)
2022-07-18 5:20 ` [PR PATCH] [Updated] New package: imhex-1.19.1 classabbyamp
@ 2022-08-03 15:52 ` classabbyamp
2022-08-03 15:52 ` classabbyamp
` (11 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-08-03 15:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 942 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.19.1
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2).
most of the arch limitations have been informed by [alpine's template](https://git.alpinelinux.org/aports/tree/testing/imhex/APKBUILD)
v1.19.2 and further will not be packagable until GCC is updated, as upstream has decided to move to C++23.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 5763 bytes --]
From 42fb06f91b633a395191c0492335f4f44fda61d2 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.19.1
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 23 +++++++++++++
srcpkgs/imhex/patches/no-Werror.patch | 37 +++++++++++++++++++++
srcpkgs/imhex/template | 47 +++++++++++++++++++++++++++
4 files changed, 108 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..818e3b14c75c
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,23 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+--- a/cmake/build_helpers.cmake
++++ b/cmake/build_helpers.cmake
+@@ -225,7 +225,6 @@
+ install(FILES ${CMAKE_SOURCE_DIR}/dist/imhex.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+ install(FILES ${CMAKE_SOURCE_DIR}/resources/icon.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME imhex.png)
+ install(FILES "$<TARGET_FILE:libimhex>" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+- downloadImHexPatternsFiles("./share/imhex")
+ endif()
+
+ if (CREATE_BUNDLE)
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..43262e72d76d
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,47 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+# cannot update further until gcc is updated
+version=1.19.1
+revision=1
+_patterns_version=48dd8f68ca04f56a6111b4c0e936648f271638de
+create_wrksrc=yes
+build_wrksrc="ImHex"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel json-c++
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+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/${_patterns_version}.tar.gz"
+checksum="b6f1195986402bae72c3776fb092ebfe6adf4365939e1744b29d29e49039042e
+ d456f564247c012ec8bd6c8ec06d5714ece824380f806276fd30a1b0e310ac0e"
+
+# does not build/run properly, is only unit tests
+# make_check=no
+patch_args="-Np1 -d $build_wrksrc"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.19.1
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (19 preceding siblings ...)
2022-08-03 15:52 ` classabbyamp
@ 2022-08-03 15:52 ` classabbyamp
2022-08-03 16:14 ` classabbyamp
` (10 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-08-03 15:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 942 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.19.1
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2).
most of the arch limitations have been informed by [alpine's template](https://git.alpinelinux.org/aports/tree/testing/imhex/APKBUILD)
v1.19.2 and further will not be packagable until GCC is updated, as upstream has decided to move to C++23.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 5761 bytes --]
From ed35669ab6cbb97a1620f34c73e9fefffe1e7e42 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.19.1
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/fix-cmake.patch | 23 +++++++++++++
srcpkgs/imhex/patches/no-Werror.patch | 37 +++++++++++++++++++++
srcpkgs/imhex/template | 47 +++++++++++++++++++++++++++
4 files changed, 108 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/fix-cmake.patch
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/fix-cmake.patch b/srcpkgs/imhex/patches/fix-cmake.patch
new file mode 100644
index 000000000000..818e3b14c75c
--- /dev/null
+++ b/srcpkgs/imhex/patches/fix-cmake.patch
@@ -0,0 +1,23 @@
+upstream tries to detect a clone without submodules, but poorly
+it also tries to pull in a repo at compile-time using git
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@
+
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+-detectBadClone()
+
+ # List plugin names here. Project name must match folder name
+ set(PLUGINS
+--- a/cmake/build_helpers.cmake
++++ b/cmake/build_helpers.cmake
+@@ -225,7 +225,6 @@
+ install(FILES ${CMAKE_SOURCE_DIR}/dist/imhex.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+ install(FILES ${CMAKE_SOURCE_DIR}/resources/icon.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME imhex.png)
+ install(FILES "$<TARGET_FILE:libimhex>" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+- downloadImHexPatternsFiles("./share/imhex")
+ endif()
+
+ if (CREATE_BUNDLE)
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..c2299b0e9246
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,47 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+# cannot update further until gcc is updated
+version=1.19.1
+revision=1
+_patterns_version=48dd8f68ca04f56a6111b4c0e936648f271638de
+create_wrksrc=yes
+build_wrksrc="ImHex"
+build_style=cmake
+configure_args="-DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel json-c++
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+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/${_patterns_version}.tar.gz"
+checksum="b6f1195986402bae72c3776fb092ebfe6adf4365939e1744b29d29e49039042e
+ d456f564247c012ec8bd6c8ec06d5714ece824380f806276fd30a1b0e310ac0e"
+
+# does not build/run properly, is only unit tests
+make_check=no
+patch_args="-Np1 -d $build_wrksrc"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.19.1
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (20 preceding siblings ...)
2022-08-03 15:52 ` classabbyamp
@ 2022-08-03 16:14 ` classabbyamp
2022-08-03 16:32 ` classabbyamp
` (9 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-08-03 16:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 942 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.19.1
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2).
most of the arch limitations have been informed by [alpine's template](https://git.alpinelinux.org/aports/tree/testing/imhex/APKBUILD)
v1.19.2 and further will not be packagable until GCC is updated, as upstream has decided to move to C++23.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 7052 bytes --]
From f98b1eecf7ebc910a5708991492a2530e4482bcf Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.19.1
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/no-Werror.patch | 37 +++++++++++++++
srcpkgs/imhex/patches/offline-build.patch | 58 +++++++++++++++++++++++
srcpkgs/imhex/template | 47 ++++++++++++++++++
4 files changed, 143 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/patches/offline-build.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/patches/offline-build.patch b/srcpkgs/imhex/patches/offline-build.patch
new file mode 100644
index 000000000000..4aa26ac5678c
--- /dev/null
+++ b/srcpkgs/imhex/patches/offline-build.patch
@@ -0,0 +1,58 @@
+From a57fa34f82d8c2c3305dc862b6b27e0d4f8394f8 Mon Sep 17 00:00:00 2001
+From: WerWolv <werwolv98@gmail.com>
+Date: Fri, 8 Jul 2022 14:17:22 +0200
+Subject: [PATCH] build: Added option for Offline builds
+
+---
+ CMakeLists.txt | 2 ++
+ cmake/build_helpers.cmake | 22 ++++++++++++----------
+ 2 files changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cfddb10612e..1cabaa6d4ab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,6 +10,8 @@ set(IMHEX_BASE_FOLDER ${CMAKE_CURRENT_SOURCE_DIR})
+ set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
+ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
+
++option(IMHEX_OFFLINE_BUILD "Enable offline build" OFF)
++
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+ detectBadClone()
+diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
+index e50b026c9b4..366aba89163 100644
+--- a/cmake/build_helpers.cmake
++++ b/cmake/build_helpers.cmake
+@@ -290,17 +290,19 @@ endmacro()
+
+
+ function(downloadImHexPatternsFiles dest)
+- FetchContent_Declare(
+- imhex_patterns
+- GIT_REPOSITORY https://github.com/WerWolv/ImHex-Patterns.git
+- GIT_TAG master
+- )
++ if (NOT IMHEX_OFFLINE_BUILD)
++ FetchContent_Declare(
++ imhex_patterns
++ GIT_REPOSITORY https://github.com/WerWolv/ImHex-Patterns.git
++ GIT_TAG master
++ )
+
+- FetchContent_Populate(imhex_patterns)
++ FetchContent_Populate(imhex_patterns)
+
+- set(PATTERNS_FOLDERS_TO_INSTALL constants encodings includes patterns magic)
+- foreach (FOLDER ${PATTERNS_FOLDERS_TO_INSTALL})
+- install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION ${dest})
+- endforeach()
++ set(PATTERNS_FOLDERS_TO_INSTALL constants encodings includes patterns magic)
++ foreach (FOLDER ${PATTERNS_FOLDERS_TO_INSTALL})
++ install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION ${dest})
++ endforeach ()
++ endif ()
+
+ endfunction()
+\ No newline at end of file
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..3af01f22cac3
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,47 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+# cannot update further until gcc is updated
+version=1.19.1
+revision=1
+_patterns_version=48dd8f68ca04f56a6111b4c0e936648f271638de
+create_wrksrc=yes
+build_wrksrc="ImHex"
+build_style=cmake
+configure_args="-DIMHEX_OFFLINE_BUILD=ON -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON
+ -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel json-c++
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+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/${_patterns_version}.tar.gz"
+checksum="b6f1195986402bae72c3776fb092ebfe6adf4365939e1744b29d29e49039042e
+ d456f564247c012ec8bd6c8ec06d5714ece824380f806276fd30a1b0e310ac0e"
+
+# does not build/run properly, is only unit tests
+make_check=no
+patch_args="-Np1 -d $build_wrksrc"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.19.1
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (21 preceding siblings ...)
2022-08-03 16:14 ` classabbyamp
@ 2022-08-03 16:32 ` classabbyamp
2022-08-03 16:59 ` classabbyamp
` (8 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-08-03 16:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 942 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.19.1
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2).
most of the arch limitations have been informed by [alpine's template](https://git.alpinelinux.org/aports/tree/testing/imhex/APKBUILD)
v1.19.2 and further will not be packagable until GCC is updated, as upstream has decided to move to C++23.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 7049 bytes --]
From 60567738987dfac69992d6cd0ce2181012bf1c21 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.19.1
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/no-Werror.patch | 37 +++++++++++++++
srcpkgs/imhex/patches/offline-build.patch | 58 +++++++++++++++++++++++
srcpkgs/imhex/template | 50 +++++++++++++++++++
4 files changed, 146 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/patches/offline-build.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/patches/offline-build.patch b/srcpkgs/imhex/patches/offline-build.patch
new file mode 100644
index 000000000000..4aa26ac5678c
--- /dev/null
+++ b/srcpkgs/imhex/patches/offline-build.patch
@@ -0,0 +1,58 @@
+From a57fa34f82d8c2c3305dc862b6b27e0d4f8394f8 Mon Sep 17 00:00:00 2001
+From: WerWolv <werwolv98@gmail.com>
+Date: Fri, 8 Jul 2022 14:17:22 +0200
+Subject: [PATCH] build: Added option for Offline builds
+
+---
+ CMakeLists.txt | 2 ++
+ cmake/build_helpers.cmake | 22 ++++++++++++----------
+ 2 files changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cfddb10612e..1cabaa6d4ab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,6 +10,8 @@ set(IMHEX_BASE_FOLDER ${CMAKE_CURRENT_SOURCE_DIR})
+ set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
+ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
+
++option(IMHEX_OFFLINE_BUILD "Enable offline build" OFF)
++
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+ detectBadClone()
+diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
+index e50b026c9b4..366aba89163 100644
+--- a/cmake/build_helpers.cmake
++++ b/cmake/build_helpers.cmake
+@@ -290,17 +290,19 @@ endmacro()
+
+
+ function(downloadImHexPatternsFiles dest)
+- FetchContent_Declare(
+- imhex_patterns
+- GIT_REPOSITORY https://github.com/WerWolv/ImHex-Patterns.git
+- GIT_TAG master
+- )
++ if (NOT IMHEX_OFFLINE_BUILD)
++ FetchContent_Declare(
++ imhex_patterns
++ GIT_REPOSITORY https://github.com/WerWolv/ImHex-Patterns.git
++ GIT_TAG master
++ )
+
+- FetchContent_Populate(imhex_patterns)
++ FetchContent_Populate(imhex_patterns)
+
+- set(PATTERNS_FOLDERS_TO_INSTALL constants encodings includes patterns magic)
+- foreach (FOLDER ${PATTERNS_FOLDERS_TO_INSTALL})
+- install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION ${dest})
+- endforeach()
++ set(PATTERNS_FOLDERS_TO_INSTALL constants encodings includes patterns magic)
++ foreach (FOLDER ${PATTERNS_FOLDERS_TO_INSTALL})
++ install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION ${dest})
++ endforeach ()
++ endif ()
+
+ endfunction()
+\ No newline at end of file
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..1faa5fa7fdbc
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,50 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+# cannot update further until gcc is updated
+version=1.19.1
+revision=1
+_patterns_version=48dd8f68ca04f56a6111b4c0e936648f271638de
+create_wrksrc=yes
+build_wrksrc="ImHex"
+build_style=cmake
+configure_args="-DIMHEX_OFFLINE_BUILD=ON -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON
+ -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel json-c++
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+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/${_patterns_version}.tar.gz"
+checksum="b6f1195986402bae72c3776fb092ebfe6adf4365939e1744b29d29e49039042e
+ d456f564247c012ec8bd6c8ec06d5714ece824380f806276fd30a1b0e310ac0e"
+
+patch_args="-Np1 -d $build_wrksrc"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+pre_check() {
+ cd build
+ ninja ${MAKEJOBS} unit_tests
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.19.1
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (22 preceding siblings ...)
2022-08-03 16:32 ` classabbyamp
@ 2022-08-03 16:59 ` classabbyamp
2022-11-02 2:13 ` github-actions
` (7 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-08-03 16:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 942 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.19.1
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2).
most of the arch limitations have been informed by [alpine's template](https://git.alpinelinux.org/aports/tree/testing/imhex/APKBUILD)
v1.19.2 and further will not be packagable until GCC is updated, as upstream has decided to move to C++23.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 7132 bytes --]
From 486c38fd7ce819ad6ab3796698cb4f7a8f0ff087 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.19.1
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/no-Werror.patch | 37 +++++++++++++++
srcpkgs/imhex/patches/offline-build.patch | 58 +++++++++++++++++++++++
srcpkgs/imhex/template | 52 ++++++++++++++++++++
4 files changed, 148 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/no-Werror.patch
create mode 100644 srcpkgs/imhex/patches/offline-build.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/no-Werror.patch b/srcpkgs/imhex/patches/no-Werror.patch
new file mode 100644
index 000000000000..0dcc3eded0da
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-Werror.patch
@@ -0,0 +1,37 @@
+--- a/lib/libimhex/CMakeLists.txt
++++ b/lib/libimhex/CMakeLists.txt
+@@ -149,7 +149,7 @@
+
+ add_library(libimhex SHARED ${LIBIMHEX_SOURCES})
+ set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(libimhex PRIVATE -Wall -Wextra -Werror)
++target_compile_options(libimhex PRIVATE -Wall -Wextra)
+
+ target_include_directories(libimhex PUBLIC include ${XDGPP_INCLUDE_DIRS} ${MBEDTLS_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${MAGIC_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} ${FMT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${YARA_INCLUDE_DIRS})
+ target_link_directories(libimhex PUBLIC ${MBEDTLS_LIBRARY_DIR} ${CAPSTONE_LIBRARY_DIRS} ${MAGIC_LIBRARY_DIRS})
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ )
+
+ target_include_directories(main PUBLIC include)
+-target_compile_options(main PRIVATE -Wall -Wextra -Werror)
++target_compile_options(main PRIVATE -Wall -Wextra)
+
+ set_target_properties(main PROPERTIES
+ OUTPUT_NAME "imhex"
+@@ -33,4 +33,4 @@
+
+ if (APPLE)
+ add_compile_definitions(GL_SILENCE_DEPRECATION)
+-endif ()
+\ No newline at end of file
++endif ()
+--- a/plugins/builtin/CMakeLists.txt
++++ b/plugins/builtin/CMakeLists.txt
+@@ -75,4 +75,4 @@
+
+ add_compile_definitions(IMHEX_PROJECT_NAME="${PROJECT_NAME}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+-target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
++target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra)
diff --git a/srcpkgs/imhex/patches/offline-build.patch b/srcpkgs/imhex/patches/offline-build.patch
new file mode 100644
index 000000000000..4aa26ac5678c
--- /dev/null
+++ b/srcpkgs/imhex/patches/offline-build.patch
@@ -0,0 +1,58 @@
+From a57fa34f82d8c2c3305dc862b6b27e0d4f8394f8 Mon Sep 17 00:00:00 2001
+From: WerWolv <werwolv98@gmail.com>
+Date: Fri, 8 Jul 2022 14:17:22 +0200
+Subject: [PATCH] build: Added option for Offline builds
+
+---
+ CMakeLists.txt | 2 ++
+ cmake/build_helpers.cmake | 22 ++++++++++++----------
+ 2 files changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cfddb10612e..1cabaa6d4ab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,6 +10,8 @@ set(IMHEX_BASE_FOLDER ${CMAKE_CURRENT_SOURCE_DIR})
+ set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
+ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
+
++option(IMHEX_OFFLINE_BUILD "Enable offline build" OFF)
++
+ # Make sure project is configured correctly
+ setDefaultBuiltTypeIfUnset()
+ detectBadClone()
+diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
+index e50b026c9b4..366aba89163 100644
+--- a/cmake/build_helpers.cmake
++++ b/cmake/build_helpers.cmake
+@@ -290,17 +290,19 @@ endmacro()
+
+
+ function(downloadImHexPatternsFiles dest)
+- FetchContent_Declare(
+- imhex_patterns
+- GIT_REPOSITORY https://github.com/WerWolv/ImHex-Patterns.git
+- GIT_TAG master
+- )
++ if (NOT IMHEX_OFFLINE_BUILD)
++ FetchContent_Declare(
++ imhex_patterns
++ GIT_REPOSITORY https://github.com/WerWolv/ImHex-Patterns.git
++ GIT_TAG master
++ )
+
+- FetchContent_Populate(imhex_patterns)
++ FetchContent_Populate(imhex_patterns)
+
+- set(PATTERNS_FOLDERS_TO_INSTALL constants encodings includes patterns magic)
+- foreach (FOLDER ${PATTERNS_FOLDERS_TO_INSTALL})
+- install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION ${dest})
+- endforeach()
++ set(PATTERNS_FOLDERS_TO_INSTALL constants encodings includes patterns magic)
++ foreach (FOLDER ${PATTERNS_FOLDERS_TO_INSTALL})
++ install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION ${dest})
++ endforeach ()
++ endif ()
+
+ endfunction()
+\ No newline at end of file
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..3cdcbc8e05d5
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,52 @@
+# Template file for 'imhex'
+# TODO: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+pkgname=imhex
+# cannot update further until gcc is updated
+version=1.19.1
+revision=1
+_patterns_version=48dd8f68ca04f56a6111b4c0e936648f271638de
+create_wrksrc=yes
+build_wrksrc="ImHex"
+build_style=cmake
+configure_args="-DIMHEX_OFFLINE_BUILD=ON -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON
+ -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel json-c++
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+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/${_patterns_version}.tar.gz"
+checksum="b6f1195986402bae72c3776fb092ebfe6adf4365939e1744b29d29e49039042e
+ d456f564247c012ec8bd6c8ec06d5714ece824380f806276fd30a1b0e310ac0e"
+
+patch_args="-Np1 -d $build_wrksrc"
+ignore_elf_files="/usr/share/imhex/plugins/builtin.hexplug"
+
+# cmake can't deal with clang-tools-extra stuff (sancov)
+nocross=yes
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+do_check() {
+ cd build
+ ninja ${makejobs} unit_tests
+ # StoreAPI, TipsAPI, ContentAPI tests are flaky
+ ctest ${makejobs} -E '^.*API$'
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmkdir usr/share/imhex
+ for d in constants includes magic patterns tips; do
+ vcopy $wrksrc/ImHex-Patterns-${_patterns_version}/$d usr/share/imhex
+ done
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: New package: imhex-1.19.1
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (23 preceding siblings ...)
2022-08-03 16:59 ` classabbyamp
@ 2022-11-02 2:13 ` github-actions
2022-12-19 1:36 ` [PR PATCH] [Updated] New package: imhex-1.25.0 classabbyamp
` (6 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: github-actions @ 2022-11-02 2:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/36967#issuecomment-1299465464
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.25.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (24 preceding siblings ...)
2022-11-02 2:13 ` github-actions
@ 2022-12-19 1:36 ` classabbyamp
2022-12-19 6:28 ` classabbyamp
` (5 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-12-19 1:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 692 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.25.0
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2).
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 3430 bytes --]
From 2731cafbf0511c495559c6bca06e89b47606dd0b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.25.0
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/musl.patch | 11 +++++++
srcpkgs/imhex/template | 53 ++++++++++++++++++++++++++++++++
3 files changed, 65 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/musl.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/musl.patch b/srcpkgs/imhex/patches/musl.patch
new file mode 100644
index 000000000000..845cabbbe64a
--- /dev/null
+++ b/srcpkgs/imhex/patches/musl.patch
@@ -0,0 +1,11 @@
+--- a/ImHex/plugins/builtin/include/content/providers/file_provider.hpp
++++ b/ImHex/plugins/builtin/include/content/providers/file_provider.hpp
+@@ -12,7 +12,7 @@
+ #else
+ #include <sys/mman.h>
+ #include <unistd.h>
+- #include <sys/fcntl.h>
++ #include <fcntl.h>
+ #endif
+
+ namespace hex::plugin::builtin {
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..29155de36532
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,53 @@
+# Template file for 'imhex'
+pkgname=imhex
+version=1.25.0
+revision=1
+create_wrksrc=yes
+build_wrksrc="ImHex"
+build_style=cmake
+build_helper=qemu
+# XXX: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
+ -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON"
+hostmakedepends="pkg-config clang-tools-extra qemu-user-static"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel json-c++
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
+ clang-tools-extra"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+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="59817990bb1ab2377143480d4a26171ea631bcecdbc6682b2f79bed2a30e7eed
+ aff9b14a67bea48a06365b1d702af3b6c9cee9161912dd4daadd3f34ae8ee204"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+nocross="/bin/sh: line 1: /builddir/imhex-1.25.0/ImHex/build/lib/libimhex/external/libromfs/generator/generator-imhex: cannot execute binary file: Exec format error"
+
+do_check() {
+ cd build
+ ninja ${makejobs} unit_tests
+ # StoreAPI, TipsAPI, ContentAPI tests are flaky
+ ctest ${makejobs} -E '^.*API$'
+}
+
+post_install() {
+ vmkdir usr/share/imhex
+ for d in constants encodings includes magic patterns yara; do
+ vcopy ../ImHex-Patterns-ImHex-v${version}/$d usr/share/imhex
+ done
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmove usr/share/imhex
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.25.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (25 preceding siblings ...)
2022-12-19 1:36 ` [PR PATCH] [Updated] New package: imhex-1.25.0 classabbyamp
@ 2022-12-19 6:28 ` classabbyamp
2022-12-19 7:33 ` classabbyamp
` (4 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-12-19 6:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 692 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.25.0
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2).
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 8932 bytes --]
From 30b5d5542eeb3f415354e6a8a59e48c66a753f4b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.25.0
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/musl.patch | 29 +++++++
srcpkgs/imhex/patches/no-update-check.patch | 90 +++++++++++++++++++++
srcpkgs/imhex/template | 53 ++++++++++++
4 files changed, 173 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/musl.patch
create mode 100644 srcpkgs/imhex/patches/no-update-check.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/musl.patch b/srcpkgs/imhex/patches/musl.patch
new file mode 100644
index 000000000000..b8e2ba476367
--- /dev/null
+++ b/srcpkgs/imhex/patches/musl.patch
@@ -0,0 +1,29 @@
+From a966cab1551e0e15e4261c55349b27f84d29cecc Mon Sep 17 00:00:00 2001
+From: WerWolv <werwolv98@gmail.com>
+Date: Mon, 19 Dec 2022 07:15:18 +0100
+Subject: [PATCH] build: Use correct fcntl.h include on Linux
+
+---
+ plugins/builtin/include/content/providers/file_provider.hpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/ImHex/plugins/builtin/include/content/providers/file_provider.hpp b/ImHex/plugins/builtin/include/content/providers/file_provider.hpp
+index 61da65cc8db2..ce8ee7084e0c 100644
+--- a/ImHex/plugins/builtin/include/content/providers/file_provider.hpp
++++ b/ImHex/plugins/builtin/include/content/providers/file_provider.hpp
+@@ -9,10 +9,14 @@
+ #if defined(OS_WINDOWS)
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
++#elif defined(OS_MACOS)
++ #include <sys/mman.h>
++ #include <unistd.h>
++ #include <sys/fcntl.h>
+ #else
+ #include <sys/mman.h>
+ #include <unistd.h>
+- #include <sys/fcntl.h>
++ #include <fcntl.h>
+ #endif
+
+ namespace hex::plugin::builtin {
diff --git a/srcpkgs/imhex/patches/no-update-check.patch b/srcpkgs/imhex/patches/no-update-check.patch
new file mode 100644
index 000000000000..c600bceac07e
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-update-check.patch
@@ -0,0 +1,90 @@
+running the internal update checker is pointless when updates are managed by xbps
+
+--- a/ImHex/plugins/builtin/source/content/welcome_screen.cpp
++++ b/ImHex/plugins/builtin/source/content/welcome_screen.cpp
+@@ -517,20 +517,6 @@
+ loadDefaultLayout();
+ });
+
+- EventManager::subscribe<EventWindowInitialized>([] {
+- // documentation of the value above the setting definition
+- int showCheckForUpdates = ContentRegistry::Settings::read("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 2);
+- if (showCheckForUpdates == 2) {
+- ContentRegistry::Settings::write("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 0);
+- View::showYesNoQuestionPopup("hex.builtin.welcome.check_for_updates_text"_lang,
+- [] { // yes
+- ContentRegistry::Settings::write("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 1);
+- ImGui::CloseCurrentPopup();
+- }, [] { // no
+- ImGui::CloseCurrentPopup();
+- });
+- }
+- });
+
+ ContentRegistry::Interface::addMenuItem("hex.builtin.menu.file", 1075, [&] {
+ if (ImGui::BeginMenu("hex.builtin.menu.file.open_recent"_lang, !s_recentProvidersUpdating && !s_recentProviders.empty())) {
+--- a/ImHex/plugins/builtin/source/content/settings_entries.cpp
++++ b/ImHex/plugins/builtin/source/content/settings_entries.cpp
+@@ -35,21 +35,6 @@
+
+ /* General */
+
+- /* Values of this setting :
+- 0 - do not check for updates on startup
+- 1 - check for updates on startup
+- 2 - default value - ask the user if he wants to check for updates. This value should only be encountered on the first startup.
+- */
+- ContentRegistry::Settings::add("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 2, [](auto name, nlohmann::json &setting) {
+- static bool enabled = static_cast<int>(setting) == 1;
+-
+- if (ImGui::Checkbox(name.data(), &enabled)) {
+- setting = static_cast<int>(enabled);
+- return true;
+- }
+-
+- return false;
+- });
+
+ ContentRegistry::Settings::add("hex.builtin.setting.general", "hex.builtin.setting.general.show_tips", 1, [](auto name, nlohmann::json &setting) {
+ static bool enabled = static_cast<int>(setting);
+--- a/ImHex/main/source/init/tasks.cpp
++++ b/ImHex/main/source/init/tasks.cpp
+@@ -24,30 +24,6 @@
+
+ using namespace std::literals::string_literals;
+
+- static bool checkForUpdates() {
+- // documentation of the value above the setting definition
+- int showCheckForUpdates = ContentRegistry::Settings::read("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 2);
+- if (showCheckForUpdates == 1){
+- hex::Net net;
+-
+- auto releases = net.getJson(GitHubApiURL + "/releases/latest"s, 2000).get();
+- if (releases.code != 200)
+- return false;
+-
+- if (!releases.body.contains("tag_name") || !releases.body["tag_name"].is_string())
+- return false;
+-
+- auto versionString = std::string(IMHEX_VERSION);
+- size_t versionLength = std::min(versionString.find_first_of('-'), versionString.length());
+- auto currVersion = "v" + versionString.substr(0, versionLength);
+- auto latestVersion = releases.body["tag_name"].get<std::string_view>();
+-
+- if (latestVersion != currVersion)
+- ImHexApi::System::impl::addInitArgument("update-available", latestVersion.data());
+-
+- }
+- return true;
+- }
+
+ bool createDirectories() {
+ bool result = true;
+@@ -283,7 +283,6 @@
+ { "Creating directories", createDirectories, false },
+ { "Loading settings", loadSettings, false },
+ { "Loading plugins", loadPlugins, false },
+- { "Checking for updates", checkForUpdates, true },
+ { "Loading fonts", loadFonts, true },
+ };
+ }
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..29155de36532
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,53 @@
+# Template file for 'imhex'
+pkgname=imhex
+version=1.25.0
+revision=1
+create_wrksrc=yes
+build_wrksrc="ImHex"
+build_style=cmake
+build_helper=qemu
+# XXX: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
+ -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON"
+hostmakedepends="pkg-config clang-tools-extra qemu-user-static"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel json-c++
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
+ clang-tools-extra"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+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="59817990bb1ab2377143480d4a26171ea631bcecdbc6682b2f79bed2a30e7eed
+ aff9b14a67bea48a06365b1d702af3b6c9cee9161912dd4daadd3f34ae8ee204"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+nocross="/bin/sh: line 1: /builddir/imhex-1.25.0/ImHex/build/lib/libimhex/external/libromfs/generator/generator-imhex: cannot execute binary file: Exec format error"
+
+do_check() {
+ cd build
+ ninja ${makejobs} unit_tests
+ # StoreAPI, TipsAPI, ContentAPI tests are flaky
+ ctest ${makejobs} -E '^.*API$'
+}
+
+post_install() {
+ vmkdir usr/share/imhex
+ for d in constants encodings includes magic patterns yara; do
+ vcopy ../ImHex-Patterns-ImHex-v${version}/$d usr/share/imhex
+ done
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmove usr/share/imhex
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.25.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (26 preceding siblings ...)
2022-12-19 6:28 ` classabbyamp
@ 2022-12-19 7:33 ` classabbyamp
2022-12-19 7:52 ` classabbyamp
` (3 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-12-19 7:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 692 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.25.0
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2).
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 9466 bytes --]
From f05f493f780f4234a50f4a195f45b353c3ec100e Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.25.0
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/cross.patch | 11 +++
srcpkgs/imhex/patches/musl.patch | 29 +++++++
srcpkgs/imhex/patches/no-update-check.patch | 90 +++++++++++++++++++++
srcpkgs/imhex/template | 50 ++++++++++++
5 files changed, 181 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/cross.patch
create mode 100644 srcpkgs/imhex/patches/musl.patch
create mode 100644 srcpkgs/imhex/patches/no-update-check.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/cross.patch b/srcpkgs/imhex/patches/cross.patch
new file mode 100644
index 000000000000..ae18dae4430a
--- /dev/null
+++ b/srcpkgs/imhex/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/ImHex/lib/external/libromfs/lib/CMakeLists.txt
++++ b/ImHex/lib/external/libromfs/lib/CMakeLists.txt
+@@ -18,7 +18,7 @@
+
+ # Make sure libromfs gets rebuilt when any of the resources are changed
+ add_custom_command(OUTPUT ${ROMFS}
+- COMMAND $<TARGET_FILE:generator-${LIBROMFS_PROJECT_NAME}>
++ COMMAND generator-${LIBROMFS_PROJECT_NAME}
+ DEPENDS ../generator ${ROMFS_FILES}
+ )
+
diff --git a/srcpkgs/imhex/patches/musl.patch b/srcpkgs/imhex/patches/musl.patch
new file mode 100644
index 000000000000..b8e2ba476367
--- /dev/null
+++ b/srcpkgs/imhex/patches/musl.patch
@@ -0,0 +1,29 @@
+From a966cab1551e0e15e4261c55349b27f84d29cecc Mon Sep 17 00:00:00 2001
+From: WerWolv <werwolv98@gmail.com>
+Date: Mon, 19 Dec 2022 07:15:18 +0100
+Subject: [PATCH] build: Use correct fcntl.h include on Linux
+
+---
+ plugins/builtin/include/content/providers/file_provider.hpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/ImHex/plugins/builtin/include/content/providers/file_provider.hpp b/ImHex/plugins/builtin/include/content/providers/file_provider.hpp
+index 61da65cc8db2..ce8ee7084e0c 100644
+--- a/ImHex/plugins/builtin/include/content/providers/file_provider.hpp
++++ b/ImHex/plugins/builtin/include/content/providers/file_provider.hpp
+@@ -9,10 +9,14 @@
+ #if defined(OS_WINDOWS)
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
++#elif defined(OS_MACOS)
++ #include <sys/mman.h>
++ #include <unistd.h>
++ #include <sys/fcntl.h>
+ #else
+ #include <sys/mman.h>
+ #include <unistd.h>
+- #include <sys/fcntl.h>
++ #include <fcntl.h>
+ #endif
+
+ namespace hex::plugin::builtin {
diff --git a/srcpkgs/imhex/patches/no-update-check.patch b/srcpkgs/imhex/patches/no-update-check.patch
new file mode 100644
index 000000000000..c600bceac07e
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-update-check.patch
@@ -0,0 +1,90 @@
+running the internal update checker is pointless when updates are managed by xbps
+
+--- a/ImHex/plugins/builtin/source/content/welcome_screen.cpp
++++ b/ImHex/plugins/builtin/source/content/welcome_screen.cpp
+@@ -517,20 +517,6 @@
+ loadDefaultLayout();
+ });
+
+- EventManager::subscribe<EventWindowInitialized>([] {
+- // documentation of the value above the setting definition
+- int showCheckForUpdates = ContentRegistry::Settings::read("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 2);
+- if (showCheckForUpdates == 2) {
+- ContentRegistry::Settings::write("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 0);
+- View::showYesNoQuestionPopup("hex.builtin.welcome.check_for_updates_text"_lang,
+- [] { // yes
+- ContentRegistry::Settings::write("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 1);
+- ImGui::CloseCurrentPopup();
+- }, [] { // no
+- ImGui::CloseCurrentPopup();
+- });
+- }
+- });
+
+ ContentRegistry::Interface::addMenuItem("hex.builtin.menu.file", 1075, [&] {
+ if (ImGui::BeginMenu("hex.builtin.menu.file.open_recent"_lang, !s_recentProvidersUpdating && !s_recentProviders.empty())) {
+--- a/ImHex/plugins/builtin/source/content/settings_entries.cpp
++++ b/ImHex/plugins/builtin/source/content/settings_entries.cpp
+@@ -35,21 +35,6 @@
+
+ /* General */
+
+- /* Values of this setting :
+- 0 - do not check for updates on startup
+- 1 - check for updates on startup
+- 2 - default value - ask the user if he wants to check for updates. This value should only be encountered on the first startup.
+- */
+- ContentRegistry::Settings::add("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 2, [](auto name, nlohmann::json &setting) {
+- static bool enabled = static_cast<int>(setting) == 1;
+-
+- if (ImGui::Checkbox(name.data(), &enabled)) {
+- setting = static_cast<int>(enabled);
+- return true;
+- }
+-
+- return false;
+- });
+
+ ContentRegistry::Settings::add("hex.builtin.setting.general", "hex.builtin.setting.general.show_tips", 1, [](auto name, nlohmann::json &setting) {
+ static bool enabled = static_cast<int>(setting);
+--- a/ImHex/main/source/init/tasks.cpp
++++ b/ImHex/main/source/init/tasks.cpp
+@@ -24,30 +24,6 @@
+
+ using namespace std::literals::string_literals;
+
+- static bool checkForUpdates() {
+- // documentation of the value above the setting definition
+- int showCheckForUpdates = ContentRegistry::Settings::read("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 2);
+- if (showCheckForUpdates == 1){
+- hex::Net net;
+-
+- auto releases = net.getJson(GitHubApiURL + "/releases/latest"s, 2000).get();
+- if (releases.code != 200)
+- return false;
+-
+- if (!releases.body.contains("tag_name") || !releases.body["tag_name"].is_string())
+- return false;
+-
+- auto versionString = std::string(IMHEX_VERSION);
+- size_t versionLength = std::min(versionString.find_first_of('-'), versionString.length());
+- auto currVersion = "v" + versionString.substr(0, versionLength);
+- auto latestVersion = releases.body["tag_name"].get<std::string_view>();
+-
+- if (latestVersion != currVersion)
+- ImHexApi::System::impl::addInitArgument("update-available", latestVersion.data());
+-
+- }
+- return true;
+- }
+
+ bool createDirectories() {
+ bool result = true;
+@@ -283,7 +283,6 @@
+ { "Creating directories", createDirectories, false },
+ { "Loading settings", loadSettings, false },
+ { "Loading plugins", loadPlugins, false },
+- { "Checking for updates", checkForUpdates, true },
+ { "Loading fonts", loadFonts, true },
+ };
+ }
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..912bed5dd60d
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,50 @@
+# Template file for 'imhex'
+pkgname=imhex
+version=1.25.0
+revision=1
+build_wrksrc="ImHex"
+build_style=cmake
+build_helper=qemu
+# XXX: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
+ -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel json-c++
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
+ clang-tools-extra"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+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="59817990bb1ab2377143480d4a26171ea631bcecdbc6682b2f79bed2a30e7eed
+ aff9b14a67bea48a06365b1d702af3b6c9cee9161912dd4daadd3f34ae8ee204"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+do_check() {
+ cd build
+ ninja ${makejobs} unit_tests
+ # StoreAPI, TipsAPI, ContentAPI tests are flaky
+ ctest ${makejobs} -E '^.*API$'
+}
+
+post_install() {
+ vmkdir usr/share/imhex
+ for d in constants encodings includes magic patterns yara; do
+ vcopy ../ImHex-Patterns-ImHex-v${version}/$d usr/share/imhex
+ done
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmove usr/share/imhex
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.25.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (27 preceding siblings ...)
2022-12-19 7:33 ` classabbyamp
@ 2022-12-19 7:52 ` classabbyamp
2022-12-19 7:57 ` classabbyamp
` (2 subsequent siblings)
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-12-19 7:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 692 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.25.0
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2).
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 9514 bytes --]
From 6248e7c8662426f5f1e56cb459e50f3ea2c0efac Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.25.0
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/cross.patch | 11 +++
srcpkgs/imhex/patches/musl.patch | 29 +++++++
srcpkgs/imhex/patches/no-update-check.patch | 90 +++++++++++++++++++++
srcpkgs/imhex/template | 50 ++++++++++++
5 files changed, 181 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/cross.patch
create mode 100644 srcpkgs/imhex/patches/musl.patch
create mode 100644 srcpkgs/imhex/patches/no-update-check.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/cross.patch b/srcpkgs/imhex/patches/cross.patch
new file mode 100644
index 000000000000..9ae8de91cbd8
--- /dev/null
+++ b/srcpkgs/imhex/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/ImHex/lib/external/libromfs/lib/CMakeLists.txt
++++ b/ImHex/lib/external/libromfs/lib/CMakeLists.txt
+@@ -18,7 +18,7 @@
+
+ # Make sure libromfs gets rebuilt when any of the resources are changed
+ add_custom_command(OUTPUT ${ROMFS}
+- COMMAND $<TARGET_FILE:generator-${LIBROMFS_PROJECT_NAME}>
++ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:generator-${LIBROMFS_PROJECT_NAME}>
+ DEPENDS ../generator ${ROMFS_FILES}
+ )
+
diff --git a/srcpkgs/imhex/patches/musl.patch b/srcpkgs/imhex/patches/musl.patch
new file mode 100644
index 000000000000..b8e2ba476367
--- /dev/null
+++ b/srcpkgs/imhex/patches/musl.patch
@@ -0,0 +1,29 @@
+From a966cab1551e0e15e4261c55349b27f84d29cecc Mon Sep 17 00:00:00 2001
+From: WerWolv <werwolv98@gmail.com>
+Date: Mon, 19 Dec 2022 07:15:18 +0100
+Subject: [PATCH] build: Use correct fcntl.h include on Linux
+
+---
+ plugins/builtin/include/content/providers/file_provider.hpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/ImHex/plugins/builtin/include/content/providers/file_provider.hpp b/ImHex/plugins/builtin/include/content/providers/file_provider.hpp
+index 61da65cc8db2..ce8ee7084e0c 100644
+--- a/ImHex/plugins/builtin/include/content/providers/file_provider.hpp
++++ b/ImHex/plugins/builtin/include/content/providers/file_provider.hpp
+@@ -9,10 +9,14 @@
+ #if defined(OS_WINDOWS)
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
++#elif defined(OS_MACOS)
++ #include <sys/mman.h>
++ #include <unistd.h>
++ #include <sys/fcntl.h>
+ #else
+ #include <sys/mman.h>
+ #include <unistd.h>
+- #include <sys/fcntl.h>
++ #include <fcntl.h>
+ #endif
+
+ namespace hex::plugin::builtin {
diff --git a/srcpkgs/imhex/patches/no-update-check.patch b/srcpkgs/imhex/patches/no-update-check.patch
new file mode 100644
index 000000000000..c600bceac07e
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-update-check.patch
@@ -0,0 +1,90 @@
+running the internal update checker is pointless when updates are managed by xbps
+
+--- a/ImHex/plugins/builtin/source/content/welcome_screen.cpp
++++ b/ImHex/plugins/builtin/source/content/welcome_screen.cpp
+@@ -517,20 +517,6 @@
+ loadDefaultLayout();
+ });
+
+- EventManager::subscribe<EventWindowInitialized>([] {
+- // documentation of the value above the setting definition
+- int showCheckForUpdates = ContentRegistry::Settings::read("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 2);
+- if (showCheckForUpdates == 2) {
+- ContentRegistry::Settings::write("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 0);
+- View::showYesNoQuestionPopup("hex.builtin.welcome.check_for_updates_text"_lang,
+- [] { // yes
+- ContentRegistry::Settings::write("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 1);
+- ImGui::CloseCurrentPopup();
+- }, [] { // no
+- ImGui::CloseCurrentPopup();
+- });
+- }
+- });
+
+ ContentRegistry::Interface::addMenuItem("hex.builtin.menu.file", 1075, [&] {
+ if (ImGui::BeginMenu("hex.builtin.menu.file.open_recent"_lang, !s_recentProvidersUpdating && !s_recentProviders.empty())) {
+--- a/ImHex/plugins/builtin/source/content/settings_entries.cpp
++++ b/ImHex/plugins/builtin/source/content/settings_entries.cpp
+@@ -35,21 +35,6 @@
+
+ /* General */
+
+- /* Values of this setting :
+- 0 - do not check for updates on startup
+- 1 - check for updates on startup
+- 2 - default value - ask the user if he wants to check for updates. This value should only be encountered on the first startup.
+- */
+- ContentRegistry::Settings::add("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 2, [](auto name, nlohmann::json &setting) {
+- static bool enabled = static_cast<int>(setting) == 1;
+-
+- if (ImGui::Checkbox(name.data(), &enabled)) {
+- setting = static_cast<int>(enabled);
+- return true;
+- }
+-
+- return false;
+- });
+
+ ContentRegistry::Settings::add("hex.builtin.setting.general", "hex.builtin.setting.general.show_tips", 1, [](auto name, nlohmann::json &setting) {
+ static bool enabled = static_cast<int>(setting);
+--- a/ImHex/main/source/init/tasks.cpp
++++ b/ImHex/main/source/init/tasks.cpp
+@@ -24,30 +24,6 @@
+
+ using namespace std::literals::string_literals;
+
+- static bool checkForUpdates() {
+- // documentation of the value above the setting definition
+- int showCheckForUpdates = ContentRegistry::Settings::read("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 2);
+- if (showCheckForUpdates == 1){
+- hex::Net net;
+-
+- auto releases = net.getJson(GitHubApiURL + "/releases/latest"s, 2000).get();
+- if (releases.code != 200)
+- return false;
+-
+- if (!releases.body.contains("tag_name") || !releases.body["tag_name"].is_string())
+- return false;
+-
+- auto versionString = std::string(IMHEX_VERSION);
+- size_t versionLength = std::min(versionString.find_first_of('-'), versionString.length());
+- auto currVersion = "v" + versionString.substr(0, versionLength);
+- auto latestVersion = releases.body["tag_name"].get<std::string_view>();
+-
+- if (latestVersion != currVersion)
+- ImHexApi::System::impl::addInitArgument("update-available", latestVersion.data());
+-
+- }
+- return true;
+- }
+
+ bool createDirectories() {
+ bool result = true;
+@@ -283,7 +283,6 @@
+ { "Creating directories", createDirectories, false },
+ { "Loading settings", loadSettings, false },
+ { "Loading plugins", loadPlugins, false },
+- { "Checking for updates", checkForUpdates, true },
+ { "Loading fonts", loadFonts, true },
+ };
+ }
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..912bed5dd60d
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,50 @@
+# Template file for 'imhex'
+pkgname=imhex
+version=1.25.0
+revision=1
+build_wrksrc="ImHex"
+build_style=cmake
+build_helper=qemu
+# XXX: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
+ -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel json-c++
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
+ clang-tools-extra"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+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="59817990bb1ab2377143480d4a26171ea631bcecdbc6682b2f79bed2a30e7eed
+ aff9b14a67bea48a06365b1d702af3b6c9cee9161912dd4daadd3f34ae8ee204"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+do_check() {
+ cd build
+ ninja ${makejobs} unit_tests
+ # StoreAPI, TipsAPI, ContentAPI tests are flaky
+ ctest ${makejobs} -E '^.*API$'
+}
+
+post_install() {
+ vmkdir usr/share/imhex
+ for d in constants encodings includes magic patterns yara; do
+ vcopy ../ImHex-Patterns-ImHex-v${version}/$d usr/share/imhex
+ done
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmove usr/share/imhex
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] New package: imhex-1.25.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (28 preceding siblings ...)
2022-12-19 7:52 ` classabbyamp
@ 2022-12-19 7:57 ` classabbyamp
2022-12-20 22:55 ` [PR PATCH] [Merged]: " classabbyamp
2022-12-22 0:16 ` iTrooz
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-12-19 7:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 692 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages new/imhex
https://github.com/void-linux/void-packages/pull/36967
New package: imhex-1.25.0
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2).
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/36967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/imhex-36967.patch --]
[-- Type: text/x-diff, Size: 9601 bytes --]
From 00fc768e8bfc9151209e1c8ff5832a648893e469 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 3 May 2022 02:27:08 -0400
Subject: [PATCH] New package: imhex-1.25.0
closes #36954
---
srcpkgs/imhex-patterns | 1 +
srcpkgs/imhex/patches/cross.patch | 13 +++
srcpkgs/imhex/patches/musl.patch | 29 +++++++
srcpkgs/imhex/patches/no-update-check.patch | 90 +++++++++++++++++++++
srcpkgs/imhex/template | 50 ++++++++++++
5 files changed, 183 insertions(+)
create mode 120000 srcpkgs/imhex-patterns
create mode 100644 srcpkgs/imhex/patches/cross.patch
create mode 100644 srcpkgs/imhex/patches/musl.patch
create mode 100644 srcpkgs/imhex/patches/no-update-check.patch
create mode 100644 srcpkgs/imhex/template
diff --git a/srcpkgs/imhex-patterns b/srcpkgs/imhex-patterns
new file mode 120000
index 000000000000..9f335cad9f82
--- /dev/null
+++ b/srcpkgs/imhex-patterns
@@ -0,0 +1 @@
+imhex
\ No newline at end of file
diff --git a/srcpkgs/imhex/patches/cross.patch b/srcpkgs/imhex/patches/cross.patch
new file mode 100644
index 000000000000..aa160f2ef3a8
--- /dev/null
+++ b/srcpkgs/imhex/patches/cross.patch
@@ -0,0 +1,13 @@
+https://github.com/WerWolv/libromfs/commit/beec45afc942209cc34d30f99eac42b2bb04aa79
+
+--- a/ImHex/lib/external/libromfs/lib/CMakeLists.txt
++++ b/ImHex/lib/external/libromfs/lib/CMakeLists.txt
+@@ -18,7 +18,7 @@
+
+ # Make sure libromfs gets rebuilt when any of the resources are changed
+ add_custom_command(OUTPUT ${ROMFS}
+- COMMAND $<TARGET_FILE:generator-${LIBROMFS_PROJECT_NAME}>
++ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:generator-${LIBROMFS_PROJECT_NAME}>
+ DEPENDS ../generator ${ROMFS_FILES}
+ )
+
diff --git a/srcpkgs/imhex/patches/musl.patch b/srcpkgs/imhex/patches/musl.patch
new file mode 100644
index 000000000000..b8e2ba476367
--- /dev/null
+++ b/srcpkgs/imhex/patches/musl.patch
@@ -0,0 +1,29 @@
+From a966cab1551e0e15e4261c55349b27f84d29cecc Mon Sep 17 00:00:00 2001
+From: WerWolv <werwolv98@gmail.com>
+Date: Mon, 19 Dec 2022 07:15:18 +0100
+Subject: [PATCH] build: Use correct fcntl.h include on Linux
+
+---
+ plugins/builtin/include/content/providers/file_provider.hpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/ImHex/plugins/builtin/include/content/providers/file_provider.hpp b/ImHex/plugins/builtin/include/content/providers/file_provider.hpp
+index 61da65cc8db2..ce8ee7084e0c 100644
+--- a/ImHex/plugins/builtin/include/content/providers/file_provider.hpp
++++ b/ImHex/plugins/builtin/include/content/providers/file_provider.hpp
+@@ -9,10 +9,14 @@
+ #if defined(OS_WINDOWS)
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
++#elif defined(OS_MACOS)
++ #include <sys/mman.h>
++ #include <unistd.h>
++ #include <sys/fcntl.h>
+ #else
+ #include <sys/mman.h>
+ #include <unistd.h>
+- #include <sys/fcntl.h>
++ #include <fcntl.h>
+ #endif
+
+ namespace hex::plugin::builtin {
diff --git a/srcpkgs/imhex/patches/no-update-check.patch b/srcpkgs/imhex/patches/no-update-check.patch
new file mode 100644
index 000000000000..c600bceac07e
--- /dev/null
+++ b/srcpkgs/imhex/patches/no-update-check.patch
@@ -0,0 +1,90 @@
+running the internal update checker is pointless when updates are managed by xbps
+
+--- a/ImHex/plugins/builtin/source/content/welcome_screen.cpp
++++ b/ImHex/plugins/builtin/source/content/welcome_screen.cpp
+@@ -517,20 +517,6 @@
+ loadDefaultLayout();
+ });
+
+- EventManager::subscribe<EventWindowInitialized>([] {
+- // documentation of the value above the setting definition
+- int showCheckForUpdates = ContentRegistry::Settings::read("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 2);
+- if (showCheckForUpdates == 2) {
+- ContentRegistry::Settings::write("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 0);
+- View::showYesNoQuestionPopup("hex.builtin.welcome.check_for_updates_text"_lang,
+- [] { // yes
+- ContentRegistry::Settings::write("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 1);
+- ImGui::CloseCurrentPopup();
+- }, [] { // no
+- ImGui::CloseCurrentPopup();
+- });
+- }
+- });
+
+ ContentRegistry::Interface::addMenuItem("hex.builtin.menu.file", 1075, [&] {
+ if (ImGui::BeginMenu("hex.builtin.menu.file.open_recent"_lang, !s_recentProvidersUpdating && !s_recentProviders.empty())) {
+--- a/ImHex/plugins/builtin/source/content/settings_entries.cpp
++++ b/ImHex/plugins/builtin/source/content/settings_entries.cpp
+@@ -35,21 +35,6 @@
+
+ /* General */
+
+- /* Values of this setting :
+- 0 - do not check for updates on startup
+- 1 - check for updates on startup
+- 2 - default value - ask the user if he wants to check for updates. This value should only be encountered on the first startup.
+- */
+- ContentRegistry::Settings::add("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 2, [](auto name, nlohmann::json &setting) {
+- static bool enabled = static_cast<int>(setting) == 1;
+-
+- if (ImGui::Checkbox(name.data(), &enabled)) {
+- setting = static_cast<int>(enabled);
+- return true;
+- }
+-
+- return false;
+- });
+
+ ContentRegistry::Settings::add("hex.builtin.setting.general", "hex.builtin.setting.general.show_tips", 1, [](auto name, nlohmann::json &setting) {
+ static bool enabled = static_cast<int>(setting);
+--- a/ImHex/main/source/init/tasks.cpp
++++ b/ImHex/main/source/init/tasks.cpp
+@@ -24,30 +24,6 @@
+
+ using namespace std::literals::string_literals;
+
+- static bool checkForUpdates() {
+- // documentation of the value above the setting definition
+- int showCheckForUpdates = ContentRegistry::Settings::read("hex.builtin.setting.general", "hex.builtin.setting.general.check_for_updates", 2);
+- if (showCheckForUpdates == 1){
+- hex::Net net;
+-
+- auto releases = net.getJson(GitHubApiURL + "/releases/latest"s, 2000).get();
+- if (releases.code != 200)
+- return false;
+-
+- if (!releases.body.contains("tag_name") || !releases.body["tag_name"].is_string())
+- return false;
+-
+- auto versionString = std::string(IMHEX_VERSION);
+- size_t versionLength = std::min(versionString.find_first_of('-'), versionString.length());
+- auto currVersion = "v" + versionString.substr(0, versionLength);
+- auto latestVersion = releases.body["tag_name"].get<std::string_view>();
+-
+- if (latestVersion != currVersion)
+- ImHexApi::System::impl::addInitArgument("update-available", latestVersion.data());
+-
+- }
+- return true;
+- }
+
+ bool createDirectories() {
+ bool result = true;
+@@ -283,7 +283,6 @@
+ { "Creating directories", createDirectories, false },
+ { "Loading settings", loadSettings, false },
+ { "Loading plugins", loadPlugins, false },
+- { "Checking for updates", checkForUpdates, true },
+ { "Loading fonts", loadFonts, true },
+ };
+ }
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
new file mode 100644
index 000000000000..912bed5dd60d
--- /dev/null
+++ b/srcpkgs/imhex/template
@@ -0,0 +1,50 @@
+# Template file for 'imhex'
+pkgname=imhex
+version=1.25.0
+revision=1
+build_wrksrc="ImHex"
+build_style=cmake
+build_helper=qemu
+# XXX: when capstone v5 is out, -DUSE_SYSTEM_CAPSTONE=ON
+configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
+ -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON
+ -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON"
+hostmakedepends="pkg-config clang-tools-extra"
+makedepends="libcurl-devel fmt-devel llvm12 jansson-devel yara-devel json-c++
+ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
+ clang-tools-extra"
+short_desc="Hex editor for reverse engineers and programmers"
+maintainer="classabbyamp <dev@placeviolette.net>"
+license="GPL-2.0-or-later"
+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="59817990bb1ab2377143480d4a26171ea631bcecdbc6682b2f79bed2a30e7eed
+ aff9b14a67bea48a06365b1d702af3b6c9cee9161912dd4daadd3f34ae8ee204"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i128"
+fi
+
+do_check() {
+ cd build
+ ninja ${makejobs} unit_tests
+ # StoreAPI, TipsAPI, ContentAPI tests are flaky
+ ctest ${makejobs} -E '^.*API$'
+}
+
+post_install() {
+ vmkdir usr/share/imhex
+ for d in constants encodings includes magic patterns yara; do
+ vcopy ../ImHex-Patterns-ImHex-v${version}/$d usr/share/imhex
+ done
+}
+
+imhex-patterns_package() {
+ short_desc+=" - patterns and magic files"
+ depends="imhex"
+ pkg_install() {
+ vmove usr/share/imhex
+ }
+}
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Merged]: New package: imhex-1.25.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (29 preceding siblings ...)
2022-12-19 7:57 ` classabbyamp
@ 2022-12-20 22:55 ` classabbyamp
2022-12-22 0:16 ` iTrooz
31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2022-12-20 22:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 524 bytes --]
There's a merged pull request on the void-packages repository
New package: imhex-1.25.0
https://github.com/void-linux/void-packages/pull/36967
Description:
closes #36954
This template will be able to be cleaned up a bit once capstone v5 is released (currently at rc2).
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: New package: imhex-1.25.0
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
` (30 preceding siblings ...)
2022-12-20 22:55 ` [PR PATCH] [Merged]: " classabbyamp
@ 2022-12-22 0:16 ` iTrooz
31 siblings, 0 replies; 33+ messages in thread
From: iTrooz @ 2022-12-22 0:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 282 bytes --]
New comment by iTrooz on void-packages repository
https://github.com/void-linux/void-packages/pull/36967#issuecomment-1164978908
Comment:
Hey, we updated Imhex to include a tarball with all sources. Currently, it would look like that : [outdated link]
Is that okay with you ?
^ permalink raw reply [flat|nested] 33+ messages in thread
end of thread, other threads:[~2022-12-22 0:16 UTC | newest]
Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-03 6:28 [PR PATCH] New package: imhex-1.17.0 classabbyamp
2022-05-03 6:54 ` [PR PATCH] [Updated] " classabbyamp
2022-05-03 7:06 ` classabbyamp
2022-05-03 7:14 ` classabbyamp
2022-05-03 12:38 ` dmarto
2022-05-03 17:09 ` [PR PATCH] [Updated] " classabbyamp
2022-05-03 17:09 ` classabbyamp
2022-05-07 20:58 ` [PR PATCH] [Updated] " classabbyamp
2022-05-17 17:07 ` classabbyamp
2022-05-28 6:56 ` classabbyamp
2022-05-28 19:43 ` classabbyamp
2022-05-28 19:52 ` classabbyamp
2022-05-28 20:11 ` classabbyamp
2022-06-04 15:31 ` [PR PATCH] [Updated] New package: imhex-1.18.1 classabbyamp
2022-06-04 19:48 ` classabbyamp
2022-06-23 22:35 ` New package: imhex-1.18.2 iTrooz
2022-06-23 22:58 ` classabbyamp
2022-07-05 15:00 ` [PR PATCH] [Updated] " classabbyamp
2022-07-07 15:58 ` classabbyamp
2022-07-18 5:20 ` [PR PATCH] [Updated] New package: imhex-1.19.1 classabbyamp
2022-08-03 15:52 ` classabbyamp
2022-08-03 15:52 ` classabbyamp
2022-08-03 16:14 ` classabbyamp
2022-08-03 16:32 ` classabbyamp
2022-08-03 16:59 ` classabbyamp
2022-11-02 2:13 ` github-actions
2022-12-19 1:36 ` [PR PATCH] [Updated] New package: imhex-1.25.0 classabbyamp
2022-12-19 6:28 ` classabbyamp
2022-12-19 7:33 ` classabbyamp
2022-12-19 7:52 ` classabbyamp
2022-12-19 7:57 ` classabbyamp
2022-12-20 22:55 ` [PR PATCH] [Merged]: " classabbyamp
2022-12-22 0:16 ` iTrooz
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).