commit: f1e18cfe047ee8a885eafb6c04ede61da4e4120e
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Wed Oct 6 20:51:30 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Wed Oct 6 22:15:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f1e18cfe
app-editors/imhex: fix patches
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
.../imhex/files/imhex-1.10.1-no-lLLVMDemangle.patch | 18 ++++++++++++++++++
.../files/imhex-1.10.1-system-nativefiledialog.patch | 10 ++++++++++
app-editors/imhex/imhex-1.10.1.ebuild | 6 ++----
3 files changed, 30 insertions(+), 4 deletions(-)
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
new file mode 100644
index 000000000..3aa487ed1
--- /dev/null
+++ b/app-editors/imhex/files/imhex-1.10.1-no-lLLVMDemangle.patch
@@ -0,0 +1,18 @@
+--- 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
new file mode 100644
index 000000000..7e6f8d1dc
--- /dev/null
+++ b/app-editors/imhex/files/imhex-1.10.1-system-nativefiledialog.patch
@@ -0,0 +1,10 @@
+--- 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/imhex-1.10.1.ebuild
b/app-editors/imhex/imhex-1.10.1.ebuild
index 511463ff0..baed85f99 100644
--- a/app-editors/imhex/imhex-1.10.1.ebuild
+++ b/app-editors/imhex/imhex-1.10.1.ebuild
@@ -43,11 +43,9 @@ RDEPEND="${DEPEND}"
BDEPEND="app-admin/chrpath"
PATCHES=(
+ "${FILESDIR}/${P}-no-lLLVMDemangle.patch"
"${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"
+ "${FILESDIR}/${P}-system-nativefiledialog.patch"
)
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
