diff options
| -rw-r--r-- | .SRCINFO | 31 | ||||
| -rw-r--r-- | .gitignore | 17 | ||||
| -rw-r--r-- | 0001-makepkg-Remove-external-stuff.patch | 6 | ||||
| -rw-r--r-- | 0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch | 21 | ||||
| -rw-r--r-- | PKGBUILD | 42 | ||||
| -rw-r--r-- | libromfs-0001-Fix-code-generation-for-clang.patch | 35 |
6 files changed, 70 insertions, 82 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.16.2 - pkgrel = 2 + pkgver = 1.17.0 + pkgrel = 1 url = https://github.com/WerWolv/ImHex arch = x86_64 license = GPL2 @@ -20,44 +20,47 @@ pkgbase = imhex depends = gtk3 depends = hicolor-icon-theme depends = openssl - depends = yara depends = fmt optdepends = imhex-patterns-git: ImHex base patterns - source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.16.2 + source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.17.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 = pattern_language::git+https://github.com/WerWolv/PatternLanguage + source = yara::git+https://github.com/VirusTotal/yara#tag=v4.2.0 source = 0001-makepkg-Remove-external-stuff.patch source = 0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch - source = libromfs-0001-Fix-code-generation-for-clang.patch source = imhex.desktop cksums = SKIP cksums = SKIP cksums = SKIP cksums = SKIP cksums = SKIP - cksums = 948907946 - cksums = 345460920 - cksums = 2244423799 + cksums = SKIP + cksums = SKIP + cksums = 1548749629 + cksums = 3307749664 cksums = 4178124713 sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = 9135ba8227955249554983f680f0bbf3b5a615182f8913af1c5b0f8890a6c9dd - sha256sums = daf80fbf00f91a2dafa972c644fc5ab7fc43438e1a3d86515f7b1fa0e2ff1d13 - sha256sums = 5df68c1ee84ef55b07860b3b37120a21f488bbf9bff9466eb45fe81e537cd611 + sha256sums = SKIP + sha256sums = SKIP + sha256sums = 9969198e1130e4db97991006ce033cc94cb001e5088efbf3235d13b247c52604 + sha256sums = 781b1747305ba9692477b5237af166b4ce521ceaffb8d985378958e521923811 sha256sums = 72525512a241589cecd6141f32ad36cbe1b5b6f2629dd8ead0e37812321bdde6 b2sums = SKIP b2sums = SKIP b2sums = SKIP b2sums = SKIP b2sums = SKIP - b2sums = fe7d4248ab3cb04d7b78bd9b179a1fb06239c093c9960de30573e56bdddc0da993481e51fac5fad629510d0d75cac0b367ef1c8d23d58406fc5a1c4400920271 - b2sums = f694d8af5d577a5d3566efa70b391518d858ecb1743450e4c75a509ba9a5ee13a0de4b4bff260b569202d77a49d35bba4f04a25b105616b591775d93f29d6b4e - b2sums = faa552370acc478ab155125fc029049edab8d105496201ec3763dfa5af3dc71ab334bd53545231e172643d51a4470db1a3d3573de007590bd88efe5ebef2fb44 + b2sums = SKIP + b2sums = SKIP + b2sums = e3cadb16e6e98752fa7bd4db71352b0daa9726cb23017bd2115d353b9b8b435287c1b8e75bcc57baaa058cf42e8cb3dbf097d13224749fddaf670c001ac8361c + b2sums = 9be8392e2035f5438da66b87c7738ed4bdef83ae73145e35a5086655d0ebbaa87b4dae801d44d3cbdf6f39bbce879583aa1195b414d4afa519de28f3df1185bc b2sums = 7b2d029de385fdc2536f57a4364add9752b9a5dc31df501e07bff1fd69fdd1de2afa19a5ac5a4c87fbf21c5d87cc96d3fe30d58825c050f5a7d25f6d85d08efc pkgname = imhex diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..4a0ac4d123f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +# Modules +/capstone +/libromfs +/nativefiledialog +/pattern_language +/xdgpp +/yara + +# Package +/imhex +/src +/pkg +*.pkg.tar.* + +# Misc +.* +!.gitignore diff --git a/0001-makepkg-Remove-external-stuff.patch b/0001-makepkg-Remove-external-stuff.patch index ae247bcd73c9..1fce97f53194 100644 --- a/0001-makepkg-Remove-external-stuff.patch +++ b/0001-makepkg-Remove-external-stuff.patch @@ -1,4 +1,4 @@ -From 7181352cecb42eb22db278e63acdfa4899e6ca01 Mon Sep 17 00:00:00 2001 +From 8fb358f96beee2b8767c9c54a214bf1ee8f77471 Mon Sep 17 00:00:00 2001 From: KokaKiwi <kokakiwi+git@kokakiwi.net> Date: Thu, 3 Mar 2022 19:58:41 +0100 Subject: [PATCH 1/2] makepkg: Remove external stuff @@ -9,7 +9,7 @@ Subject: [PATCH 1/2] makepkg: Remove external stuff 2 files changed, 32 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index cb17250b..dfbbf5ca 100644 +index 5ba7b859..7d58d310 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,6 @@ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake") @@ -66,5 +66,5 @@ index 8fda5791..873525fb 100644 -endfunction() \ No newline at end of file -- -2.35.1 +2.35.3 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 a117051b67fb..afbadf8ff24a 100644 --- a/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch +++ b/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch @@ -1,15 +1,15 @@ -From 561b0358d5832416b0bbb1d81ba7e7f6bd04ffa1 Mon Sep 17 00:00:00 2001 +From 502c7a5bea8f35d9e5bacdf0d4f2e96845ad0240 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/2] archlinux-compat: Remove unused mbedTLS code from libcurl usage --- - lib/libimhex/source/helpers/net.cpp | 25 +------------------------ - 1 file changed, 1 insertion(+), 24 deletions(-) + lib/libimhex/source/helpers/net.cpp | 28 +--------------------------- + 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/lib/libimhex/source/helpers/net.cpp b/lib/libimhex/source/helpers/net.cpp -index 3201f330..8f333e27 100644 +index a0693534..96f60fea 100644 --- a/lib/libimhex/source/helpers/net.cpp +++ b/lib/libimhex/source/helpers/net.cpp @@ -7,8 +7,6 @@ @@ -21,11 +21,14 @@ index 3201f330..8f333e27 100644 #include <curl/curl.h> #include <nlohmann/json.hpp> -@@ -50,20 +48,6 @@ namespace hex { +@@ -44,23 +42,6 @@ namespace hex { return fwrite(contents, size, nmemb, file); } -- static CURLcode sslCtxFunction(CURL *ctx, void *sslctx, void *userdata) { +- [[maybe_unused]] +- static CURLcode sslCtxFunction(CURL *ctx, void *sslctx, void *userData) { +- hex::unused(ctx, userData); +- - auto *cfg = static_cast<mbedtls_ssl_config *>(sslctx); - - static mbedtls_x509_crt crt; @@ -42,7 +45,7 @@ index 3201f330..8f333e27 100644 int progressCallback(void *contents, curl_off_t dlTotal, curl_off_t dlNow, curl_off_t ulTotal, curl_off_t ulNow) { auto &net = *static_cast<Net *>(contents); -@@ -109,13 +93,6 @@ namespace hex { +@@ -106,13 +87,6 @@ namespace hex { curl_easy_setopt(this->m_ctx, CURLOPT_XFERINFOFUNCTION, progressCallback); curl_easy_setopt(this->m_ctx, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt(this->m_ctx, CURLOPT_NOPROGRESS, 0L); @@ -56,7 +59,7 @@ index 3201f330..8f333e27 100644 } std::optional<i32> Net::execute() { -@@ -244,4 +221,4 @@ namespace hex { +@@ -241,4 +215,4 @@ namespace hex { return {}; } @@ -64,5 +67,5 @@ index 3201f330..8f333e27 100644 \ No newline at end of file +} -- -2.35.1 +2.35.3 @@ -3,15 +3,15 @@ _pkgname=ImHex pkgname=${_pkgname,,} -pkgver=1.16.2 -pkgrel=2 +pkgver=1.17.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') arch=('x86_64') depends=('glfw' 'mbedtls' 'libssh2' 'python' 'freetype2' 'file' 'gtk3' 'hicolor-icon-theme' 'openssl' - 'yara' 'fmt') + 'fmt') makedepends=('git' 'cmake' 'glm' 'llvm' 'nlohmann-json' 'librsvg') optdepends=('imhex-patterns-git: ImHex base patterns') source=("$pkgname::git+https://github.com/WerWolv/ImHex.git#tag=v$pkgver" @@ -19,46 +19,51 @@ source=("$pkgname::git+https://github.com/WerWolv/ImHex.git#tag=v$pkgver" "xdgpp::git+https://git.sr.ht/~danyspin97/xdgpp" "libromfs::git+https://github.com/WerWolv/libromfs" "capstone::git+https://github.com/capstone-engine/capstone#branch=next" + "pattern_language::git+https://github.com/WerWolv/PatternLanguage" + "yara::git+https://github.com/VirusTotal/yara#tag=v4.2.0" 0001-makepkg-Remove-external-stuff.patch 0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch - libromfs-0001-Fix-code-generation-for-clang.patch imhex.desktop) cksums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' - '948907946' - '345460920' - '2244423799' + 'SKIP' + 'SKIP' + '1548749629' + '3307749664' '4178124713') sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' - '9135ba8227955249554983f680f0bbf3b5a615182f8913af1c5b0f8890a6c9dd' - 'daf80fbf00f91a2dafa972c644fc5ab7fc43438e1a3d86515f7b1fa0e2ff1d13' - '5df68c1ee84ef55b07860b3b37120a21f488bbf9bff9466eb45fe81e537cd611' + 'SKIP' + 'SKIP' + '9969198e1130e4db97991006ce033cc94cb001e5088efbf3235d13b247c52604' + '781b1747305ba9692477b5237af166b4ce521ceaffb8d985378958e521923811' '72525512a241589cecd6141f32ad36cbe1b5b6f2629dd8ead0e37812321bdde6') b2sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' - 'fe7d4248ab3cb04d7b78bd9b179a1fb06239c093c9960de30573e56bdddc0da993481e51fac5fad629510d0d75cac0b367ef1c8d23d58406fc5a1c4400920271' - 'f694d8af5d577a5d3566efa70b391518d858ecb1743450e4c75a509ba9a5ee13a0de4b4bff260b569202d77a49d35bba4f04a25b105616b591775d93f29d6b4e' - 'faa552370acc478ab155125fc029049edab8d105496201ec3763dfa5af3dc71ab334bd53545231e172643d51a4470db1a3d3573de007590bd88efe5ebef2fb44' + 'SKIP' + 'SKIP' + 'e3cadb16e6e98752fa7bd4db71352b0daa9726cb23017bd2115d353b9b8b435287c1b8e75bcc57baaa058cf42e8cb3dbf097d13224749fddaf670c001ac8361c' + '9be8392e2035f5438da66b87c7738ed4bdef83ae73145e35a5086655d0ebbaa87b4dae801d44d3cbdf6f39bbce879583aa1195b414d4afa519de28f3df1185bc' '7b2d029de385fdc2536f57a4364add9752b9a5dc31df501e07bff1fd69fdd1de2afa19a5ac5a4c87fbf21c5d87cc96d3fe30d58825c050f5a7d25f6d85d08efc') prepare() { cd "$pkgname" git submodule init - for name in nativefiledialog xdgpp libromfs capstone; do + for name in nativefiledialog xdgpp libromfs capstone pattern_language; do git config submodule.lib/external/$name.url "$srcdir/$name" done - for name in yara/yara fmt curl; do + git config submodule.lib/external/yara/yara.url "$srcdir/yara" + for name in fmt curl; do git config --remove-section submodule.lib/external/$name done git submodule update @@ -66,11 +71,6 @@ prepare() { git apply \ "$srcdir/0001-makepkg-Remove-external-stuff.patch" \ "$srcdir/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch" - - git -C lib/external/libromfs apply \ - "$srcdir/libromfs-0001-Fix-code-generation-for-clang.patch" || \ - git -C lib/external/libromfs apply -R --check \ - "$srcdir/libromfs-0001-Fix-code-generation-for-clang.patch" } build() { @@ -82,7 +82,7 @@ build() { -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_SKIP_RPATH=ON \ -D USE_SYSTEM_LLVM=ON \ - -D USE_SYSTEM_YARA=ON \ + -D USE_SYSTEM_YARA=OFF \ -D USE_SYSTEM_FMT=ON \ -D USE_SYSTEM_CURL=ON \ -D USE_SYSTEM_NLOHMANN_JSON=ON \ diff --git a/libromfs-0001-Fix-code-generation-for-clang.patch b/libromfs-0001-Fix-code-generation-for-clang.patch deleted file mode 100644 index 94b1fbd50948..000000000000 --- a/libromfs-0001-Fix-code-generation-for-clang.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a66bc647a335f175e817e60bc7eb0f310854c695 Mon Sep 17 00:00:00 2001 -From: KokaKiwi <kokakiwi+git@kokakiwi.net> -Date: Wed, 12 Jan 2022 14:11:50 +0100 -Subject: [PATCH] Fix code generation for clang - ---- - generator/include/embedder.hpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/generator/include/embedder.hpp b/generator/include/embedder.hpp -index 3b5ee69..460a9dc 100644 ---- a/generator/include/embedder.hpp -+++ b/generator/include/embedder.hpp -@@ -5,13 +5,13 @@ R"embedder( - - #define RESOURCE(name, path) \ - __asm__ ( \ -- ".global _" #name "\n" \ -- ".global _" #name "_size\n" \ -- "_" #name ":\n" \ -+ ".global " #name "\n" \ -+ ".global " #name "_size\n" \ -+ #name ":\n" \ - ".incbin \"" path "\"\n" \ - ".align 8\n" \ -- "_" #name "_size:\n" \ -- ".int _" #name "_size - _" #name " - 1\n" \ -+ #name "_size:\n" \ -+ ".int " #name "_size - " #name " - 1\n" \ - ".align 8\n" \ - ) - --- -2.35.1 - |