diff options
| -rw-r--r-- | .SRCINFO | 22 | ||||
| -rw-r--r-- | 0001-makepkg-Remove-external-dependencies-check.patch | 24 | ||||
| -rw-r--r-- | 0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch | 18 | ||||
| -rw-r--r-- | 0003-Fix-capstone-include-path.patch | 29 | ||||
| -rw-r--r-- | PKGBUILD | 23 |
5 files changed, 43 insertions, 73 deletions
@@ -1,7 +1,7 @@ pkgbase = imhex pkgdesc = A Hex Editor for Reverse Engineers, Programmers and people that value their eye sight when working at 3 AM - pkgver = 1.14.0 - pkgrel = 2 + pkgver = 1.15.0 + pkgrel = 1 url = https://github.com/WerWolv/ImHex arch = x86_64 license = GPL2 @@ -22,41 +22,37 @@ pkgbase = imhex depends = openssl depends = yara depends = fmt - source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.14.0 + source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.15.0 source = nativefiledialog::git+https://github.com/btzy/nativefiledialog-extended.git source = xdgpp::git+https://git.sr.ht/~danyspin97/xdgpp source = libromfs::git+https://github.com/WerWolv/libromfs source = capstone::git+https://github.com/capstone-engine/capstone#branch=next source = 0001-makepkg-Remove-external-dependencies-check.patch source = 0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch - source = 0003-Fix-capstone-include-path.patch source = imhex.desktop cksums = SKIP cksums = SKIP cksums = SKIP cksums = SKIP cksums = SKIP - cksums = 3961896925 - cksums = 114465395 - cksums = 2337567663 + cksums = 1151937576 + cksums = 344235794 cksums = 4178124713 sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = 04bf8dca14ddf7d5e21ca5b657673e2a18b61d4209945322e8cae66d1bcc7fe3 - sha256sums = c6438cba236ddc69b31a69a800f9db9f842babf48484376f86745495daea9265 - sha256sums = 34cb39c53cdfcadce4b556fed1ced1a4280f2fb2a37db724cf112fd896965145 + sha256sums = bfbb880df13e850e3225953c1dec08cd48ce9b3397ba2be64172a14e42bc6f4f + sha256sums = a40f87f6e00e208c676459a6829d1f1fd2553df045d77c682e7966a77897bcb3 sha256sums = 72525512a241589cecd6141f32ad36cbe1b5b6f2629dd8ead0e37812321bdde6 b2sums = SKIP b2sums = SKIP b2sums = SKIP b2sums = SKIP b2sums = SKIP - b2sums = 8bbbb346abfab740e102720ba84eca9b8b3dc7925874d4623042a2d027d6b7644592e118c4f5ade8498f3232cc9bf393da208a97492b5a5de5d02a393be1f40e - b2sums = cc62ff2933d9cff5a501ee8b76e7d2f89676b1e3030b87157b3a655806bd0a95eb0ce022ab651cb91b40345e2c4b548b02b5ae8b270f4611596d95f96b197a80 - b2sums = a1b6fd1bf30fa982580790e4593cffb0670471be9df9eb2ac2415a5be22cd6c140b5ca46019a09f11815b1a1022b823f2f1771a150e5760a5d37f7513f2c36cf + b2sums = 0a62f91412a2aebc89cc3669b2fa50ce6dab4797b8c9ba0d07edc95930c3a1aeaa0f442a15c677ea056ea69151abb0a839d46cba00b2ac21f3b5694c23d49157 + b2sums = 4226c034528e3d7e06bdc93c67372f1c6173b9232f068f6ee3104632d0285c3249e18eb310352d070d2dc2be52e70715ac8d3742265fc3be1b10be0f99cc720c b2sums = 7b2d029de385fdc2536f57a4364add9752b9a5dc31df501e07bff1fd69fdd1de2afa19a5ac5a4c87fbf21c5d87cc96d3fe30d58825c050f5a7d25f6d85d08efc pkgname = imhex diff --git a/0001-makepkg-Remove-external-dependencies-check.patch b/0001-makepkg-Remove-external-dependencies-check.patch index 2b25ade7834b..05ca15df31c7 100644 --- a/0001-makepkg-Remove-external-dependencies-check.patch +++ b/0001-makepkg-Remove-external-dependencies-check.patch @@ -1,18 +1,19 @@ -From 8fad54e2c1e3a978abf3c15a75014d8e5e24d226 Mon Sep 17 00:00:00 2001 +From 1a6e81cbcafb7486beabfc7be597d2370fde4448 Mon Sep 17 00:00:00 2001 From: KokaKiwi <kokakiwi+git@kokakiwi.net> Date: Mon, 10 Jan 2022 15:47:10 +0100 -Subject: [PATCH 1/3] makepkg: Remove external dependencies check +Subject: [PATCH 1/2] makepkg: Remove external dependencies check --- CMakeLists.txt | 1 - cmake/build_helpers.cmake | 11 ----------- - 2 files changed, 12 deletions(-) + lib/external/libromfs | 2 +- + 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index ba7e9da..63268e5 100644 +index 59087df6..eb396e59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -11,7 +11,6 @@ include("${CMAKE_SOURCE_DIR}/cmake/build_helpers.cmake") +@@ -11,7 +11,6 @@ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake") # Make sure project is configured correctly setDefaultBuiltTypeIfUnset() @@ -21,16 +22,16 @@ index ba7e9da..63268e5 100644 # List plugin names here. Project name must match folder name set(PLUGINS diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake -index 8cbbdd9..d783265 100644 +index 6dcf890d..d1f0b3a6 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake -@@ -266,14 +266,3 @@ macro(setDefaultBuiltTypeIfUnset) +@@ -269,14 +269,3 @@ macro(setDefaultBuiltTypeIfUnset) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release") endif() endmacro() - -macro(detectBadClone) -- file (GLOB EXTERNAL_DIRS "external/*") +- file (GLOB EXTERNAL_DIRS "lib/external/*") - foreach (EXTERNAL_DIR ${EXTERNAL_DIRS}) - file(GLOB RESULT "${EXTERNAL_DIR}/*") - list(LENGTH RESULT ENTRY_COUNT) @@ -40,6 +41,13 @@ index 8cbbdd9..d783265 100644 - endforeach () -endmacro() \ No newline at end of file +diff --git a/lib/external/libromfs b/lib/external/libromfs +index 0842d22d..5d327344 160000 +--- a/lib/external/libromfs ++++ b/lib/external/libromfs +@@ -1 +1 @@ +-Subproject commit 0842d22deb13e036eb1fb15df368b6cad552abfe ++Subproject commit 5d3273443a47f4a2f295cc476b5266a84e836206 -- 2.35.1 diff --git a/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch b/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch index 25faaf43c2ce..cd5c25df4f5e 100644 --- a/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch +++ b/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch @@ -1,7 +1,7 @@ -From de0c264f425311abaf91aa461d53d91a1aac6072 Mon Sep 17 00:00:00 2001 +From 9e72afecf7c3418f6c42c72e7976845d0b13059e Mon Sep 17 00:00:00 2001 From: KokaKiwi <kokakiwi+git@kokakiwi.net> Date: Mon, 31 Jan 2022 20:20:40 +0100 -Subject: [PATCH 2/3] archlinux-compat: Remove unused mbedTLS code from libcurl +Subject: [PATCH 2/2] archlinux-compat: Remove unused mbedTLS code from libcurl usage --- @@ -9,7 +9,7 @@ Subject: [PATCH 2/3] archlinux-compat: Remove unused mbedTLS code from libcurl 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/lib/libimhex/source/helpers/net.cpp b/lib/libimhex/source/helpers/net.cpp -index af86328..9a1362e 100644 +index ee4905a9..3ab5ea12 100644 --- a/lib/libimhex/source/helpers/net.cpp +++ b/lib/libimhex/source/helpers/net.cpp @@ -7,8 +7,6 @@ @@ -47,12 +47,12 @@ index af86328..9a1362e 100644 curl_easy_setopt(this->m_ctx, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt(this->m_ctx, CURLOPT_NOPROGRESS, 0L); - -- #if defined(OS_WINDOWS) -- curl_easy_setopt(this->m_ctx, CURLOPT_CAINFO, nullptr); -- curl_easy_setopt(this->m_ctx, CURLOPT_CAPATH, nullptr); -- curl_easy_setopt(this->m_ctx, CURLOPT_SSLCERTTYPE, "PEM"); -- curl_easy_setopt(this->m_ctx, CURLOPT_SSL_CTX_FUNCTION, sslCtxFunction); -- #endif +-#if defined(OS_WINDOWS) +- curl_easy_setopt(this->m_ctx, CURLOPT_CAINFO, nullptr); +- curl_easy_setopt(this->m_ctx, CURLOPT_CAPATH, nullptr); +- curl_easy_setopt(this->m_ctx, CURLOPT_SSLCERTTYPE, "PEM"); +- curl_easy_setopt(this->m_ctx, CURLOPT_SSL_CTX_FUNCTION, sslCtxFunction); +-#endif } std::optional<i32> Net::execute() { diff --git a/0003-Fix-capstone-include-path.patch b/0003-Fix-capstone-include-path.patch deleted file mode 100644 index 7d91e53547e2..000000000000 --- a/0003-Fix-capstone-include-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 29b7ab56439379e00d805a93f36c81ee416100a1 Mon Sep 17 00:00:00 2001 -From: KokaKiwi <kokakiwi+git@kokakiwi.net> -Date: Mon, 31 Jan 2022 16:31:07 +0100 -Subject: [PATCH 3/3] Fix capstone include path - ---- - lib/libimhex/include/hex/helpers/disassembler.hpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/libimhex/include/hex/helpers/disassembler.hpp b/lib/libimhex/include/hex/helpers/disassembler.hpp -index 28168f6..dd6900b 100644 ---- a/lib/libimhex/include/hex/helpers/disassembler.hpp -+++ b/lib/libimhex/include/hex/helpers/disassembler.hpp -@@ -1,9 +1,9 @@ - #pragma once - --#if __has_include(<capstone/capstone.h>) -- #include <capstone/capstone.h> --#else -+#if __has_include(<capstone.h>) - #include <capstone.h> -+#else -+ #include <capstone/capstone.h> - #endif - #include <hex.hpp> - --- -2.35.1 - @@ -3,8 +3,8 @@ _pkgname=ImHex pkgname=${_pkgname,,} -pkgver=1.14.0 -pkgrel=2 +pkgver=1.15.0 +pkgrel=1 pkgdesc='A Hex Editor for Reverse Engineers, Programmers and people that value their eye sight when working at 3 AM' url='https://github.com/WerWolv/ImHex' license=('GPL2') @@ -20,34 +20,30 @@ source=("$pkgname::git+https://github.com/WerWolv/ImHex.git#tag=v$pkgver" "capstone::git+https://github.com/capstone-engine/capstone#branch=next" 0001-makepkg-Remove-external-dependencies-check.patch 0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch - 0003-Fix-capstone-include-path.patch imhex.desktop) cksums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' - '3961896925' - '114465395' - '2337567663' + '1151937576' + '344235794' '4178124713') sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' - '04bf8dca14ddf7d5e21ca5b657673e2a18b61d4209945322e8cae66d1bcc7fe3' - 'c6438cba236ddc69b31a69a800f9db9f842babf48484376f86745495daea9265' - '34cb39c53cdfcadce4b556fed1ced1a4280f2fb2a37db724cf112fd896965145' + 'bfbb880df13e850e3225953c1dec08cd48ce9b3397ba2be64172a14e42bc6f4f' + 'a40f87f6e00e208c676459a6829d1f1fd2553df045d77c682e7966a77897bcb3' '72525512a241589cecd6141f32ad36cbe1b5b6f2629dd8ead0e37812321bdde6') b2sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' - '8bbbb346abfab740e102720ba84eca9b8b3dc7925874d4623042a2d027d6b7644592e118c4f5ade8498f3232cc9bf393da208a97492b5a5de5d02a393be1f40e' - 'cc62ff2933d9cff5a501ee8b76e7d2f89676b1e3030b87157b3a655806bd0a95eb0ce022ab651cb91b40345e2c4b548b02b5ae8b270f4611596d95f96b197a80' - 'a1b6fd1bf30fa982580790e4593cffb0670471be9df9eb2ac2415a5be22cd6c140b5ca46019a09f11815b1a1022b823f2f1771a150e5760a5d37f7513f2c36cf' + '0a62f91412a2aebc89cc3669b2fa50ce6dab4797b8c9ba0d07edc95930c3a1aeaa0f442a15c677ea056ea69151abb0a839d46cba00b2ac21f3b5694c23d49157' + '4226c034528e3d7e06bdc93c67372f1c6173b9232f068f6ee3104632d0285c3249e18eb310352d070d2dc2be52e70715ac8d3742265fc3be1b10be0f99cc720c' '7b2d029de385fdc2536f57a4364add9752b9a5dc31df501e07bff1fd69fdd1de2afa19a5ac5a4c87fbf21c5d87cc96d3fe30d58825c050f5a7d25f6d85d08efc') prepare() { @@ -64,8 +60,7 @@ prepare() { git apply \ "$srcdir/0001-makepkg-Remove-external-dependencies-check.patch" \ - "$srcdir/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch" \ - "$srcdir/0003-Fix-capstone-include-path.patch" + "$srcdir/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch" } build() { |