diff options
-rw-r--r-- | .SRCINFO | 28 | ||||
-rw-r--r-- | 0001-makepkg-Fix-compiler-check.patch | 23 | ||||
-rw-r--r-- | 0002-fix-Deduplicate-resources-directories.patch (renamed from 0003-fix-Deduplicate-resources-directories.patch) | 10 | ||||
-rw-r--r-- | 0002-makepkg-Fix-build-with-clang.patch | 26 | ||||
-rw-r--r-- | PKGBUILD | 31 | ||||
-rw-r--r-- | pl-0001-Use-C-23-standard.patch (renamed from pl-0002-Use-C-23-standard.patch) | 8 | ||||
-rw-r--r-- | pl-0001-fix-Copy-elision-not-applying.patch | 25 |
7 files changed, 39 insertions, 112 deletions
@@ -1,6 +1,6 @@ pkgbase = imhex pkgdesc = A Hex Editor for Reverse Engineers, Programmers and people that value their eye sight when working at 3 AM - pkgver = 1.21.2 + pkgver = 1.22.0 pkgrel = 1 url = https://imhex.werwolv.net arch = x86_64 @@ -25,38 +25,32 @@ pkgbase = imhex optdepends = imhex-patterns-git: ImHex base patterns options = !lto options = !strip - source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.21.2 + source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.22.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#tag=ImHex-v1.21.2 + source = pattern_language::git+https://github.com/WerWolv/PatternLanguage#tag=ImHex-v1.22.0 source = 0001-makepkg-Fix-compiler-check.patch - source = 0002-makepkg-Fix-build-with-clang.patch - source = 0003-fix-Deduplicate-resources-directories.patch - source = pl-0001-fix-Copy-elision-not-applying.patch - source = pl-0002-Use-C-23-standard.patch + source = 0002-fix-Deduplicate-resources-directories.patch + source = pl-0001-Use-C-23-standard.patch sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = fe029ddb8ac99bd0cec7ee849ca597eb771a0be29e774afebe890997756d815d - sha256sums = 309c303817210ded39d0edaec5c2e9dee59f0a3a34e833227353bcd56931f439 - sha256sums = 9741c1e3d6c1786c335b578d0ecc68592e29c98c5b9e051257948cd3c137c339 - sha256sums = 1635946b85e0e228ed75a4e3f3231ddf99b8d3674c1d3cdb1be028571d8e6f57 - sha256sums = 94ada965ad0be7fe511b42e9f5726cd071385f43393aeaebfca71899aad32ed4 + sha256sums = 228d94e8f851b14f3fd58f9ad113440b8ed9c2a11eaaeb81f631a74a3813a210 + sha256sums = 8a6090179fde3abf336213021e2fa15f2b7ea57b6acaf9f0b91fee45fd479135 + sha256sums = 9b9c70facd7a017d561cdd14e73efed3f6026430560831e31a2afa640e8baff7 b2sums = SKIP b2sums = SKIP b2sums = SKIP b2sums = SKIP b2sums = SKIP b2sums = SKIP - b2sums = 4e7ad0db57425a05ed78eb5cfa600f1225db11e55ebc2cd399aaa37dd068b5a9fbbc30fc18b65190a3b59ad46393bdc57da79ce8306007c15f74874c6d7cb4e5 - b2sums = c3e7286f3673da385d89b9edc5af218fbdb6bb8465b599668bdfb9bf0d216eec67508302ded50a4d046825c2fafd2b77a71d0d4e4807713cdff5aa416e249140 - b2sums = deb706d01827ae67309d0a0341c79c2255166ba731632d0a29afcf875d57ac9885a5203de65fd9b0fa03ff13197af5a1fb1e1aba2e5a4904093a11e388c0d706 - b2sums = 973d4cf8472c132f7e470945bff1ea8afb113834913cce8bf553dd2f29c28a9e8b93f94b331443f2d5c350f1d6141677cda4f7d30e1bd4e547cb489fff435029 - b2sums = 029ac69a0824c61ce92a26eafe37e082c25bab633bf48b64b10b212e61b579bd7b35470bba901da5cf0068db28917a50d83140790aad44d28c8d5647e01cd473 + b2sums = d6028eb5098a2a6209b1f5c9840a0949afd366258eacbe5c8f335d5d3bb382df969b63cd7cfbb11124d215a1eb0c3b297d0754119eed1a7f28207343235ddda9 + b2sums = 541c17e9d9cf3f0471092187f9ce804c9e28031cbb76901d35a6390b8753b927697516168e8414fc0ad3ca12e3d5de5bffdda3e0de93d50903e98123c6aad073 + b2sums = 1623828330a814cf3ae19c95709e313ddd4f8477e8d794c042b6dbedde4200a278843b51a19d0c7483e4d231a9669d24ef864be59a125f02f2a1ff57c72265d0 pkgname = imhex diff --git a/0001-makepkg-Fix-compiler-check.patch b/0001-makepkg-Fix-compiler-check.patch index 57a04849a506..cfa901d7be78 100644 --- a/0001-makepkg-Fix-compiler-check.patch +++ b/0001-makepkg-Fix-compiler-check.patch @@ -1,26 +1,17 @@ -From c5e69f9670f8b6e5d6f223c312807f2ecd204493 Mon Sep 17 00:00:00 2001 +From c9b234ce108b15bd3b10383af62d19fbc2d72b5d Mon Sep 17 00:00:00 2001 From: KokaKiwi <kokakiwi+git@kokakiwi.net> Date: Sun, 14 Aug 2022 23:01:45 +0200 -Subject: [PATCH 1/3] makepkg: Fix compiler check +Subject: [PATCH 1/2] makepkg: Fix compiler check --- - cmake/build_helpers.cmake | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) + cmake/build_helpers.cmake | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake -index e46ffa5e..c7aa712c 100644 +index 638f17a7..c65e1816 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake -@@ -344,7 +344,7 @@ function(verifyCompiler) - message(FATAL_ERROR "ImHex requires GCC 12.0.0 or newer. Please use the latest GCC version.") - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "14.0.0") - message(FATAL_ERROR "ImHex requires Clang 14.0.0 or newer. Please use the latest Clang version.") -- elseif (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") -+ elseif (NOT (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")) - message(FATAL_ERROR "ImHex can only be compiled with GCC or Clang. ${CMAKE_CXX_COMPILER_ID} is not supported.") - endif() - endfunction() -@@ -384,10 +384,14 @@ function(downloadImHexPatternsFiles dest) +@@ -391,10 +391,14 @@ function(downloadImHexPatternsFiles dest) endfunction() macro(setupCompilerWarnings target) @@ -40,5 +31,5 @@ index e46ffa5e..c7aa712c 100644 \ No newline at end of file +endmacro() -- -2.37.2 +2.37.3 diff --git a/0003-fix-Deduplicate-resources-directories.patch b/0002-fix-Deduplicate-resources-directories.patch index 30fb38235974..59e63996ca8d 100644 --- a/0003-fix-Deduplicate-resources-directories.patch +++ b/0002-fix-Deduplicate-resources-directories.patch @@ -1,7 +1,7 @@ -From 013aed0e9131461157c199edfd9565a82657f293 Mon Sep 17 00:00:00 2001 +From c4ddb152eeb58598cc060f4d93ae7aed231723fe Mon Sep 17 00:00:00 2001 From: KokaKiwi <kokakiwi+git@kokakiwi.net> Date: Sat, 11 Jun 2022 23:08:31 +0200 -Subject: [PATCH 3/3] fix: Deduplicate resources directories +Subject: [PATCH 2/2] fix: Deduplicate resources directories It seems to actually happens despite xdgpp already doing that... --- @@ -10,10 +10,10 @@ It seems to actually happens despite xdgpp already doing that... 2 files changed, 16 insertions(+) diff --git a/lib/libimhex/include/hex/helpers/utils.hpp b/lib/libimhex/include/hex/helpers/utils.hpp -index f5666254..5d86768a 100644 +index b2edc4ff..9f0a66d2 100644 --- a/lib/libimhex/include/hex/helpers/utils.hpp +++ b/lib/libimhex/include/hex/helpers/utils.hpp -@@ -189,6 +189,17 @@ namespace hex { +@@ -199,6 +199,17 @@ namespace hex { return result; } @@ -60,5 +60,5 @@ index dc58ced3..5c346ec8 100644 #endif } -- -2.37.2 +2.37.3 diff --git a/0002-makepkg-Fix-build-with-clang.patch b/0002-makepkg-Fix-build-with-clang.patch deleted file mode 100644 index 86dc4ffce2fd..000000000000 --- a/0002-makepkg-Fix-build-with-clang.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 63d0b8a6e2abe14f4d1947cc9ef9b2905f117801 Mon Sep 17 00:00:00 2001 -From: KokaKiwi <kokakiwi+git@kokakiwi.net> -Date: Sun, 14 Aug 2022 23:59:30 +0200 -Subject: [PATCH 2/3] makepkg: Fix build with clang - -clang does not support some C++20 features ---- - lib/libimhex/include/hex/data_processor/node.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/libimhex/include/hex/data_processor/node.hpp b/lib/libimhex/include/hex/data_processor/node.hpp -index c5fcde80..1a5d9fde 100644 ---- a/lib/libimhex/include/hex/data_processor/node.hpp -+++ b/lib/libimhex/include/hex/data_processor/node.hpp -@@ -90,7 +90,7 @@ namespace hex::dp { - - protected: - [[noreturn]] void throwNodeError(const std::string &message) { -- throw NodeError(this, message); -+ throw NodeError { this, message }; - } - - std::vector<u8> getBufferOnInput(u32 index); --- -2.37.2 - @@ -3,7 +3,7 @@ _pkgname=ImHex pkgname=${_pkgname,,} -pkgver=1.21.2 +pkgver=1.22.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://imhex.werwolv.net' @@ -23,32 +23,26 @@ source=("$pkgname::git+https://github.com/WerWolv/ImHex.git#tag=v$pkgver" "capstone::git+https://github.com/capstone-engine/capstone#branch=next" "pattern_language::git+https://github.com/WerWolv/PatternLanguage#tag=ImHex-v$pkgver" 0001-makepkg-Fix-compiler-check.patch - 0002-makepkg-Fix-build-with-clang.patch - 0003-fix-Deduplicate-resources-directories.patch - pl-0001-fix-Copy-elision-not-applying.patch - pl-0002-Use-C-23-standard.patch) + 0002-fix-Deduplicate-resources-directories.patch + pl-0001-Use-C-23-standard.patch) sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' - 'fe029ddb8ac99bd0cec7ee849ca597eb771a0be29e774afebe890997756d815d' - '309c303817210ded39d0edaec5c2e9dee59f0a3a34e833227353bcd56931f439' - '9741c1e3d6c1786c335b578d0ecc68592e29c98c5b9e051257948cd3c137c339' - '1635946b85e0e228ed75a4e3f3231ddf99b8d3674c1d3cdb1be028571d8e6f57' - '94ada965ad0be7fe511b42e9f5726cd071385f43393aeaebfca71899aad32ed4') + '228d94e8f851b14f3fd58f9ad113440b8ed9c2a11eaaeb81f631a74a3813a210' + '8a6090179fde3abf336213021e2fa15f2b7ea57b6acaf9f0b91fee45fd479135' + '9b9c70facd7a017d561cdd14e73efed3f6026430560831e31a2afa640e8baff7') b2sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' - '4e7ad0db57425a05ed78eb5cfa600f1225db11e55ebc2cd399aaa37dd068b5a9fbbc30fc18b65190a3b59ad46393bdc57da79ce8306007c15f74874c6d7cb4e5' - 'c3e7286f3673da385d89b9edc5af218fbdb6bb8465b599668bdfb9bf0d216eec67508302ded50a4d046825c2fafd2b77a71d0d4e4807713cdff5aa416e249140' - 'deb706d01827ae67309d0a0341c79c2255166ba731632d0a29afcf875d57ac9885a5203de65fd9b0fa03ff13197af5a1fb1e1aba2e5a4904093a11e388c0d706' - '973d4cf8472c132f7e470945bff1ea8afb113834913cce8bf553dd2f29c28a9e8b93f94b331443f2d5c350f1d6141677cda4f7d30e1bd4e547cb489fff435029' - '029ac69a0824c61ce92a26eafe37e082c25bab633bf48b64b10b212e61b579bd7b35470bba901da5cf0068db28917a50d83140790aad44d28c8d5647e01cd473') + 'd6028eb5098a2a6209b1f5c9840a0949afd366258eacbe5c8f335d5d3bb382df969b63cd7cfbb11124d215a1eb0c3b297d0754119eed1a7f28207343235ddda9' + '541c17e9d9cf3f0471092187f9ce804c9e28031cbb76901d35a6390b8753b927697516168e8414fc0ad3ca12e3d5de5bffdda3e0de93d50903e98123c6aad073' + '1623828330a814cf3ae19c95709e313ddd4f8477e8d794c042b6dbedde4200a278843b51a19d0c7483e4d231a9669d24ef864be59a125f02f2a1ff57c72265d0') options=(!lto !strip) prepare() { @@ -65,12 +59,10 @@ prepare() { git apply \ "$srcdir/0001-makepkg-Fix-compiler-check.patch" \ - "$srcdir/0002-makepkg-Fix-build-with-clang.patch" \ - "$srcdir/0003-fix-Deduplicate-resources-directories.patch" + "$srcdir/0002-fix-Deduplicate-resources-directories.patch" git -C lib/external/pattern_language apply \ - "$srcdir/pl-0001-fix-Copy-elision-not-applying.patch" \ - "$srcdir/pl-0002-Use-C-23-standard.patch" + "$srcdir/pl-0001-Use-C-23-standard.patch" } build() { @@ -90,6 +82,7 @@ build() { -D USE_SYSTEM_CURL=ON \ -D USE_SYSTEM_NLOHMANN_JSON=ON \ -D USE_SYSTEM_CAPSTONE=OFF \ + -D LIBPL_ENABLE_CLI=OFF \ -D IMHEX_VERSION="$pkgver" make -C build diff --git a/pl-0002-Use-C-23-standard.patch b/pl-0001-Use-C-23-standard.patch index 254ec77998e5..296cffff4aa3 100644 --- a/pl-0002-Use-C-23-standard.patch +++ b/pl-0001-Use-C-23-standard.patch @@ -1,14 +1,14 @@ -From 5a5a97b49ff7fb6dc3786917f59322df67e42816 Mon Sep 17 00:00:00 2001 +From ad63c8c5217cc5767c55cc289b20a6857ce9eeef Mon Sep 17 00:00:00 2001 From: KokaKiwi <kokakiwi+git@kokakiwi.net> Date: Thu, 18 Aug 2022 00:57:02 +0200 -Subject: [PATCH 2/2] Use C++23 standard +Subject: [PATCH] Use C++23 standard --- lib/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 5822e0a..11511ba 100644 +index 8fb4265..00af7f1 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,7 +1,7 @@ @@ -22,5 +22,5 @@ index 5822e0a..11511ba 100644 if (LIBPL_SHARED_LIBRARY) set(LIBRARY_TYPE SHARED) -- -2.37.2 +2.37.3 diff --git a/pl-0001-fix-Copy-elision-not-applying.patch b/pl-0001-fix-Copy-elision-not-applying.patch deleted file mode 100644 index 4b60258be8b0..000000000000 --- a/pl-0001-fix-Copy-elision-not-applying.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 90241ef46d52fb00f3941b526a9b4d20d9170ef0 Mon Sep 17 00:00:00 2001 -From: WerWolv <werwolv98@gmail.com> -Date: Thu, 18 Aug 2022 00:23:31 +0200 -Subject: [PATCH 1/2] fix: Copy elision not applying - ---- - lib/source/pl/core/evaluator.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/source/pl/core/evaluator.cpp b/lib/source/pl/core/evaluator.cpp -index 37e7168..0bc9133 100644 ---- a/lib/source/pl/core/evaluator.cpp -+++ b/lib/source/pl/core/evaluator.cpp -@@ -59,7 +59,7 @@ namespace pl::core { - - pattern->setVariableName(name); - -- variables.push_back(std::move(std::unique_ptr<ptrn::Pattern>(pattern))); -+ variables.push_back(std::unique_ptr<ptrn::Pattern>(pattern)); - } - - void Evaluator::createVariable(const std::string &name, ast::ASTNode *type, const std::optional<Token::Literal> &value, bool outVariable) { --- -2.37.2 - |