diff options
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | 0001-makepkg-Fix-compiler-flags.patch | 2 | ||||
| -rw-r--r-- | 0002-makepkg-Fix-compiler-check.patch | 25 | ||||
| -rw-r--r-- | 0003-fix-Deduplicate-resources-directories.patch (renamed from 0002-fix-Deduplicate-resources-directories.patch) | 4 | ||||
| -rw-r--r-- | 0004-makepkg-Fix-build-with-clang.patch | 26 | ||||
| -rw-r--r-- | PKGBUILD | 30 |
6 files changed, 90 insertions, 21 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.21.0 - pkgrel = 1 + pkgrel = 2 url = https://imhex.werwolv.net arch = x86_64 license = GPL2 @@ -31,30 +31,38 @@ pkgbase = imhex source = capstone::git+https://github.com/capstone-engine/capstone#branch=next source = pattern_language::git+https://github.com/WerWolv/PatternLanguage#tag=ImHex-v1.21.0 source = 0001-makepkg-Fix-compiler-flags.patch - source = 0002-fix-Deduplicate-resources-directories.patch + source = 0002-makepkg-Fix-compiler-check.patch + source = 0003-fix-Deduplicate-resources-directories.patch + source = 0004-makepkg-Fix-build-with-clang.patch cksums = SKIP cksums = SKIP cksums = SKIP cksums = SKIP cksums = SKIP cksums = SKIP - cksums = 545604144 - cksums = 3160577462 + cksums = 1066455740 + cksums = 3728933864 + cksums = 3790563809 + cksums = 3339828254 sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = ac4bf097441311abb860c423521eba2fa152194d9294b10ef403bbd8eb6105a1 - sha256sums = 091a4824ceb3f1f5da5efc1ee6ac025b1ab9b56d07bd75bdb52fae71f7dec046 + sha256sums = 872a53436a9da0bcc37ecdca4d9d424cfe6be2a025f6e52f554893caba1a0e24 + sha256sums = 77bbee581bfdfcbca3c500aaeb5dc7a73e34aa242058ffea4ada32d9a84d21e4 + sha256sums = ebb93f6cd2f60dddeae1a1d2437587a32d5ab9e17dafd74bbea1545834e515e8 + sha256sums = 6131226f02f39d5161d4da92c55a622b617310c3296abe6c964f8658b61a4667 b2sums = SKIP b2sums = SKIP b2sums = SKIP b2sums = SKIP b2sums = SKIP b2sums = SKIP - b2sums = e52df3fc4629151b2156f4d75b13b1d7ac7bff07cebb151da391a3982c71608f7797a03cff5c560263ac46f32843f08b23437c31f9ef729e2e4ccc2bdb826900 - b2sums = 456edc844d9934be7fc7918ca15d82242df54563e400b6d58a20dd739793495834a9ac147517a2c88139926bef97f195849cd5a0b4b303cf452d4ef4317cb1af + b2sums = 20cb9b639996d3ae5c8b85e81cefd370a17f2a6e23e5bc29c642a24bb8ab3bc1ba3577d295817f632b48bc7109a330aa6ba86f3369e6630c64c04a75dc580bb2 + b2sums = 5cd535a49c396d0c05f6b6e832c04b28ebe51314331406be0159fc1a3301c0512330411707f8e302967d8bc7a62216b6ce583fd6224447a5251b9b74c2d731cc + b2sums = 18a081bbea1c6dc5b59243654a7b959140a4280c7736c8df8d720d5d3fcbfef4d5fa6c99635287b06ddf6411059071c8c9463e6ead74d411f95011e415e7c438 + b2sums = 11715a412414d9e6a31791508c45449f8a0570f9cfc51fcfcbff5b1bb4be765272c95b63fb22128be7e7e7066904802ede826230865decae5eef7837b13be531 pkgname = imhex diff --git a/0001-makepkg-Fix-compiler-flags.patch b/0001-makepkg-Fix-compiler-flags.patch index 85bd9e001d54..48b5c788af36 100644 --- a/0001-makepkg-Fix-compiler-flags.patch +++ b/0001-makepkg-Fix-compiler-flags.patch @@ -1,7 +1,7 @@ From 138bc84483e616f24be943c17ba67dce52561e42 Mon Sep 17 00:00:00 2001 From: KokaKiwi <kokakiwi+git@kokakiwi.net> Date: Mon, 8 Aug 2022 00:34:05 +0200 -Subject: [PATCH 1/2] makepkg: Fix compiler flags +Subject: [PATCH 1/4] makepkg: Fix compiler flags --- cmake/build_helpers.cmake | 10 +++++++--- diff --git a/0002-makepkg-Fix-compiler-check.patch b/0002-makepkg-Fix-compiler-check.patch new file mode 100644 index 000000000000..3643c0f3f6ed --- /dev/null +++ b/0002-makepkg-Fix-compiler-check.patch @@ -0,0 +1,25 @@ +From 874372b23468ca4bce29b12c9d08967df1240409 Mon Sep 17 00:00:00 2001 +From: KokaKiwi <kokakiwi+git@kokakiwi.net> +Date: Sun, 14 Aug 2022 23:01:45 +0200 +Subject: [PATCH 2/4] makepkg: Fix compiler check + +--- + cmake/build_helpers.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake +index 8ae42bfc..35061b7a 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() +-- +2.37.2 + diff --git a/0002-fix-Deduplicate-resources-directories.patch b/0003-fix-Deduplicate-resources-directories.patch index e57bb3fd01c6..bec7f18a5930 100644 --- a/0002-fix-Deduplicate-resources-directories.patch +++ b/0003-fix-Deduplicate-resources-directories.patch @@ -1,7 +1,7 @@ -From 8477deede059dfc3a3b413624914f9ed00840e9d Mon Sep 17 00:00:00 2001 +From 30ad30cf97a9633a14a8afbd5e136f0069ab04a3 Mon Sep 17 00:00:00 2001 From: KokaKiwi <kokakiwi+git@kokakiwi.net> Date: Sat, 11 Jun 2022 23:08:31 +0200 -Subject: [PATCH 2/2] fix: Deduplicate resources directories +Subject: [PATCH 3/4] fix: Deduplicate resources directories It seems to actually happens despite xdgpp already doing that... --- diff --git a/0004-makepkg-Fix-build-with-clang.patch b/0004-makepkg-Fix-build-with-clang.patch new file mode 100644 index 000000000000..1538e8d0c709 --- /dev/null +++ b/0004-makepkg-Fix-build-with-clang.patch @@ -0,0 +1,26 @@ +From dfb94cfa9256841c07f782ce1ac4faf39d089144 Mon Sep 17 00:00:00 2001 +From: KokaKiwi <kokakiwi+git@kokakiwi.net> +Date: Sun, 14 Aug 2022 23:59:30 +0200 +Subject: [PATCH 4/4] 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 + @@ -4,7 +4,7 @@ _pkgname=ImHex pkgname=${_pkgname,,} pkgver=1.21.0 -pkgrel=1 +pkgrel=2 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' license=('GPL2') @@ -23,31 +23,39 @@ 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-flags.patch - 0002-fix-Deduplicate-resources-directories.patch) + 0002-makepkg-Fix-compiler-check.patch + 0003-fix-Deduplicate-resources-directories.patch + 0004-makepkg-Fix-build-with-clang.patch) cksums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' - '545604144' - '3160577462') + '1066455740' + '3728933864' + '3790563809' + '3339828254') sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' - 'ac4bf097441311abb860c423521eba2fa152194d9294b10ef403bbd8eb6105a1' - '091a4824ceb3f1f5da5efc1ee6ac025b1ab9b56d07bd75bdb52fae71f7dec046') + '872a53436a9da0bcc37ecdca4d9d424cfe6be2a025f6e52f554893caba1a0e24' + '77bbee581bfdfcbca3c500aaeb5dc7a73e34aa242058ffea4ada32d9a84d21e4' + 'ebb93f6cd2f60dddeae1a1d2437587a32d5ab9e17dafd74bbea1545834e515e8' + '6131226f02f39d5161d4da92c55a622b617310c3296abe6c964f8658b61a4667') b2sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' - 'e52df3fc4629151b2156f4d75b13b1d7ac7bff07cebb151da391a3982c71608f7797a03cff5c560263ac46f32843f08b23437c31f9ef729e2e4ccc2bdb826900' - '456edc844d9934be7fc7918ca15d82242df54563e400b6d58a20dd739793495834a9ac147517a2c88139926bef97f195849cd5a0b4b303cf452d4ef4317cb1af') + '20cb9b639996d3ae5c8b85e81cefd370a17f2a6e23e5bc29c642a24bb8ab3bc1ba3577d295817f632b48bc7109a330aa6ba86f3369e6630c64c04a75dc580bb2' + '5cd535a49c396d0c05f6b6e832c04b28ebe51314331406be0159fc1a3301c0512330411707f8e302967d8bc7a62216b6ce583fd6224447a5251b9b74c2d731cc' + '18a081bbea1c6dc5b59243654a7b959140a4280c7736c8df8d720d5d3fcbfef4d5fa6c99635287b06ddf6411059071c8c9463e6ead74d411f95011e415e7c438' + '11715a412414d9e6a31791508c45449f8a0570f9cfc51fcfcbff5b1bb4be765272c95b63fb22128be7e7e7066904802ede826230865decae5eef7837b13be531') options=(!lto) prepare() { @@ -64,11 +72,13 @@ prepare() { git apply \ "$srcdir/0001-makepkg-Fix-compiler-flags.patch" \ - "$srcdir/0002-fix-Deduplicate-resources-directories.patch" + "$srcdir/0002-makepkg-Fix-compiler-check.patch" \ + "$srcdir/0003-fix-Deduplicate-resources-directories.patch" \ + "$srcdir/0004-makepkg-Fix-build-with-clang.patch" } build() { - export CXXFLAGS="$CXXFLAGS -Wno-inconsistent-missing-override -Wno-stringop-overflow" + export CXXFLAGS="$CXXFLAGS -Wno-inconsistent-missing-override" cmake -B build -S "$pkgname" \ -Wno-dev \ |