diff --git a/testing/imhex/APKBUILD b/testing/imhex/APKBUILD index 112375f2e6eb369b301a65d6f91721802ad44554..1df9a022da29aaa79df5a04d7ea67482040eb67f 100644 --- a/testing/imhex/APKBUILD +++ b/testing/imhex/APKBUILD @@ -1,17 +1,19 @@ # Contributor: George Hopkins <george-hopkins@null.net> # Maintainer: George Hopkins <george-hopkins@null.net> pkgname=imhex -pkgver=1.5.0 +pkgver=1.6.0 pkgrel=0 pkgdesc="Hex editor for reverse engineers and programmers" url="https://github.com/WerWolv/ImHex" arch="all !x86 !armhf !armv7 !mips" # See #11 license="GPL-2.0-or-later" options="!check" # No testsuite -makedepends="cmake capstone-dev file-dev glfw-dev glm-dev llvm10-dev - llvm10-static nlohmann-json openssl-dev python3-dev" +makedepends="cmake capstone-dev file-dev freetype-dev glfw-dev glm-dev + openssl-dev nlohmann-json python3-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/WerWolv/ImHex/archive/v$pkgver.tar.gz - install.patch" + force-release-flags.patch + version.patch + " builddir="$srcdir"/ImHex-$pkgver build() { @@ -25,5 +27,6 @@ package() { DESTDIR="$pkgdir" cmake --build build --target install } -sha512sums="5a5e6defc8bbf3fe1c2f1f210e77725279cc2f800fc6858780c9696ac6570297911da0c0a43b10e55f791e4b670ebe28bb41da2dcde8f5d23c19ac4c3f92063c imhex-1.5.0.tar.gz -6c59aaf4b9fa0e707301744244c441dd8f9a7a73bca844dcdb235a77606a90c5b144f4728e990a2511940f8a864abb038d8bd5b1ff81e6d36db91c7452fa9a40 install.patch" +sha512sums="5c4094fae6c5f4e2d68ad49a771c936bb581ac67a361c9b9fa1fcffded1106c78d4b946ba0a16f70af1943b8aefaf9679c35b0c3a069e4db844d970853757d90 imhex-1.6.0.tar.gz +46f2e8bfb1a7827dc2339ae5da97af5e26dfc09b38a935a82cfb590a93b3f980fadabf186cb236f5a972fd7ff56b865d9c0a3c7f1f350193deecbe1a04aabd71 force-release-flags.patch +17a96e9c57dbd0d0977e26080c11ee57a67825bc465cb98c21e3ea0b3de6f36992700082b3de83cb0922088cf2f447a38f45563dbd6d3c0866e194d1c2f6efcc version.patch" diff --git a/testing/imhex/force-release-flags.patch b/testing/imhex/force-release-flags.patch new file mode 100644 index 0000000000000000000000000000000000000000..08df2f7e55a1048b3967c40baf0756afd128f4ae --- /dev/null +++ b/testing/imhex/force-release-flags.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3a49b85..25ad587 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -91,8 +91,7 @@ execute_process( + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGIT_COMMIT_HASH=\"\\\"${GIT_COMMIT_HASH}\"\\\"") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGIT_BRANCH=\"\\\"${GIT_BRANCH}\"\\\"") + +-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DRELEASE -DIMHEX_VERSION=\"\\\"${PROJECT_VERSION}\"\\\"") +-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -DIMHEX_VERSION=\"\\\"${PROJECT_VERSION}-Debug\"\\\"") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DRELEASE -DIMHEX_VERSION=\"\\\"${PROJECT_VERSION}\"\\\"") + + if (WIN32) + set(application_type WIN32) diff --git a/testing/imhex/install.patch b/testing/imhex/install.patch deleted file mode 100644 index 418ea062c9371bfd217eb38d5bc781971396ab95..0000000000000000000000000000000000000000 --- a/testing/imhex/install.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt 2020-12-09 12:04:36.507435489 +0100 -+++ b/CMakeLists.txt 2020-12-09 12:54:11.939988738 +0100 -@@ -96,4 +96,8 @@ 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 -+endif (UNIX) -+ -+SET_TARGET_PROPERTIES(ImHex PROPERTIES OUTPUT_NAME imhex) -+ -+install(TARGETS ImHex DESTINATION bin) diff --git a/testing/imhex/version.patch b/testing/imhex/version.patch new file mode 100644 index 0000000000000000000000000000000000000000..b1b6df1e94c255dbb12876f697635c7fd4b5c67d --- /dev/null +++ b/testing/imhex/version.patch @@ -0,0 +1,24 @@ +From 02b3b9480485d46336db7c307dd1780d81c26876 Mon Sep 17 00:00:00 2001 +From: WerWolv <werwolv98@gmail.com> +Date: Fri, 8 Jan 2021 22:09:08 +0100 +Subject: [PATCH] Increased ImHex to version 1.6.0 + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3a49b85..709f570 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,6 @@ + cmake_minimum_required(VERSION 3.16) + +-project(imhex VERSION 1.5.0) ++project(imhex VERSION 1.6.0) + + if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Release" CACHE FORCE) +-- +2.17.1 +