* [gentoo-commits] repo/proj/guru:master commit in: app-editors/imhex/, app-editors/imhex/files/
@ 2022-08-24 15:52 Ronny Gutbrod
0 siblings, 0 replies; 3+ messages in thread
From: Ronny Gutbrod @ 2022-08-24 15:52 UTC (permalink / raw
To: gentoo-commits
commit: a4a7b57c5bf56ee31059092a9c0d51ed90af044e
Author: Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Sat Aug 20 11:22:12 2022 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Sat Aug 20 11:22:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a4a7b57c
app-editors/imhex: drop 1.8.1-r1, 1.10.0, 1.10.1
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>
app-editors/imhex/Manifest | 3 -
.../files/imhex-1.10.0-fix-yara-linking.patch | 11 ---
.../imhex/files/imhex-1.10.0-link-mbedtls.patch | 14 ---
.../files/imhex-1.10.0-no-lnlohmann_json.patch | 14 ---
.../files/imhex-1.10.1-no-lLLVMDemangle.patch | 18 ----
.../imhex-1.10.1-system-nativefiledialog.patch | 10 --
.../imhex/files/imhex-1.8.1-fix-yara-linking.patch | 11 ---
app-editors/imhex/files/imhex-1.8.1-gcc11.patch | 11 ---
.../imhex-1.8.1-system-nativefiledialog.patch | 19 ----
.../imhex/files/imhex-1.8.1-system-xdgpp.patch | 11 ---
app-editors/imhex/imhex-1.10.0.ebuild | 106 --------------------
app-editors/imhex/imhex-1.10.1.ebuild | 104 --------------------
app-editors/imhex/imhex-1.8.1-r1.ebuild | 108 ---------------------
13 files changed, 440 deletions(-)
diff --git a/app-editors/imhex/Manifest b/app-editors/imhex/Manifest
index e5404a712..fa985686e 100644
--- a/app-editors/imhex/Manifest
+++ b/app-editors/imhex/Manifest
@@ -1,5 +1,2 @@
-DIST imhex-1.10.0.tar.gz 8509953 BLAKE2B e258693f44d5524a86c88e29152bfe9777a149236f146a16b88bc7a49d3450f1b46138649a830c7164175afaea3c0d5e76c998e3e65020627b3c978c504431bb SHA512 03d84e30d5ee064ef2c3faf5cb40965f2c94b41e4d8b3e2e3e800f079d0710f0660b4c751dc0c4516b9b19bbf57df44a102ae61fa41d56606ce1f37c9aa8313c
-DIST imhex-1.10.1.tar.gz 8523483 BLAKE2B 7d73a06cfe83fdd9fa8723f1c64a752212f8e2f0dbf902f2d1da1349e53e580684263b168569f092d32c129eddba40131d8f8bd3148d6d59340dcd67bcdc8b6e SHA512 0542ce5db530989367dfc98932bd09e3020c955e2bd666122644612e1c41e2bc3d6a6374c60e7afbb4bae86c75930dfbc7a48f37a8cd8a0d85a550231f470b91
DIST imhex-1.21.2.tar.gz 23473112 BLAKE2B 5e1dbcf246fc2b2ac57636efee71574eb38ee2d04678a6e09b4d8c2d61da01021bb169fa40a18725d609a3daae1bf9a4ca8aacbb21b6d381c3ff1345d9f788c6 SHA512 e5dd9c5b81f739ee37cc51cf37aa6b866b1af8b28f06e0731612612c5a56d5d68d9d50c20ebb9304a51efb88c07fde72656dcc7d6c249dd827d5d15e44de9698
-DIST imhex-1.8.1.tar.gz 1758664 BLAKE2B 62c58358810bd4f1192495001d01fc6c6fe8f28a35adc1478c8b2d0dab0fd929c0f46018c9afd51c1094cbae0c04002f4887fb2fb9377b6c645abaee006b9a03 SHA512 c6ec73a282c9eb90b58d164c29abbef3dceba09aa706a8295cecdcb429d5efa4015fac0dd0a3111eae3efe667f5b16f063624bf188a00a400fc06b008e3b51f8
DIST imhex-patterns-1.21.2.tar.gz 4672663 BLAKE2B a0c4a9917ad44a4af0e01e67210bb025a01e6775b327248ba9259d36ea0596b2be74aed758d478b3f5c0d0aea669ed333c8aca2b7e43e275abc833bbdcef2490 SHA512 c5694bd5cc6a609dd8133f0566fbf3bfd4669cf4a20523d10afddbc39e4b7a8d52d8fdecff95883e40b6f06f858e1373c8dbe0713fd7f54380dac5ee3105b9ce
diff --git a/app-editors/imhex/files/imhex-1.10.0-fix-yara-linking.patch b/app-editors/imhex/files/imhex-1.10.0-fix-yara-linking.patch
deleted file mode 100644
index d1a5f4afa..000000000
--- a/app-editors/imhex/files/imhex-1.10.0-fix-yara-linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -93,7 +93,7 @@
- if (WIN32)
- target_link_libraries(imhex ${CMAKE_DL_LIBS} capstone LLVMDemangle libimhex ${Python_LIBRARIES} wsock32 ws2_32 libyara Dwmapi.lib dl)
- else ()
-- target_link_libraries(imhex ${CMAKE_DL_LIBS} capstone LLVMDemangle libimhex ${Python_LIBRARIES} dl pthread libyara)
-+ target_link_libraries(imhex ${CMAKE_DL_LIBS} capstone LLVMDemangle libimhex ${Python_LIBRARIES} dl pthread yara)
- endif ()
-
- createPackage()
diff --git a/app-editors/imhex/files/imhex-1.10.0-link-mbedtls.patch b/app-editors/imhex/files/imhex-1.10.0-link-mbedtls.patch
deleted file mode 100644
index 087faef0b..000000000
--- a/app-editors/imhex/files/imhex-1.10.0-link-mbedtls.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/plugins/libimhex/CMakeLists.txt
-+++ b/plugins/libimhex/CMakeLists.txt
-@@ -95,9 +95,9 @@
-
- if (APPLE)
- find_library(FOUNDATION NAMES Foundation)
-- target_link_libraries(libimhex PUBLIC imgui mbedcrypto ${FOUNDATION} nfd fmt-header-only libcurl magic)
-+ target_link_libraries(libimhex PUBLIC imgui mbedtls ${FOUNDATION} nfd fmt-header-only libcurl magic)
- else ()
-- target_link_libraries(libimhex PUBLIC imgui mbedcrypto nfd magic)
-+ target_link_libraries(libimhex PUBLIC imgui mbedtls nfd magic)
-
- if (NOT USE_SYSTEM_FMT)
- target_link_libraries(libimhex PUBLIC fmt-header-only)
diff --git a/app-editors/imhex/files/imhex-1.10.0-no-lnlohmann_json.patch b/app-editors/imhex/files/imhex-1.10.0-no-lnlohmann_json.patch
deleted file mode 100644
index 63f77e60f..000000000
--- a/app-editors/imhex/files/imhex-1.10.0-no-lnlohmann_json.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/plugins/libimhex/CMakeLists.txt
-+++ b/plugins/libimhex/CMakeLists.txt
-@@ -95,9 +95,9 @@
-
- if (APPLE)
- find_library(FOUNDATION NAMES Foundation)
-- target_link_libraries(libimhex PUBLIC imgui nlohmann_json mbedcrypto ${FOUNDATION} nfd fmt-header-only libcurl magic)
-+ target_link_libraries(libimhex PUBLIC imgui mbedcrypto ${FOUNDATION} nfd fmt-header-only libcurl magic)
- else ()
-- target_link_libraries(libimhex PUBLIC imgui nlohmann_json mbedcrypto nfd magic)
-+ target_link_libraries(libimhex PUBLIC imgui mbedcrypto nfd magic)
-
- if (NOT USE_SYSTEM_FMT)
- target_link_libraries(libimhex PUBLIC fmt-header-only)
diff --git a/app-editors/imhex/files/imhex-1.10.1-no-lLLVMDemangle.patch b/app-editors/imhex/files/imhex-1.10.1-no-lLLVMDemangle.patch
deleted file mode 100644
index 3aa487ed1..000000000
--- a/app-editors/imhex/files/imhex-1.10.1-no-lLLVMDemangle.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/plugins/builtin/CMakeLists.txt
-+++ b/plugins/builtin/CMakeLists.txt
-@@ -25,7 +25,7 @@
- # Add additional include directories here #
- target_include_directories(${PROJECT_NAME} PRIVATE include)
- # Add additional libraries here #
--target_link_libraries(${PROJECT_NAME} PRIVATE libimhex LLVMDemangle)
-+target_link_libraries(${PROJECT_NAME} PRIVATE libimhex)
-
-
-
-@@ -43,4 +43,4 @@
-
- if (NOT TARGET libimhex)
- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../libimhex ${CMAKE_CURRENT_BINARY_DIR}/plugins/libimhex)
--endif()
-\ Manca newline alla fine del file
-+endif()
diff --git a/app-editors/imhex/files/imhex-1.10.1-system-nativefiledialog.patch b/app-editors/imhex/files/imhex-1.10.1-system-nativefiledialog.patch
deleted file mode 100644
index 7e6f8d1dc..000000000
--- a/app-editors/imhex/files/imhex-1.10.1-system-nativefiledialog.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/plugins/libimhex/CMakeLists.txt
-+++ b/plugins/libimhex/CMakeLists.txt
-@@ -5,7 +5,6 @@
-
- set(BUILD_SHARED_LIBS OFF)
- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../external/ImGui ${CMAKE_CURRENT_BINARY_DIR}/external/ImGui)
--add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../external/nativefiledialog ${CMAKE_CURRENT_BINARY_DIR}/external/nativefiledialog EXCLUDE_FROM_ALL)
- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../external/microtar ${CMAKE_CURRENT_BINARY_DIR}/external/microtar EXCLUDE_FROM_ALL)
-
- set(XDGPP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/../../external/xdgpp")
diff --git a/app-editors/imhex/files/imhex-1.8.1-fix-yara-linking.patch b/app-editors/imhex/files/imhex-1.8.1-fix-yara-linking.patch
deleted file mode 100644
index 54754d241..000000000
--- a/app-editors/imhex/files/imhex-1.8.1-fix-yara-linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -93,7 +93,7 @@
- if (WIN32)
- target_link_libraries(imhex magic ${CMAKE_DL_LIBS} capstone LLVMDemangle libimhex ${Python_LIBRARIES} wsock32 ws2_32 libyara)
- else ()
-- target_link_libraries(imhex magic ${CMAKE_DL_LIBS} capstone LLVMDemangle libimhex ${Python_LIBRARIES} dl pthread libyara)
-+ target_link_libraries(imhex magic ${CMAKE_DL_LIBS} capstone LLVMDemangle libimhex ${Python_LIBRARIES} dl pthread yara)
- endif ()
-
- createPackage()
diff --git a/app-editors/imhex/files/imhex-1.8.1-gcc11.patch b/app-editors/imhex/files/imhex-1.8.1-gcc11.patch
deleted file mode 100644
index 7c62768ea..000000000
--- a/app-editors/imhex/files/imhex-1.8.1-gcc11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/libimhex/include/hex/helpers/utils.hpp
-+++ b/plugins/libimhex/include/hex/helpers/utils.hpp
-@@ -25,7 +25,7 @@
- #define fopen64 fopen
- #define fseeko64 fseek
- #define ftello64 ftell
--#else
-+#elif __cplusplus < 201703L
- template<>
- struct std::is_integral<u128> : public std::true_type { };
- template<>
diff --git a/app-editors/imhex/files/imhex-1.8.1-system-nativefiledialog.patch b/app-editors/imhex/files/imhex-1.8.1-system-nativefiledialog.patch
deleted file mode 100644
index 185b35469..000000000
--- a/app-editors/imhex/files/imhex-1.8.1-system-nativefiledialog.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/plugins/libimhex/CMakeLists.txt
-+++ b/plugins/libimhex/CMakeLists.txt
-@@ -12,7 +12,6 @@
- find_package(nlohmann_json REQUIRED)
- endif()
-
--add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../external/nativefiledialog ${CMAKE_CURRENT_BINARY_DIR}/external/nativefiledialog EXCLUDE_FROM_ALL)
- if(NOT USE_SYSTEM_FMT)
- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../external/fmt ${CMAKE_CURRENT_BINARY_DIR}/external/fmt)
- else()
-@@ -32,7 +31,7 @@
- pkg_check_modules(LIBCURL REQUIRED IMPORTED_TARGET libcurl)
- endif()
-
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -lnfd")
-
- set(CMAKE_SHARED_LIBRARY_PREFIX "")
-
diff --git a/app-editors/imhex/files/imhex-1.8.1-system-xdgpp.patch b/app-editors/imhex/files/imhex-1.8.1-system-xdgpp.patch
deleted file mode 100644
index 511fe67ea..000000000
--- a/app-editors/imhex/files/imhex-1.8.1-system-xdgpp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/libimhex/CMakeLists.txt
-+++ b/plugins/libimhex/CMakeLists.txt
-@@ -19,7 +19,7 @@
- find_package(fmt REQUIRED)
- endif()
-
--set(XDGPP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/../../external/xdgpp")
-+set(XDGPP_INCLUDE_DIRS "/usr/include")
- set(CMAKE_USE_MBEDTLS ON)
- set(BUILD_CURL_EXE OFF)
- set(FPHSA_NAME_MISMATCHED ON CACHE BOOL "")
diff --git a/app-editors/imhex/imhex-1.10.0.ebuild b/app-editors/imhex/imhex-1.10.0.ebuild
deleted file mode 100644
index 511463ff0..000000000
--- a/app-editors/imhex/imhex-1.10.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE="Release"
-CMAKE_MAKEFILE_GENERATOR="emake"
-LLVM_MAX_SLOT=12
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake desktop llvm python-single-r1 xdg-utils
-
-DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight"
-HOMEPAGE="https://github.com/WerWolv/ImHex"
-SRC_URI="https://github.com/WerWolv/ImHex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/ImHex-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
- ${PYTHON_DEPS}
- app-forensics/yara
- >=dev-cpp/nlohmann_json-3.10.2
- dev-cpp/xdgpp
- dev-libs/capstone
- >=dev-libs/libfmt-8.0.0
- dev-libs/nativefiledialog-extended
- dev-libs/openssl
- dev-libs/tre
- media-libs/freetype
- media-libs/glfw
- media-libs/glm
- net-libs/mbedtls
- net-misc/curl
- sys-apps/file
- sys-devel/llvm:${LLVM_MAX_SLOT}
- virtual/libiconv
- virtual/libintl
-"
-RDEPEND="${DEPEND}"
-BDEPEND="app-admin/chrpath"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.8.1-system-xdgpp.patch"
- "${FILESDIR}/${PN}-1.8.1-system-nativefiledialog.patch"
- "${FILESDIR}/${P}-fix-yara-linking.patch"
- "${FILESDIR}/${P}-no-lnlohmann_json.patch"
- "${FILESDIR}/${P}-link-mbedtls.patch"
-)
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
- rm -r external/{curl,fmt,llvm,nativefiledialog,nlohmann_json,xdgpp,yara} || die
- cmake_src_prepare
-}
-
-src_configure() {
- python-single-r1_pkg_setup
- local mycmakeargs=(
- -DPROJECT_VERSION="${PV}"
- -DPYTHON_VERSION_MAJOR_MINOR="\"${EPYTHON/python/}\""
- -DUSE_SYSTEM_CURL=ON
- -DUSE_SYSTEM_FMT=ON
- -DUSE_SYSTEM_LLVM=ON
- -DUSE_SYSTEM_NLOHMANN_JSON=ON
- -DUSE_SYSTEM_YARA=ON
- )
- cmake_src_configure
-}
-
-src_install() {
- # can't use cmake_src_install, doing it manual
- dobin "${BUILD_DIR}/${PN}"
- insinto "/usr/$(get_libdir)"
- doins "${BUILD_DIR}/plugins/builtin/builtin.hexplug"
- dolib.so "${BUILD_DIR}/plugins/lib${PN}/lib${PN}.so"
- insinto "/usr/share/${PN}"
- doins "${S}/res/icon.ico"
- doins -r "${S}/res/resources"
-
- chrpath -d "${ED}/usr/bin/imhex"
- chrpath -d "${ED}/usr/$(get_libdir)/builtin.hexplug"
-
- mypythondir="${D}/$(python_get_sitedir)/imhex"
- mkdir -p "${mypythondir}" || die
- mv "${S}"/python_libs/lib/* "${mypythondir}" || die
- python_optimize "${mypythondir}"
-
- # create desktop icon
- make_desktop_entry "imhex" "ImHex" "/usr/share/${PN}/icon.ico" "X-Editor"
-
- # install docs
- einstalldocs
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-editors/imhex/imhex-1.10.1.ebuild b/app-editors/imhex/imhex-1.10.1.ebuild
deleted file mode 100644
index baed85f99..000000000
--- a/app-editors/imhex/imhex-1.10.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE="Release"
-CMAKE_MAKEFILE_GENERATOR="emake"
-LLVM_MAX_SLOT=12
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake desktop llvm python-single-r1 xdg-utils
-
-DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight"
-HOMEPAGE="https://github.com/WerWolv/ImHex"
-SRC_URI="https://github.com/WerWolv/ImHex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/ImHex-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
- ${PYTHON_DEPS}
- app-forensics/yara
- >=dev-cpp/nlohmann_json-3.10.2
- dev-cpp/xdgpp
- dev-libs/capstone
- >=dev-libs/libfmt-8.0.0
- dev-libs/nativefiledialog-extended
- dev-libs/openssl
- dev-libs/tre
- media-libs/freetype
- media-libs/glfw
- media-libs/glm
- net-libs/mbedtls
- net-misc/curl
- sys-apps/file
- sys-devel/llvm:${LLVM_MAX_SLOT}
- virtual/libiconv
- virtual/libintl
-"
-RDEPEND="${DEPEND}"
-BDEPEND="app-admin/chrpath"
-
-PATCHES=(
- "${FILESDIR}/${P}-no-lLLVMDemangle.patch"
- "${FILESDIR}/${PN}-1.8.1-system-xdgpp.patch"
- "${FILESDIR}/${P}-system-nativefiledialog.patch"
-)
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
- rm -r external/{curl,fmt,llvm,nativefiledialog,nlohmann_json,xdgpp,yara} || die
- cmake_src_prepare
-}
-
-src_configure() {
- python-single-r1_pkg_setup
- local mycmakeargs=(
- -DPROJECT_VERSION="${PV}"
- -DPYTHON_VERSION_MAJOR_MINOR="\"${EPYTHON/python/}\""
- -DUSE_SYSTEM_CURL=ON
- -DUSE_SYSTEM_FMT=ON
- -DUSE_SYSTEM_LLVM=ON
- -DUSE_SYSTEM_NLOHMANN_JSON=ON
- -DUSE_SYSTEM_YARA=ON
- )
- cmake_src_configure
-}
-
-src_install() {
- # can't use cmake_src_install, doing it manual
- dobin "${BUILD_DIR}/${PN}"
- insinto "/usr/$(get_libdir)"
- doins "${BUILD_DIR}/plugins/builtin/builtin.hexplug"
- dolib.so "${BUILD_DIR}/plugins/lib${PN}/lib${PN}.so"
- insinto "/usr/share/${PN}"
- doins "${S}/res/icon.ico"
- doins -r "${S}/res/resources"
-
- chrpath -d "${ED}/usr/bin/imhex"
- chrpath -d "${ED}/usr/$(get_libdir)/builtin.hexplug"
-
- mypythondir="${D}/$(python_get_sitedir)/imhex"
- mkdir -p "${mypythondir}" || die
- mv "${S}"/python_libs/lib/* "${mypythondir}" || die
- python_optimize "${mypythondir}"
-
- # create desktop icon
- make_desktop_entry "imhex" "ImHex" "/usr/share/${PN}/icon.ico" "X-Editor"
-
- # install docs
- einstalldocs
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-editors/imhex/imhex-1.8.1-r1.ebuild b/app-editors/imhex/imhex-1.8.1-r1.ebuild
deleted file mode 100644
index 72849a7cf..000000000
--- a/app-editors/imhex/imhex-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_BUILD_TYPE="Release"
-CMAKE_MAKEFILE_GENERATOR="emake"
-LLVM_MAX_SLOT=12
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake desktop llvm python-single-r1 xdg-utils
-
-DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight"
-HOMEPAGE="https://github.com/WerWolv/ImHex"
-SRC_URI="https://github.com/WerWolv/ImHex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/ImHex-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
- ${PYTHON_DEPS}
- app-forensics/yara
- dev-cpp/nlohmann_json
- dev-cpp/xdgpp
- dev-libs/capstone
- <dev-libs/libfmt-8.0.0
- dev-libs/nativefiledialog-extended
- dev-libs/openssl
- dev-libs/tre
- media-libs/freetype
- media-libs/glfw
- media-libs/glm
- net-libs/mbedtls
- net-misc/curl
- sys-apps/file
- sys-devel/llvm:${LLVM_MAX_SLOT}
- virtual/libiconv
- virtual/libintl
-"
-RDEPEND="${DEPEND}"
-BDEPEND="app-admin/chrpath"
-
-PATCHES=(
- "${FILESDIR}/${P}-gcc11.patch"
- "${FILESDIR}/${P}-system-xdgpp.patch"
- "${FILESDIR}/${P}-system-nativefiledialog.patch"
- "${FILESDIR}/${P}-fix-yara-linking.patch"
-)
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
- rm -r external/{curl,fmt,llvm,nativefiledialog,nlohmann_json,xdgpp,yara} || die
- cmake_src_prepare
-}
-
-src_configure() {
- python-single-r1_pkg_setup
- local mycmakeargs=(
- -DPROJECT_VERSION="${PV}"
- -DPYTHON_VERSION_MAJOR_MINOR="\"${EPYTHON/python/}\""
- -DUSE_SYSTEM_CURL=ON
- -DUSE_SYSTEM_FMT=ON
- -DUSE_SYSTEM_LLVM=ON
- -DUSE_SYSTEM_NLOHMANN_JSON=ON
- -DUSE_SYSTEM_YARA=ON
- )
- cmake_src_configure
-
-}
-
-src_install() {
- # can't use cmake_src_install, doing it manual
- dobin "${BUILD_DIR}/${PN}"
- insinto "/usr/$(get_libdir)"
- doins "${BUILD_DIR}/plugins/builtin/builtin.hexplug"
- dolib.so "${BUILD_DIR}/plugins/lib${PN}/lib${PN}.so"
- insinto "/usr/share/${PN}"
- doins "${S}/res/icon.ico"
- doins -r "${S}/res/resources"
- insinto "/usr/share/${PN}/magic"
- newins "${BUILD_DIR}/magic_dbs.mgc" "magic.mgc"
-
- chrpath -d "${ED}/usr/bin/imhex"
- chrpath -d "${ED}/usr/$(get_libdir)/builtin.hexplug"
-
- mypythondir="${D}/$(python_get_sitedir)/imhex"
- mkdir -p "${mypythondir}" || die
- mv "${S}"/python_libs/lib/* "${mypythondir}" || die
- python_optimize "${mypythondir}"
-
- # create desktop icon
- make_desktop_entry "imhex" "ImHex" "/usr/share/${PN}/icon.ico" "X-Editor"
-
- # install docs
- einstalldocs
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-editors/imhex/, app-editors/imhex/files/
@ 2024-04-12 19:59 Julien Roy
0 siblings, 0 replies; 3+ messages in thread
From: Julien Roy @ 2024-04-12 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 06c7e828b21868e0cd354ded91ec5e568dc868b4
Author: Henri Gasc <gasc <AT> eurecom <DOT> fr>
AuthorDate: Fri Apr 12 17:13:59 2024 +0000
Commit: Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Fri Apr 12 17:17:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=06c7e828
app-editors/imhex: Remove Werror, scrub patches
Closes: https://bugs.gentoo.org/921663
Signed-off-by: Henri Gasc <gasc <AT> eurecom.fr>
app-editors/imhex/files/remove_Werror.patch | 24 ++++++++++++++++++++++
app-editors/imhex/files/remove_dotnet.patch | 12 +++++------
...{imhex-1.33.2.ebuild => imhex-1.33.2-r1.ebuild} | 2 ++
3 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/app-editors/imhex/files/remove_Werror.patch b/app-editors/imhex/files/remove_Werror.patch
new file mode 100644
index 0000000000..1a35f9e924
--- /dev/null
+++ b/app-editors/imhex/files/remove_Werror.patch
@@ -0,0 +1,24 @@
+Remove the different Werror flags we can find used
+Should fix https://bugs.gentoo.org/921663
+--- a/lib/external/pattern_language/cli/CMakeLists.txt
++++ b/lib/external/pattern_language/cli/CMakeLists.txt
+@@ -29,7 +29,7 @@ else()
+ find_package(CLI11 CONFIG QUIET)
+ endif()
+
+-target_compile_options(plcli PRIVATE -Wall -Wextra -Werror -Wno-unknown-pragmas -Wno-array-bounds)
++target_compile_options(plcli PRIVATE -Wall -Wextra -Wno-unknown-pragmas -Wno-array-bounds)
+ target_include_directories(plcli PUBLIC include ${CLI11_INCLUDE_DIRS})
+ target_link_libraries(plcli PRIVATE ${CLI11_LIBRARIES} ${NLOHMANN_JSON_LIBRARIES} libpl libpl-gen ${FMT_LIBRARIES})
+
+--- a/lib/external/pattern_language/lib/CMakeLists.txt
++++ b/lib/external/pattern_language/lib/CMakeLists.txt
+@@ -86,7 +86,7 @@ if (LIBPL_ENABLE_PRECOMPILED_HEADERS)
+ endif ()
+
+ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+- target_compile_options(libpl PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds)
++ target_compile_options(libpl PRIVATE -Wall -Wextra -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds)
+ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+ target_compile_options(libpl PRIVATE -Wno-stringop-overflow)
+ endif()
diff --git a/app-editors/imhex/files/remove_dotnet.patch b/app-editors/imhex/files/remove_dotnet.patch
index 30ab50f642..88d5c9700d 100644
--- a/app-editors/imhex/files/remove_dotnet.patch
+++ b/app-editors/imhex/files/remove_dotnet.patch
@@ -1,14 +1,14 @@
-diff --git a/plugins/script_loader/CMakeLists.txt b/plugins/script_loader/CMakeLists.txt
-index af0f6c79..cddc0e14 100644
+Remove the compilation step that needs dotnet
+https://bugs.gentoo.org/926761
--- a/plugins/script_loader/CMakeLists.txt
+++ b/plugins/script_loader/CMakeLists.txt
-@@ -46,7 +46,4 @@ if (CoreClrEmbed_FOUND)
+@@ -45,8 +45,4 @@ if (CoreClrEmbed_FOUND)
+ if (IMHEX_BUNDLE_DOTNET)
install(FILES ${CoreClrEmbed_SHARED_LIBRARIES} DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif ()
-
+-
- add_subdirectory(dotnet)
- add_dependencies(script_loader AssemblyLoader)
-
--endif ()
+ endif ()
\ No newline at end of file
-+endif ()
diff --git a/app-editors/imhex/imhex-1.33.2.ebuild b/app-editors/imhex/imhex-1.33.2-r1.ebuild
similarity index 97%
rename from app-editors/imhex/imhex-1.33.2.ebuild
rename to app-editors/imhex/imhex-1.33.2-r1.ebuild
index 046b7d8933..93f9baee0e 100644
--- a/app-editors/imhex/imhex-1.33.2.ebuild
+++ b/app-editors/imhex/imhex-1.33.2-r1.ebuild
@@ -25,6 +25,8 @@ PATCHES=(
# will use it at some point and try to access internet.
# Because it did not cause any issue, we can disable it
"${FILESDIR}/remove_dotnet.patch"
+ # Remove the different -Werror flags
+ "${FILESDIR}/remove_Werror.patch"
)
DEPEND="
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-editors/imhex/, app-editors/imhex/files/
@ 2025-05-10 19:08 David Roman
0 siblings, 0 replies; 3+ messages in thread
From: David Roman @ 2025-05-10 19:08 UTC (permalink / raw
To: gentoo-commits
commit: 8e5152d8130bb132793f6efa50c77c7ab2cb9b4a
Author: Henri Gasc <gasc <AT> eurecom <DOT> fr>
AuthorDate: Fri May 9 19:56:17 2025 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Fri May 9 19:56:41 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8e5152d8
app-editors/imhex: Add patch to allow newer version of libfmt
Signed-off-by: Henri Gasc <gasc <AT> eurecom.fr>
app-editors/imhex/files/cmake_boost_regex.patch | 2 +-
.../imhex/files/imhex-1.37.4-update-libfmt.patch | 154 +++++++++++++++++++++
app-editors/imhex/imhex-1.37.4-r3.ebuild | 3 +-
3 files changed, 157 insertions(+), 2 deletions(-)
diff --git a/app-editors/imhex/files/cmake_boost_regex.patch b/app-editors/imhex/files/cmake_boost_regex.patch
index be20b2c17..f76ea6d14 100644
--- a/app-editors/imhex/files/cmake_boost_regex.patch
+++ b/app-editors/imhex/files/cmake_boost_regex.patch
@@ -5,7 +5,7 @@
if (USE_SYSTEM_BOOST)
- find_package(Boost REQUIRED)
-+ find_package(Boost REQUIRED COMPONENTS regex)
++ find_package(Boost REQUIRED COMPONENTS regex)
set(BOOST_LIBRARIES Boost::regex)
else()
add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/boost ${CMAKE_CURRENT_BINARY_DIR}/boost EXCLUDE_FROM_ALL)
diff --git a/app-editors/imhex/files/imhex-1.37.4-update-libfmt.patch b/app-editors/imhex/files/imhex-1.37.4-update-libfmt.patch
new file mode 100644
index 000000000..e2a11eb5f
--- /dev/null
+++ b/app-editors/imhex/files/imhex-1.37.4-update-libfmt.patch
@@ -0,0 +1,154 @@
+# From: Myself and (mostly) WerWolv <hey@werwolv.net>
+# Fixes https://github.com/WerWolv/ImHex/issues/2225
+--- a/lib/external/pattern_language/lib/source/pl/lib/std/time.cpp
++++ b/lib/external/pattern_language/lib/source/pl/lib/std/time.cpp
+@@ -11,7 +11,7 @@
+
+ namespace pl::lib::libstd::time {
+
+- static u128 packTMValue(std::tm tm) {
++ static u128 packTMValue(const std::tm &tm) {
+ return
+ (u128(tm.tm_sec) << 0) |
+ (u128(tm.tm_min) << 8) |
+@@ -57,9 +57,10 @@ namespace pl::lib::libstd::time {
+ auto time = time_t(params[0].toUnsigned());
+
+ try {
+- auto localTime = fmt::localtime(time);
++ auto localTime = std::localtime(&time);
++ if (localTime == nullptr) return u128(0);
+
+- return { packTMValue(localTime) };
++ return { packTMValue(*localTime) };
+ } catch (const fmt::format_error&) {
+ return u128(0);
+ }
+@@ -70,9 +71,10 @@ namespace pl::lib::libstd::time {
+ auto time = time_t(params[0].toUnsigned());
+
+ try {
+- auto gmTime = fmt::gmtime(time);
++ auto gmTime = std::gmtime(&time);
++ if (gmTime == nullptr) return u128(0);
+
+- return { packTMValue(gmTime) };
++ return { packTMValue(*gmTime) };
+ } catch (const fmt::format_error&) {
+ return u128(0);
+ }
+--- a/lib/libimhex/source/helpers/logger.cpp
++++ b/lib/libimhex/source/helpers/logger.cpp
+@@ -83,7 +83,8 @@ namespace hex::log {
+
+ for (const auto &path : paths::Logs.all()) {
+ wolv::io::fs::createDirectories(path);
+- s_loggerFile = wolv::io::File(path / hex::format("{0:%Y%m%d_%H%M%S}.log", fmt::localtime(std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()))), wolv::io::File::Mode::Create);
++ time_t time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
++ s_loggerFile = wolv::io::File(path / hex::format("{0:%Y%m%d_%H%M%S}.log", *std::localtime(&time)), wolv::io::File::Mode::Create);
+ s_loggerFile.disableBuffering();
+
+ if (s_loggerFile.isValid()) {
+@@ -120,7 +121,8 @@ namespace hex::log {
+
+
+ void printPrefix(FILE *dest, const fmt::text_style &ts, const std::string &level, const char *projectName) {
+- const auto now = fmt::localtime(std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()));
++ const auto time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
++ const auto now = *std::localtime(&time);
+
+ fmt::print(dest, "[{0:%H:%M:%S}] ", now);
+
+--- a/main/gui/source/init/splash_window.cpp
++++ b/main/gui/source/init/splash_window.cpp
+@@ -111,7 +111,7 @@ namespace hex::init {
+ const auto now = std::chrono::system_clock::now();
+ const auto time = std::chrono::system_clock::to_time_t(now);
+
+- return fmt::localtime(time);
++ return *std::localtime(&time);
+ }();
+
+ for (const auto &colorConfig : highlightConfig) {
+--- a/plugins/builtin/source/content/data_inspector.cpp
++++ b/plugins/builtin/source/content/data_inspector.cpp
+@@ -621,11 +621,16 @@ namespace hex::plugin::builtin {
+ ContentRegistry::DataInspector::add("hex.builtin.inspector.time32", sizeof(u32), [](auto buffer, auto endian, auto style) {
+ std::ignore = style;
+
+- auto endianAdjustedTime = hex::changeEndianness(*reinterpret_cast<u32 *>(buffer.data()), endian);
++ time_t endianAdjustedTime = hex::changeEndianness(*reinterpret_cast<u32 *>(buffer.data()), endian);
+
+ std::string value;
+ try {
+- value = hex::format("{0:%a, %d.%m.%Y %H:%M:%S}", fmt::localtime(endianAdjustedTime));
++ auto time = std::localtime(&endianAdjustedTime);
++ if (time == nullptr) {
++ value = "Invalid";
++ } else {
++ value = hex::format("{0:%a, %d.%m.%Y %H:%M:%S}", *time);
++ }
+ } catch (fmt::format_error &) {
+ value = "Invalid";
+ }
+@@ -636,11 +641,16 @@ namespace hex::plugin::builtin {
+ ContentRegistry::DataInspector::add("hex.builtin.inspector.time64", sizeof(u64), [](auto buffer, auto endian, auto style) {
+ std::ignore = style;
+
+- auto endianAdjustedTime = hex::changeEndianness(*reinterpret_cast<u64 *>(buffer.data()), endian);
++ time_t endianAdjustedTime = hex::changeEndianness(*reinterpret_cast<u64 *>(buffer.data()), endian);
+
+ std::string value;
+ try {
+- value = hex::format("{0:%a, %d.%m.%Y %H:%M:%S}", fmt::localtime(endianAdjustedTime));
++ auto time = std::localtime(&endianAdjustedTime);
++ if (time == nullptr) {
++ value = "Invalid";
++ } else {
++ value = hex::format("{0:%a, %d.%m.%Y %H:%M:%S}", *time);
++ }
+ } catch (fmt::format_error &) {
+ value = "Invalid";
+ }
+@@ -653,11 +663,16 @@ namespace hex::plugin::builtin {
+ ContentRegistry::DataInspector::add("hex.builtin.inspector.time", sizeof(time_t), [](auto buffer, auto endian, auto style) {
+ std::ignore = style;
+
+- auto endianAdjustedTime = hex::changeEndianness(*reinterpret_cast<time_t *>(buffer.data()), endian);
++ time_t endianAdjustedTime = hex::changeEndianness(*reinterpret_cast<time_t *>(buffer.data()), endian);
+
+ std::string value;
+ try {
+- value = hex::format("{0:%a, %d.%m.%Y %H:%M:%S}", fmt::localtime(endianAdjustedTime));
++ auto time = std::localtime(&endianAdjustedTime);
++ if (time == nullptr) {
++ value = "Invalid";
++ } else {
++ value = hex::format("{0:%a, %d.%m.%Y %H:%M:%S}", *time);
++ }
+ } catch (fmt::format_error &e) {
+ value = "Invalid";
+ }
+--- a/plugins/builtin/source/content/providers/file_provider.cpp
++++ b/plugins/builtin/source/content/providers/file_provider.cpp
+@@ -135,14 +135,14 @@ namespace hex::plugin::builtin {
+ if (m_fileStats.has_value()) {
+ std::string creationTime, accessTime, modificationTime;
+
+- try { creationTime = hex::format("{:%Y-%m-%d %H:%M:%S}", fmt::localtime(m_fileStats->st_ctime)); }
+- catch (const std::exception&) { creationTime = "???"; }
++ try { creationTime = hex::format("{:%Y-%m-%d %H:%M:%S}", *std::localtime(&m_fileStats->st_ctime)); }
++ catch (const fmt::format_error&) { creationTime = "???"; }
+
+- try { accessTime = hex::format("{:%Y-%m-%d %H:%M:%S}", fmt::localtime(m_fileStats->st_atime)); }
+- catch (const std::exception&) { accessTime = "???"; }
++ try { accessTime = hex::format("{:%Y-%m-%d %H:%M:%S}", *std::localtime(&m_fileStats->st_atime)); }
++ catch (const fmt::format_error&) { accessTime = "???"; }
+
+- try { modificationTime = hex::format("{:%Y-%m-%d %H:%M:%S}", fmt::localtime(m_fileStats->st_mtime)); }
+- catch (const std::exception&) { modificationTime = "???"; }
++ try { modificationTime = hex::format("{:%Y-%m-%d %H:%M:%S}", *std::localtime(&m_fileStats->st_mtime)); }
++ catch (const fmt::format_error&) { modificationTime = "???"; }
+
+ result.emplace_back("hex.builtin.provider.file.creation"_lang, creationTime);
+ result.emplace_back("hex.builtin.provider.file.access"_lang, accessTime);
diff --git a/app-editors/imhex/imhex-1.37.4-r3.ebuild b/app-editors/imhex/imhex-1.37.4-r3.ebuild
index b878523c6..aa999e3b1 100644
--- a/app-editors/imhex/imhex-1.37.4-r3.ebuild
+++ b/app-editors/imhex/imhex-1.37.4-r3.ebuild
@@ -31,6 +31,8 @@ PATCHES=(
"${FILESDIR}/cmake_mbedtls.patch"
# Set boost components to regex
"${FILESDIR}/cmake_boost_regex.patch"
+ # Temporary (until the next update) patch
+ "${FILESDIR}/${P}-update-libfmt.patch"
)
DOCS+=( LICENSE PLUGINS.md )
@@ -48,7 +50,6 @@ DEPEND="
>=dev-libs/capstone-5.0.3:=
>=dev-libs/nativefiledialog-extended-1.2.1[desktop-portal?]
>=dev-libs/libfmt-11.0.2:=
- <dev-libs/libfmt-11.2.0:=
media-libs/fontconfig
media-libs/freetype
>=media-libs/glfw-3.4[X]
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-05-10 19:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-10 19:08 [gentoo-commits] repo/proj/guru:master commit in: app-editors/imhex/, app-editors/imhex/files/ David Roman
-- strict thread matches above, loose matches on Subject: below --
2024-04-12 19:59 Julien Roy
2022-08-24 15:52 Ronny Gutbrod
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox