[gentoo-commits] repo/proj/guru:dev commit in: app-editors/imhex/files/, app-editors/imhex/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/proj/guru:dev commit in: app-editors/imhex/files/, app-editors/imhex/
@ 2021-09-26 18:37 Alessandro Barbieri
  0 siblings, 0 replies; 7+ messages in thread
From: Alessandro Barbieri @ 2021-09-26 18:37 UTC (permalink / raw
  To: gentoo-commits

commit:     5710f27e70a191c65bc9c07cc68011cf118ff727
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sat Sep 25 20:20:02 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun Sep 26 18:37:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5710f27e

app-editors/imhex: add 1.10.0

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 app-editors/imhex/Manifest                         |   1 +
 .../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 +++
 app-editors/imhex/imhex-1.10.0.ebuild              | 106 +++++++++++++++++++++
 5 files changed, 146 insertions(+)

diff --git a/app-editors/imhex/Manifest b/app-editors/imhex/Manifest
index aae2af6f2..d9a07528d 100644
--- a/app-editors/imhex/Manifest
+++ b/app-editors/imhex/Manifest
@@ -1 +1,2 @@
+DIST imhex-1.10.0.tar.gz 8509953 BLAKE2B e258693f44d5524a86c88e29152bfe9777a149236f146a16b88bc7a49d3450f1b46138649a830c7164175afaea3c0d5e76c998e3e65020627b3c978c504431bb SHA512 03d84e30d5ee064ef2c3faf5cb40965f2c94b41e4d8b3e2e3e800f079d0710f0660b4c751dc0c4516b9b19bbf57df44a102ae61fa41d56606ce1f37c9aa8313c
 DIST imhex-1.8.1.tar.gz 1758664 BLAKE2B 62c58358810bd4f1192495001d01fc6c6fe8f28a35adc1478c8b2d0dab0fd929c0f46018c9afd51c1094cbae0c04002f4887fb2fb9377b6c645abaee006b9a03 SHA512 c6ec73a282c9eb90b58d164c29abbef3dceba09aa706a8295cecdcb429d5efa4015fac0dd0a3111eae3efe667f5b16f063624bf188a00a400fc06b008e3b51f8

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
new file mode 100644
index 000000000..d1a5f4afa
--- /dev/null
+++ b/app-editors/imhex/files/imhex-1.10.0-fix-yara-linking.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000..087faef0b
--- /dev/null
+++ b/app-editors/imhex/files/imhex-1.10.0-link-mbedtls.patch
@@ -0,0 +1,14 @@
+--- 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
new file mode 100644
index 000000000..63f77e60f
--- /dev/null
+++ b/app-editors/imhex/files/imhex-1.10.0-no-lnlohmann_json.patch
@@ -0,0 +1,14 @@
+--- 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/imhex-1.10.0.ebuild b/app-editors/imhex/imhex-1.10.0.ebuild
new file mode 100644
index 000000000..511463ff0
--- /dev/null
+++ b/app-editors/imhex/imhex-1.10.0.ebuild
@@ -0,0 +1,106 @@
+# 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
+}


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

* [gentoo-commits] repo/proj/guru:dev commit in: app-editors/imhex/files/, app-editors/imhex/
@ 2022-08-20 11:23 Rui Huang
  0 siblings, 0 replies; 7+ messages in thread
From: Rui Huang @ 2022-08-20 11:23 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:     Rui Huang <vowstar <AT> gmail <DOT> com>
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] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-editors/imhex/files/, app-editors/imhex/
@ 2023-10-09 15:38 Henri Gasc
  0 siblings, 0 replies; 7+ messages in thread
From: Henri Gasc @ 2023-10-09 15:38 UTC (permalink / raw
  To: gentoo-commits

commit:     c169e2e8f87bb192603e2cbee910290d81caae26
Author:     Henri Gasc <gasc <AT> eurecom <DOT> fr>
AuthorDate: Mon Oct  9 15:37:25 2023 +0000
Commit:     Henri Gasc <gasc <AT> eurecom <DOT> fr>
CommitDate: Mon Oct  9 15:38:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c169e2e8

app-editors/imhex: add 1.31.0, drop 1.30.1

Closes: https://bugs.gentoo.org/915471
Closes: https://bugs.gentoo.org/909290
Closes: https://bugs.gentoo.org/909291
Signed-off-by: Henri Gasc <gasc <AT> eurecom.fr>

 app-editors/imhex/Manifest                         |  4 +--
 app-editors/imhex/files/llvm-16.patch              | 13 ++++++++++
 .../{imhex-1.30.1.ebuild => imhex-1.31.0.ebuild}   | 29 +++++++++-------------
 app-editors/imhex/metadata.xml                     |  3 +++
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/app-editors/imhex/Manifest b/app-editors/imhex/Manifest
index 0d45767258..5765ebdb4c 100644
--- a/app-editors/imhex/Manifest
+++ b/app-editors/imhex/Manifest
@@ -1,2 +1,2 @@
-DIST imhex-1.30.1.tar.gz 25920970 BLAKE2B 03a651134bda5814dc4e989a763f148b3a03694640d1baaa4be6e075ad9c5e798959bc477484f8214423e15836cc01de033e10606ee04dc375521101b4c75f13 SHA512 04c71f15fdbe17443b0f98cef2c2562b7d360f14065e4fab2c2dc1eaf9bbd0d8aa9a267dd1eab208d77cf00622edf6b5126b2d266b817f301a2281aae82eed45
-DIST imhex-patterns-1.30.1.tar.gz 3377742 BLAKE2B 4fa9475f7b04f5765f0a81258e9d01bf814b7b7a0b318c096fdc3ba728938f3f782c9c30fde7ced79626b70b550649d883eda6cf5bbc4b3d8d3a9ad8ac1c5364 SHA512 d734c7fe1c31c9b7845422047a9b9d1289c432cfe98d2b08ca5fe22b82262e3ae41ec14e93d3c62d24c87294fcdf439719cef6bc2ee5b2b54b45377addb9f06a
+DIST imhex-1.31.0.tar.gz 25062606 BLAKE2B 9db337f5aa54ccefd925175f8b4869ece873a7c466d6ddded88c26d6f4fd7ba73a7789964ad2ae6a902d2ec653980ef2482434ddcbbbc224aaac8906b16e92c5 SHA512 483a89e84746ba74eb968f84140ae52edb7046d1074160a97eb6ebad6eac0284beccaf39004141cbe1eebcd8ca92d1fd486c45790880503bbcc40c7bdd586cb8
+DIST imhex-patterns-1.31.0.tar.gz 4448476 BLAKE2B 0bace799f0d2280ccd11a1fcafa9d22620a74691f6b5622d3ad0e260143792c8239158ba021de8e775d5d8589f6dfee990d25beab4288c053d9a5b138b8cc252 SHA512 aaeb2028bbc8235fb49ba75bdca71acf725da0035395c86df97c3976bb70f33ad34f9ce3089d72141de6767cc511c575cc3ac85b66ee4eeba8caa252fc874dba

diff --git a/app-editors/imhex/files/llvm-16.patch b/app-editors/imhex/files/llvm-16.patch
new file mode 100644
index 0000000000..5c7efa5faa
--- /dev/null
+++ b/app-editors/imhex/files/llvm-16.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
+index 624e401..cfd30c3 100644
+--- a/cmake/build_helpers.cmake
++++ b/cmake/build_helpers.cmake
+@@ -503,7 +503,7 @@ macro(addBundledLibraries)
+         add_subdirectory(${EXTERN_LIBS_FOLDER}/llvm-demangle EXCLUDE_FROM_ALL)
+         set_target_properties(LLVMDemangle PROPERTIES POSITION_INDEPENDENT_CODE ON)
+     else()
+-        find_package(LLVM REQUIRED Demangle)
++        find_package(LLVM 16 REQUIRED Demangle)
+     endif()
+ 
+     if (NOT USE_SYSTEM_YARA)

diff --git a/app-editors/imhex/imhex-1.30.1.ebuild b/app-editors/imhex/imhex-1.31.0.ebuild
similarity index 79%
rename from app-editors/imhex/imhex-1.30.1.ebuild
rename to app-editors/imhex/imhex-1.31.0.ebuild
index 1ea5d0cef7..ccbb9ef59a 100644
--- a/app-editors/imhex/imhex-1.30.1.ebuild
+++ b/app-editors/imhex/imhex-1.31.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 CMAKE_BUILD_TYPE="Release"
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake llvm toolchain-funcs
+inherit cmake llvm toolchain-funcs desktop
 
 DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight"
 HOMEPAGE="https://github.com/WerWolv/ImHex"
@@ -20,6 +20,11 @@ S_PATTERNS="${WORKDIR}/ImHex-Patterns-ImHex-v${PV}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="+system-llvm"
+
+PATCHES=(
+	"${FILESDIR}/llvm-16.patch"
+)
 
 DEPEND="
 	app-forensics/yara
@@ -41,6 +46,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
+	system-llvm? ( <sys-devel/llvm-17 )
 	app-admin/chrpath
 	gnome-base/librsvg
 	sys-devel/lld
@@ -53,19 +59,6 @@ pkg_pretend() {
 	fi
 }
 
-src_prepare() {
-	default
-	# We are removing all tests altogether
-	# The tests need ImHex installed to succeed (see https://bugs.gentoo.org/attachment.cgi?id=860683), so we remove them
-	# We could use `ln "${BUILD_DIR}/lib/libimhex.so.${PV}" "/lib64/libimhex.so.${PV}"` and  circumvent sandboxing
-	sed -i \
-		-e 's/enable_testing/#enable_testing/' \
-		-e 's/add_subdirectory(tests/#add_subdirectory(tests/' \
-		"${S}/CMakeLists.txt" || die
-
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-D CMAKE_BUILD_TYPE="Release" \
@@ -76,7 +69,6 @@ src_configure() {
 		-D CMAKE_OBJC_COMPILER_LAUNCHER=ccache \
 		-D CMAKE_OBJCXX_COMPILER_LAUNCHER=ccache \
 		-D CMAKE_SKIP_RPATH=ON \
-		-D IMHEX_USE_BUNDLED_CA=OFF \
 		-D IMHEX_PLUGINS_IN_SHARE=OFF \
 		-D IMHEX_STRIP_RELEASE=OFF \
 		-D IMHEX_OFFLINE_BUILD=ON \
@@ -85,12 +77,13 @@ src_configure() {
 		-D IMHEX_IGNORE_BAD_COMPILER=OFF \
 		-D IMHEX_USE_GTK_FILE_PICKER=OFF \
 		-D IMHEX_DISABLE_STACKTRACE=OFF \
+		-D IMHEX_USE_DEFAULT_BUILD_SETTINGS=OFF \
+		-D IMHEX_STRICT_WARNINGS=OFF \
 		-D IMHEX_VERSION="${PV}" \
 		-D PROJECT_VERSION="${PV}" \
 		-D USE_SYSTEM_CAPSTONE=ON \
-		-D USE_SYSTEM_CURL=ON \
 		-D USE_SYSTEM_FMT=ON \
-		-D USE_SYSTEM_LLVM=ON \
+		-D USE_SYSTEM_LLVM=$(use system-llvm) \
 		-D USE_SYSTEM_NFD=ON \
 		-D USE_SYSTEM_NLOHMANN_JSON=ON \
 		-D USE_SYSTEM_YARA=ON
@@ -102,6 +95,8 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
+	domenu "${S}/dist/${PN}.desktop"
+
 	# Install patterns
 	insinto /usr/share/imhex
 	rm -rf "${S_PATTERNS}/tests"

diff --git a/app-editors/imhex/metadata.xml b/app-editors/imhex/metadata.xml
index 51ae868323..276772b0cc 100644
--- a/app-editors/imhex/metadata.xml
+++ b/app-editors/imhex/metadata.xml
@@ -10,6 +10,9 @@
 		<bugs-to>https://github.com/WerWolv/ImHex/issues</bugs-to>
 		<remote-id type="github">WerWolv/ImHex</remote-id>
 	</upstream>
+	<use>
+		<flag name="system-llvm">Use the system LLVM installation</flag>
+	</use>
 	<longdescription lang="en">
 		Features
 


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

* [gentoo-commits] repo/proj/guru:dev commit in: app-editors/imhex/files/, app-editors/imhex/
@ 2023-10-11  8:25 Henri Gasc
  0 siblings, 0 replies; 7+ messages in thread
From: Henri Gasc @ 2023-10-11  8:25 UTC (permalink / raw
  To: gentoo-commits

commit:     4ff61553ace74522dfed1aa0bb812a440e922676
Author:     Henri Gasc <gasc <AT> eurecom <DOT> fr>
AuthorDate: Wed Oct 11 08:24:36 2023 +0000
Commit:     Henri Gasc <gasc <AT> eurecom <DOT> fr>
CommitDate: Wed Oct 11 08:25:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4ff61553

app-editors/imhex: add patches

Closes: https://bugs.gentoo.org/915572
Signed-off-by: Henri Gasc <gasc <AT> eurecom.fr>

 app-editors/imhex/files/remove-Werror.patch        | 44 ++++++++++++++++++++++
 .../files/{llvm-16.patch => require-llvm-16.patch} |  8 +++-
 app-editors/imhex/imhex-1.31.0.ebuild              |  3 +-
 3 files changed, 52 insertions(+), 3 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..e00aad7371
--- /dev/null
+++ b/app-editors/imhex/files/remove-Werror.patch
@@ -0,0 +1,44 @@
+From 94126d5ff7e5a6d6cdd7f515097383619725953b Mon Sep 17 00:00:00 2001
+From: Leoriem-code <henrigasc@duck.com>
+Subject: [PATCH] remove -Werror
+
+diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
+index da078878..3848fbeb 100644
+--- a/cmake/build_helpers.cmake
++++ b/cmake/build_helpers.cmake
+@@ -435,7 +435,7 @@ endfunction()
+ macro(setupCompilerFlags target)
+     if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+         if (IMHEX_STRICT_WARNINGS)
+-            set(IMHEX_COMMON_FLAGS "-Wall -Wextra -Wpedantic -Werror")
++            set(IMHEX_COMMON_FLAGS "-Wall -Wextra -Wpedantic")
+         endif()
+ 
+         set(IMHEX_C_FLAGS "${IMHEX_COMMON_FLAGS} -Wno-array-bounds")
+
+diff --git a/lib/external/pattern_language/cli/CMakeLists.txt b/lib/external/pattern_language/cli/CMakeLists.txt
+index 39e6f90..01b5e87 100644
+--- a/lib/external/pattern_language/cli/CMakeLists.txt
++++ b/lib/external/pattern_language/cli/CMakeLists.txt
+@@ -28,7 +28,7 @@ if(NOT CLI11_FOUND)
+     set(CLI11_LIBRARIES CLI11::CLI11)
+ 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)
+ target_link_libraries(plcli PUBLIC ${CLI11_LIBRARIES} libpl libpl-gen fmt::fmt-header-only)
+ 
+diff --git a/lib/external/pattern_language/lib/CMakeLists.txt b/lib/external/pattern_language/lib/CMakeLists.txt
+index dab1499..0bfac35 100644
+--- a/lib/external/pattern_language/lib/CMakeLists.txt
++++ b/lib/external/pattern_language/lib/CMakeLists.txt
+@@ -71,7 +71,7 @@ add_library(libpl ${LIBRARY_TYPE}
+ )
+ 
+ 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/llvm-16.patch b/app-editors/imhex/files/require-llvm-16.patch
similarity index 66%
rename from app-editors/imhex/files/llvm-16.patch
rename to app-editors/imhex/files/require-llvm-16.patch
index 5c7efa5faa..7642e7654d 100644
--- a/app-editors/imhex/files/llvm-16.patch
+++ b/app-editors/imhex/files/require-llvm-16.patch
@@ -1,8 +1,12 @@
+From 8d86cd22a743c39a04d34d4cf1a104952cf7fbac Mon Sep 17 00:00:00 2001
+From: xiaoming <xiangluoming2015@outlook.com>
+Subject: [PATCH] require llvm 16
+
 diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
-index 624e401..cfd30c3 100644
+index 0d4839e7..da078878 100644
 --- a/cmake/build_helpers.cmake
 +++ b/cmake/build_helpers.cmake
-@@ -503,7 +503,7 @@ macro(addBundledLibraries)
+@@ -525,7 +525,7 @@ macro(addBundledLibraries)
          add_subdirectory(${EXTERN_LIBS_FOLDER}/llvm-demangle EXCLUDE_FROM_ALL)
          set_target_properties(LLVMDemangle PROPERTIES POSITION_INDEPENDENT_CODE ON)
      else()

diff --git a/app-editors/imhex/imhex-1.31.0.ebuild b/app-editors/imhex/imhex-1.31.0.ebuild
index ccbb9ef59a..3d29199d1f 100644
--- a/app-editors/imhex/imhex-1.31.0.ebuild
+++ b/app-editors/imhex/imhex-1.31.0.ebuild
@@ -23,7 +23,8 @@ KEYWORDS="~amd64"
 IUSE="+system-llvm"
 
 PATCHES=(
-	"${FILESDIR}/llvm-16.patch"
+	"${FILESDIR}/require-llvm-16.patch"
+	"${FILESDIR}/remove-Werror.patch"
 )
 
 DEPEND="


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

* [gentoo-commits] repo/proj/guru:dev commit in: app-editors/imhex/files/, app-editors/imhex/
@ 2024-03-17 11:04 Henri Gasc
  0 siblings, 0 replies; 7+ messages in thread
From: Henri Gasc @ 2024-03-17 11:04 UTC (permalink / raw
  To: gentoo-commits

commit:     928a994d26249670789b80de68370d24e3179e57
Author:     Henri Gasc <gasc <AT> eurecom <DOT> fr>
AuthorDate: Sun Mar 17 10:57:01 2024 +0000
Commit:     Henri Gasc <gasc <AT> eurecom <DOT> fr>
CommitDate: Sun Mar 17 11:04:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=928a994d

app-editors/imhex: corrected small things

Add patch to remove dotnet from the build
Corrected name of sources
Usage of "usex" and not "use" for cmake flags

Closes: https://bugs.gentoo.org/926761
Signed-off-by: Henri Gasc <gasc <AT> eurecom.fr>

 app-editors/imhex/Manifest                               |  4 ++--
 app-editors/imhex/files/remove_dotnet.patch              | 16 ++++++++++++++++
 .../{imhex-1.33.1-r1.ebuild => imhex-1.33.1-r2.ebuild}   | 16 ++++++++++------
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app-editors/imhex/Manifest b/app-editors/imhex/Manifest
index 2bffb61f57..47c450a5f6 100644
--- a/app-editors/imhex/Manifest
+++ b/app-editors/imhex/Manifest
@@ -1,2 +1,2 @@
-DIST imhex-1.33.1.tar.gz 32286361 BLAKE2B 6c53172db4a0f3a599bf648d5cf2e4a56ab477896d216b6dcb81dd7559cc05d48a213dbd3161e71e060ce6256cd9b15335d1376dd63f3a79bf23c960c59e91e2 SHA512 9b92d5a7d1664fbb6251cf07450f4aa052da6a4828cae904696d96a54d2895b124afded85005f2bf421cb10129b3ef464b2d36a832c66214140d503109f615e5
-DIST imhex-patterns-1.33.1.tar.gz 4657125 BLAKE2B 3070d06dd5ead76bf0643b551464a24e5dcac2e9aa20bd7f19d3296df87cdfb659e80e432fcbef33c4de5c8e7e97b848e0e5e386ff5db85d7564de4d5fcdd08c SHA512 e4f36ffa82df8d4d97b418c9b6a25a76d99d1649bbda9f0969480518335f4449d91e227ca02ccaab2248e2c95dfe05a33a1687cb16c4428aae57c638da44e262
+DIST imhex-1.33.1.gh.tar.gz 32286361 BLAKE2B 6c53172db4a0f3a599bf648d5cf2e4a56ab477896d216b6dcb81dd7559cc05d48a213dbd3161e71e060ce6256cd9b15335d1376dd63f3a79bf23c960c59e91e2 SHA512 9b92d5a7d1664fbb6251cf07450f4aa052da6a4828cae904696d96a54d2895b124afded85005f2bf421cb10129b3ef464b2d36a832c66214140d503109f615e5
+DIST imhex-patterns-1.33.1.gh.tar.gz 4657125 BLAKE2B 3070d06dd5ead76bf0643b551464a24e5dcac2e9aa20bd7f19d3296df87cdfb659e80e432fcbef33c4de5c8e7e97b848e0e5e386ff5db85d7564de4d5fcdd08c SHA512 e4f36ffa82df8d4d97b418c9b6a25a76d99d1649bbda9f0969480518335f4449d91e227ca02ccaab2248e2c95dfe05a33a1687cb16c4428aae57c638da44e262

diff --git a/app-editors/imhex/files/remove_dotnet.patch b/app-editors/imhex/files/remove_dotnet.patch
new file mode 100644
index 0000000000..d4c4883c0b
--- /dev/null
+++ b/app-editors/imhex/files/remove_dotnet.patch
@@ -0,0 +1,16 @@
+diff --git a/plugins/script_loader/CMakeLists.txt b/plugins/script_loader/CMakeLists.txt
+index af0f6c79..cbb323e3 100644
+--- a/plugins/script_loader/CMakeLists.txt
++++ b/plugins/script_loader/CMakeLists.txt
+@@ -46,7 +46,7 @@ if (CoreClrEmbed_FOUND)
+         install(FILES ${CoreClrEmbed_SHARED_LIBRARIES} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+     endif ()
+ 
+-    add_subdirectory(dotnet)
+-    add_dependencies(script_loader AssemblyLoader)
++	#add_subdirectory(dotnet)
++	#add_dependencies(script_loader AssemblyLoader)
+ 
+-endif ()
+\ No newline at end of file
++endif ()

diff --git a/app-editors/imhex/imhex-1.33.1-r1.ebuild b/app-editors/imhex/imhex-1.33.1-r2.ebuild
similarity index 88%
rename from app-editors/imhex/imhex-1.33.1-r1.ebuild
rename to app-editors/imhex/imhex-1.33.1-r2.ebuild
index c6050d00ba..be797d6b78 100644
--- a/app-editors/imhex/imhex-1.33.1-r1.ebuild
+++ b/app-editors/imhex/imhex-1.33.1-r2.ebuild
@@ -11,8 +11,8 @@ inherit cmake llvm toolchain-funcs desktop
 DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight"
 HOMEPAGE="https://github.com/WerWolv/ImHex"
 SRC_URI="
-	https://github.com/WerWolv/ImHex/releases/download/v${PV}/Full.Sources.tar.gz -> ${P}.tar.gz
-	https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${PV}.tar.gz -> ${PN}-patterns-${PV}.tar.gz
+	https://github.com/WerWolv/ImHex/releases/download/v${PV}/Full.Sources.tar.gz -> ${P}.gh.tar.gz
+	https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${PV}.tar.gz -> ${PN}-patterns-${PV}.gh.tar.gz
 "
 S="${WORKDIR}/ImHex"
 S_PATTERNS="${WORKDIR}/ImHex-Patterns-ImHex-v${PV}"
@@ -23,6 +23,10 @@ KEYWORDS="~amd64"
 IUSE="+system-llvm test lto"
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}/remove_dotnet.patch"
+)
+
 DEPEND="
 	app-arch/zstd[zlib]
 	app-forensics/yara
@@ -69,17 +73,17 @@ src_configure() {
 		-D IMHEX_IGNORE_BAD_COMPILER=OFF \
 		-D IMHEX_USE_GTK_FILE_PICKER=OFF \
 		-D IMHEX_DISABLE_STACKTRACE=ON \
-		-D IMHEX_BUNDLE_DOTNET=ON \
-		-D IMHEX_ENABLE_LTO=$(use lto) \
+		-D IMHEX_BUNDLE_DOTNET=OFF \
+		-D IMHEX_ENABLE_LTO=$(usex lto) \
 		-D IMHEX_USE_DEFAULT_BUILD_SETTINGS=OFF \
 		-D IMHEX_STRICT_WARNINGS=OFF \
-		-D IMHEX_ENABLE_UNIT_TESTS=$(use test) \
+		-D IMHEX_ENABLE_UNIT_TESTS=$(usex test) \
 		-D IMHEX_ENABLE_PRECOMPILED_HEADERS=OFF \
 		-D IMHEX_VERSION="${PV}" \
 		-D PROJECT_VERSION="${PV}" \
 		-D USE_SYSTEM_CAPSTONE=ON \
 		-D USE_SYSTEM_FMT=ON \
-		-D USE_SYSTEM_LLVM=$(use system-llvm) \
+		-D USE_SYSTEM_LLVM=$(usex system-llvm) \
 		-D USE_SYSTEM_NFD=ON \
 		-D USE_SYSTEM_NLOHMANN_JSON=ON \
 		-D USE_SYSTEM_YARA=ON


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

* [gentoo-commits] repo/proj/guru:dev commit in: app-editors/imhex/files/, app-editors/imhex/
@ 2024-04-12 17:17 Henri Gasc
  0 siblings, 0 replies; 7+ messages in thread
From: Henri Gasc @ 2024-04-12 17:17 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:     Henri Gasc <gasc <AT> eurecom <DOT> fr>
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] 7+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-editors/imhex/files/, app-editors/imhex/
@ 2024-07-09 14:59 Henri Gasc
  0 siblings, 0 replies; 7+ messages in thread
From: Henri Gasc @ 2024-07-09 14:59 UTC (permalink / raw
  To: gentoo-commits

commit:     eab0472a57f9ecdd85eecd42cec9446e6adcb211
Author:     Henri Gasc <gasc <AT> eurecom <DOT> fr>
AuthorDate: Tue Jul  9 14:58:13 2024 +0000
Commit:     Henri Gasc <gasc <AT> eurecom <DOT> fr>
CommitDate: Tue Jul  9 14:59:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=eab0472a

app-editors/imhex: add 1.35.3, drop 1.33.2-r1

Signed-off-by: Henri Gasc <gasc <AT> eurecom.fr>

 app-editors/imhex/Manifest                         |  4 ++--
 app-editors/imhex/files/remove_Werror.patch        | 21 +++++++++++++++--
 app-editors/imhex/files/remove_dotnet.patch        | 26 +++++++++++++---------
 ...{imhex-1.33.2-r1.ebuild => imhex-1.35.3.ebuild} |  0
 4 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/app-editors/imhex/Manifest b/app-editors/imhex/Manifest
index 39350d82f..2190fce9d 100644
--- a/app-editors/imhex/Manifest
+++ b/app-editors/imhex/Manifest
@@ -1,2 +1,2 @@
-DIST imhex-1.33.2.gh.tar.gz 32292253 BLAKE2B 97d8b0f5c7b9621bfa36dbd85f24040c7d8d7dffca154cd85ff128160428d8d590b42e348aa8dbd48b4a21f747d6a0d6c3e74fe9ee484a77f061d5ea28661e70 SHA512 393719670019d7fa11d3f67a6b5ef8d2ae75812078a8beaba6b9b3091a283fc9790161c018073933c1b4a8cbcedf8ff7534aacac20ef4d210f10632db6e487ec
-DIST imhex-patterns-1.33.2.gh.tar.gz 7603711 BLAKE2B 17eb5aaa9bec2418f3ca9fe23e9e3cb5443ce1a5624c3dbcece9bcbe2ca7a95a2498d7fd713bbed78854b136b9884d7f4cb0d8453ded262b6fb6efb377219a96 SHA512 e6b6409b5f5e64de339f5a493c33c06e6033c8f4a1fc594f8f23d3ecd9b6d8a66e712e06649f0312e55860a682e532db000d1f1534d6fdd88181b6738c9201e0
+DIST imhex-1.35.3.gh.tar.gz 33023289 BLAKE2B ebafcda5c873f87945f3d0135615932f545717988920086dd2f09e6ca1c62fda88f272f9ab6a2dae43db49083c9c0c5b6842c55d0c2d2ff667e3f49b84a01097 SHA512 711f98710b00da3ed826367a208678fa3231b02abc61b33d05034cefef3617f6641da78df88ba354a02a16c5d119ee8560fc66d95295214dcd0bdeaab9967c0c
+DIST imhex-patterns-1.35.3.gh.tar.gz 8114314 BLAKE2B 5f89d35c375d5dbe4d1e52ea5c41d86225aa6b5c76a960f430a5a32f94dd68e7ed8cc2fffdd7a3e7dec11f740ef3e226bd52ac3b1d461c0cc9af074a5b44f63d SHA512 6452bad26072dd178bdad2291e717749df361a098a5be7503c7c00e8e8486d2e465fd585d7fa82fe1927848efdcc681cf81e35255cb437231552816cf67ac568

diff --git a/app-editors/imhex/files/remove_Werror.patch b/app-editors/imhex/files/remove_Werror.patch
index 1a35f9e92..891d61a48 100644
--- a/app-editors/imhex/files/remove_Werror.patch
+++ b/app-editors/imhex/files/remove_Werror.patch
@@ -1,5 +1,21 @@
-Remove the different Werror flags we can find used
-Should fix https://bugs.gentoo.org/921663
+--- a/cmake/build_helpers.cmake
++++ b/cmake/build_helpers.cmake
+@@ -563,7 +563,7 @@ macro(setupCompilerFlags target)
+     if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+         # Define strict compilation flags
+         if (IMHEX_STRICT_WARNINGS)
+-            set(IMHEX_COMMON_FLAGS "${IMHEX_COMMON_FLAGS} -Wall -Wextra -Wpedantic -Werror")
++            set(IMHEX_COMMON_FLAGS "${IMHEX_COMMON_FLAGS} -Wall -Wextra -Wpedantic")
+         endif()
+ 
+         if (UNIX AND NOT APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+@@ -871,4 +871,4 @@ function(precompileHeaders target includeFolder)
+             PUBLIC
+             "$<$<COMPILE_LANGUAGE:CXX>:${INCLUDES}>"
+     )
+-endfunction()
+\ No newline at end of file
++endfunction()
 --- a/lib/external/pattern_language/cli/CMakeLists.txt
 +++ b/lib/external/pattern_language/cli/CMakeLists.txt
 @@ -29,7 +29,7 @@ else()
@@ -22,3 +38,4 @@ Should fix https://bugs.gentoo.org/921663
      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 88d5c9700..5f241cf8d 100644
--- a/app-editors/imhex/files/remove_dotnet.patch
+++ b/app-editors/imhex/files/remove_dotnet.patch
@@ -1,14 +1,18 @@
-Remove the compilation step that needs dotnet
-https://bugs.gentoo.org/926761
 --- a/plugins/script_loader/CMakeLists.txt
 +++ b/plugins/script_loader/CMakeLists.txt
-@@ -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 ()
+@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.16)
+ 
+ include(ImHexPlugin)
+ 
+-find_package(CoreClrEmbed)
+ if (CoreClrEmbed_FOUND)
+     set(IMHEX_DOTNET_SCRIPT_SUPPORT ON)
+ 
+@@ -56,4 +55,4 @@ if (IMHEX_DOTNET_SCRIPT_SUPPORT)
+ 
+     add_subdirectory(support/dotnet)
+     add_dependencies(script_loader AssemblyLoader)
+-endif()
 \ No newline at end of file
++endif()
+

diff --git a/app-editors/imhex/imhex-1.33.2-r1.ebuild b/app-editors/imhex/imhex-1.35.3.ebuild
similarity index 100%
rename from app-editors/imhex/imhex-1.33.2-r1.ebuild
rename to app-editors/imhex/imhex-1.35.3.ebuild


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

end of thread, other threads:[~2024-07-09 14:59 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-09 15:38 [gentoo-commits] repo/proj/guru:dev commit in: app-editors/imhex/files/, app-editors/imhex/ Henri Gasc
  -- strict thread matches above, loose matches on Subject: below --
2024-07-09 14:59 Henri Gasc
2024-04-12 17:17 Henri Gasc
2024-03-17 11:04 Henri Gasc
2023-10-11  8:25 Henri Gasc
2022-08-20 11:23 Rui Huang
2021-09-26 18:37 Alessandro Barbieri

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox