Date: Sat, 9 Jan 2021 05:49:50 +0000 (UTC) From: MANTANI Nobutaka <nobutaka@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r560832 - in head/editors/imhex: . files Message-ID: <202101090549.1095nosw031558@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nobutaka Date: Sat Jan 9 05:49:50 2021 New Revision: 560832 URL: https://svnweb.freebsd.org/changeset/ports/560832 Log: Update to 1.6.0. Deleted: head/editors/imhex/files/patch-include_helpers_utils.hpp head/editors/imhex/files/patch-source_helpers_utils.cpp head/editors/imhex/files/patch-source_providers_file__provider.cpp head/editors/imhex/files/patch-source_views_view__strings.cpp head/editors/imhex/files/patch-source_views_view__tools.cpp Modified: head/editors/imhex/Makefile head/editors/imhex/distinfo (contents, props changed) head/editors/imhex/files/patch-CMakeLists.txt (contents, props changed) head/editors/imhex/files/patch-source_views_view__hexeditor.cpp (contents, props changed) Modified: head/editors/imhex/Makefile ============================================================================== --- head/editors/imhex/Makefile Sat Jan 9 03:17:21 2021 (r560831) +++ head/editors/imhex/Makefile Sat Jan 9 05:49:50 2021 (r560832) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= imhex -PORTVERSION= 1.5.0 +PORTVERSION= 1.6.0 CATEGORIES= editors MAINTAINER= nobutaka@FreeBSD.org @@ -17,6 +17,7 @@ BUILD_DEPENDS= c++10:lang/gcc10 \ glm>0:math/glm \ nlohmann-json>0:devel/nlohmann-json LIB_DEPENDS= libcapstone.so:devel/capstone4 \ + libfreetype.so:print/freetype2 \ libglfw.so:graphics/glfw \ libstdc++.so:lang/gcc10 \ libtre.so:textproc/libtre @@ -26,8 +27,9 @@ USE_XORG= x11 xcb xau xdmcp USE_GITHUB= yes GH_ACCOUNT= WerWolv GH_PROJECT= ImHex -GH_TAGNAME= v1.5.0 +GH_TAGNAME= v${PORTVERSION} +CC= ${LOCALBASE}/bin/gcc10 CXX= ${LOCALBASE}/bin/c++10 PLIST_FILES= bin/imhex Modified: head/editors/imhex/distinfo ============================================================================== --- head/editors/imhex/distinfo Sat Jan 9 03:17:21 2021 (r560831) +++ head/editors/imhex/distinfo Sat Jan 9 05:49:50 2021 (r560832) @@ -1,3 +1,3 @@ -TIMESTAMP = 1607336763 -SHA256 (WerWolv-ImHex-1.5.0-v1.5.0_GH0.tar.gz) = 211cca3a22d9c0d8a7a3bfa2a3aa7c29cd954c207979632fe9b9a08cf9b8444b -SIZE (WerWolv-ImHex-1.5.0-v1.5.0_GH0.tar.gz) = 848041 +TIMESTAMP = 1610164429 +SHA256 (WerWolv-ImHex-1.6.0-v1.6.0_GH0.tar.gz) = c096c01dc0a90b4691ddf3305763f0477bc79a96c0144cba865e6b7fa59f2043 +SIZE (WerWolv-ImHex-1.6.0-v1.6.0_GH0.tar.gz) = 952054 Modified: head/editors/imhex/files/patch-CMakeLists.txt ============================================================================== --- head/editors/imhex/files/patch-CMakeLists.txt Sat Jan 9 03:17:21 2021 (r560831) +++ head/editors/imhex/files/patch-CMakeLists.txt Sat Jan 9 05:49:50 2021 (r560832) @@ -1,55 +1,15 @@ ---- CMakeLists.txt.orig 2020-12-06 20:40:57 UTC +--- CMakeLists.txt.orig 2021-01-08 19:12:16 UTC +++ CMakeLists.txt -@@ -10,23 +10,21 @@ set(CMAKE_CXX_STANDARD 20) +@@ -23,7 +23,11 @@ set(Python_FIND_FRAMEWORK NEVER) + + # Find packages find_package(PkgConfig REQUIRED) - pkg_search_module(GLFW REQUIRED glfw3) - pkg_search_module(GLM REQUIRED glm) -pkg_search_module(CRYPTO REQUIRED libcrypto) ++if (CMAKE_SYSTEM_NAME MATCHES FreeBSD) ++ find_library(CRYPTO crypto REQUIRED) ++else() ++ pkg_search_module(CRYPTO REQUIRED libcrypto) ++endif() pkg_search_module(CAPSTONE REQUIRED capstone) find_package(OpenGL REQUIRED) --find_package(LLVM REQUIRED CONFIG) find_package(nlohmann_json REQUIRED) - find_package(Python COMPONENTS Interpreter Development) - -+include(CheckCXXSymbolExists) -+check_cxx_symbol_exists(abi::__cxa_demangle "cxxabi.h" HAVE_CXXABI) -+ - if(Python_VERSION LESS 3) - message(STATUS ${PYTHON_VERSION_MAJOR_MINOR}) - message(FATAL_ERROR "No valid version of Python 3 was found.") - endif() - --llvm_map_components_to_libnames(_llvm_libs demangle) --llvm_expand_dependencies(llvm_libs ${_llvm_libs}) -+include_directories(include ${GLFW_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} libs/ImGui/include libs/glad/include ${Python_INCLUDE_DIRS}) - --include_directories(include ${GLFW_INCLUDE_DIRS} ${CAPSTONE_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS} libs/ImGui/include libs/glad/include ${Python_INCLUDE_DIRS}) -- - # Get Python major and minor - string(REPLACE "." ";" PYTHON_VERSION_MAJOR_MINOR ${Python_VERSION}) - list(REMOVE_AT PYTHON_VERSION_MAJOR_MINOR 2) -@@ -42,7 +40,7 @@ endif (WIN32) - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DRELEASE") - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG") - --add_executable(ImHex -+add_executable(imhex - source/main.cpp - source/window.cpp - -@@ -88,12 +86,10 @@ add_executable(ImHex - resource.rc - ) - --target_link_directories(ImHex PRIVATE ${LLVM_LIBRARY_DIR}) -- - if (WIN32) - target_link_libraries(ImHex libglfw3.a libgcc.a libstdc++.a libmagic.a libgnurx.a libtre.a libintl.a libiconv.a shlwapi.lib libcrypto.a libwinpthread.a libcapstone.a ${llvm_libs} ${Python_LIBRARIES} nlohmann_json::nlohmann_json) - endif (WIN32) - - if (UNIX) -- target_link_libraries(ImHex libglfw.so libmagic.so libcrypto.so libdl.so libcapstone.so ${llvm_libs} ${Python_LIBRARIES} nlohmann_json::nlohmann_json) --endif (UNIX) -\ No newline at end of file -+ target_link_libraries(imhex libglfw.so libmagic.so libcrypto.so libdl.so libcapstone.so ${Python_LIBRARIES} nlohmann_json::nlohmann_json) -+endif (UNIX) Modified: head/editors/imhex/files/patch-source_views_view__hexeditor.cpp ============================================================================== --- head/editors/imhex/files/patch-source_views_view__hexeditor.cpp Sat Jan 9 03:17:21 2021 (r560831) +++ head/editors/imhex/files/patch-source_views_view__hexeditor.cpp Sat Jan 9 05:49:50 2021 (r560832) @@ -1,13 +1,13 @@ ---- source/views/view_hexeditor.cpp.orig 2020-12-06 20:40:57 UTC +--- source/views/view_hexeditor.cpp.orig 2021-01-08 19:12:16 UTC +++ source/views/view_hexeditor.cpp @@ -13,6 +13,10 @@ #undef __STRICT_ANSI__ #include <cstdio> -+#if defined(__APPLE__) || defined(__FreeBSD__) ++#if defined(__FreeBSD__) + #define ftello64 ftell +#endif + namespace hex { - ViewHexEditor::ViewHexEditor(prv::Provider* &dataProvider, std::vector<lang::PatternData*> &patternData) + ViewHexEditor::ViewHexEditor(std::vector<lang::PatternData*> &patternData)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101090549.1095nosw031558>