diff options
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | 0001-makepkg-Remove-external-stuff.patch | 2 | ||||
| -rw-r--r-- | 0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch | 2 | ||||
| -rw-r--r-- | 0003-fix-Build-errors-with-GCC-12.1.0.patch | 2 | ||||
| -rw-r--r-- | 0004-fix-Deduplicate-resources-directories.patch | 56 | ||||
| -rw-r--r-- | PKGBUILD | 27 |
6 files changed, 89 insertions, 24 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.18.2 - pkgrel = 1 + pkgrel = 2 url = https://github.com/WerWolv/ImHex arch = x86_64 license = GPL2 @@ -33,6 +33,7 @@ pkgbase = imhex source = 0001-makepkg-Remove-external-stuff.patch source = 0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch source = 0003-fix-Build-errors-with-GCC-12.1.0.patch + source = 0004-fix-Deduplicate-resources-directories.patch source = imhex.desktop cksums = SKIP cksums = SKIP @@ -40,9 +41,10 @@ pkgbase = imhex cksums = SKIP cksums = SKIP cksums = SKIP - cksums = 3374949146 - cksums = 3561209881 - cksums = 1302454653 + cksums = 3601631476 + cksums = 4179823382 + cksums = 3168205901 + cksums = 3422557331 cksums = 4178124713 sha256sums = SKIP sha256sums = SKIP @@ -50,9 +52,10 @@ pkgbase = imhex sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = 0bfff0f03fa8ffe312162e7d43c0c0feb8aaa332e15c497c95fffc6704169c8f - sha256sums = 82a1b0e4e1f02a998eb178dfc0cf75ad9c6b4ca9819cbe0f90d3c65ed07a367d - sha256sums = cee653d96a96df1792977ab1509cd7cb94c2d10b20540a7ffca75f8e0ebcc847 + sha256sums = 336cd1a05bb0604719ff1f6b81a0db66f450f26c3942bab9e3d6fb9e7d0d6f21 + sha256sums = 6c7025b9223d53b4f9ac558467caa51a50ab996bc8e240a27d014f493df103f0 + sha256sums = b48628ac32bea0fc8797100c41da1c9471d7f30045dba773243af1f2d6d62ab3 + sha256sums = 784bc7b1a6ce2292232521bfaa9efd185fc36b6f6265ae382e9e8489de109706 sha256sums = 72525512a241589cecd6141f32ad36cbe1b5b6f2629dd8ead0e37812321bdde6 b2sums = SKIP b2sums = SKIP @@ -60,9 +63,10 @@ pkgbase = imhex b2sums = SKIP b2sums = SKIP b2sums = SKIP - b2sums = fe6432359f2ab2b7ad9d7541e96d46ab3113999c743bd46b021bc67247ea64d9b409b62580a8ffc857cbee7896c6bf0aeae5cb031c14901655d6a2be30ce3aa5 - b2sums = a7e624148a9a0cd7617626fb2c6b07c2c6354bc1b0b09d31c93ea7b5dc9058e11a304da03a9b85d9483aea4b874d2ef3b346fec0da8e8df04fcec8bb9430c266 - b2sums = 0de6ce0c2ed58839815571a5f747d8a726893b7daf3898fc338cd46834ce697bb42dd88ea71d5be1fee6c13dabc68f4c431fc67d9339fe7eeda515bb2bb71c14 + b2sums = 3a2e8c935f5969269535cac4c1a4fecf321911bc122db0fa2c6e86644a5dc9a6fbfc4d2da61e6b0d917ff2e13713da3912cdb121812fda0e30e88246d11fbdc2 + b2sums = 4958ecf7ccbb9af1daa5adc8f668832ae510c8f3d070eff19e9704252a20eae8c4b37b3d1609efd9832ee5cdc7a54ec726e543e80bdaf8774753774d9fa4641c + b2sums = ed121547ba4412600e3049ece962bcfdf72e2c9febc846165dc50492a7a6f1771660cd5b1b3417c1118f8ebb67be0c760961aa09d05a89bea14c70c761dd06b2 + b2sums = e538cd745e6cc4bb7997230652dccb16f2372fe5ecb33c9613cdbb5a02e3e2887943b420aa71b817b7024931aac580b09c3bf5f91ab4f361ec5eda27414b7ba1 b2sums = 7b2d029de385fdc2536f57a4364add9752b9a5dc31df501e07bff1fd69fdd1de2afa19a5ac5a4c87fbf21c5d87cc96d3fe30d58825c050f5a7d25f6d85d08efc pkgname = imhex diff --git a/0001-makepkg-Remove-external-stuff.patch b/0001-makepkg-Remove-external-stuff.patch index e8b5c1fa5518..91afc203efa9 100644 --- a/0001-makepkg-Remove-external-stuff.patch +++ b/0001-makepkg-Remove-external-stuff.patch @@ -1,7 +1,7 @@ From 2265e21cd475ea98aca60ac064f428f52eab622c 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/3] makepkg: Remove external stuff +Subject: [PATCH 1/4] makepkg: Remove external stuff --- CMakeLists.txt | 4 ---- 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 860842134234..04931d4d9346 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 a775d4d8db350a0db34270183cc9d22d6c0580b4 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/4] archlinux-compat: Remove unused mbedTLS code from libcurl usage --- diff --git a/0003-fix-Build-errors-with-GCC-12.1.0.patch b/0003-fix-Build-errors-with-GCC-12.1.0.patch index a46483bae403..f11b597266c4 100644 --- a/0003-fix-Build-errors-with-GCC-12.1.0.patch +++ b/0003-fix-Build-errors-with-GCC-12.1.0.patch @@ -1,7 +1,7 @@ From ca88340ab05fd46956e706a5c18000bdcaf27278 Mon Sep 17 00:00:00 2001 From: KokaKiwi <kokakiwi+git@kokakiwi.net> Date: Tue, 24 May 2022 15:27:25 +0200 -Subject: [PATCH 3/3] fix: Build errors with GCC 12.1.0 +Subject: [PATCH 3/4] fix: Build errors with GCC 12.1.0 --- lib/libimhex/source/helpers/encoding_file.cpp | 4 ++-- diff --git a/0004-fix-Deduplicate-resources-directories.patch b/0004-fix-Deduplicate-resources-directories.patch new file mode 100644 index 000000000000..717bb4be0b6a --- /dev/null +++ b/0004-fix-Deduplicate-resources-directories.patch @@ -0,0 +1,56 @@ +From 3e8d62c24299b0da988d3d68d7462c17f02e26af Mon Sep 17 00:00:00 2001 +From: KokaKiwi <kokakiwi+git@kokakiwi.net> +Date: Sat, 11 Jun 2022 23:08:31 +0200 +Subject: [PATCH 4/4] fix: Deduplicate resources directories + +It seems to actually happens despite xdgpp already doing that... +--- + lib/libimhex/include/hex/helpers/utils.hpp | 11 +++++++++++ + lib/libimhex/source/helpers/fs.cpp | 4 ++++ + 2 files changed, 15 insertions(+) + +diff --git a/lib/libimhex/include/hex/helpers/utils.hpp b/lib/libimhex/include/hex/helpers/utils.hpp +index b20be7ae..8b122797 100644 +--- a/lib/libimhex/include/hex/helpers/utils.hpp ++++ b/lib/libimhex/include/hex/helpers/utils.hpp +@@ -234,6 +234,17 @@ namespace hex { + return result; + } + ++ template<typename T> ++ void deduplicateVector(std::vector<T> &items) { ++ auto end = items.end(); ++ ++ for (auto it = items.begin(); it != end; ++it) { ++ end = std::remove(it + 1, end, *it); ++ } ++ ++ items.erase(end, items.end()); ++ } ++ + std::vector<std::string> splitString(const std::string &string, const std::string &delimiter); + std::string combineStrings(const std::vector<std::string> &strings, const std::string &delimiter = ""); + +diff --git a/lib/libimhex/source/helpers/fs.cpp b/lib/libimhex/source/helpers/fs.cpp +index bbd8e641..c6f1f46d 100644 +--- a/lib/libimhex/source/helpers/fs.cpp ++++ b/lib/libimhex/source/helpers/fs.cpp +@@ -1,4 +1,5 @@ + #include <hex/helpers/fs.hpp> ++#include <hex/helpers/utils.hpp> + + #include <hex/api/content_registry.hpp> + #include <hex/helpers/fs_macos.h> +@@ -242,6 +243,9 @@ namespace hex::fs { + if (exePath && !exePath->empty()) + dataDirs.push_back(exePath->parent_path()); + ++ hex::deduplicateVector(configDirs); ++ hex::deduplicateVector(dataDirs); ++ + switch (path) { + case ImHexPath::Patterns: + addUserDirs(dataDirs); +-- +2.36.1 + @@ -4,7 +4,7 @@ _pkgname=ImHex pkgname=${_pkgname,,} pkgver=1.18.2 -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://github.com/WerWolv/ImHex' license=('GPL2') @@ -23,6 +23,7 @@ source=("$pkgname::git+https://github.com/WerWolv/ImHex.git#tag=v$pkgver" 0001-makepkg-Remove-external-stuff.patch 0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch 0003-fix-Build-errors-with-GCC-12.1.0.patch + 0004-fix-Deduplicate-resources-directories.patch imhex.desktop) cksums=('SKIP' 'SKIP' @@ -30,9 +31,10 @@ cksums=('SKIP' 'SKIP' 'SKIP' 'SKIP' - '3374949146' - '3561209881' - '1302454653' + '3601631476' + '4179823382' + '3168205901' + '3422557331' '4178124713') sha256sums=('SKIP' 'SKIP' @@ -40,9 +42,10 @@ sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' - '0bfff0f03fa8ffe312162e7d43c0c0feb8aaa332e15c497c95fffc6704169c8f' - '82a1b0e4e1f02a998eb178dfc0cf75ad9c6b4ca9819cbe0f90d3c65ed07a367d' - 'cee653d96a96df1792977ab1509cd7cb94c2d10b20540a7ffca75f8e0ebcc847' + '336cd1a05bb0604719ff1f6b81a0db66f450f26c3942bab9e3d6fb9e7d0d6f21' + '6c7025b9223d53b4f9ac558467caa51a50ab996bc8e240a27d014f493df103f0' + 'b48628ac32bea0fc8797100c41da1c9471d7f30045dba773243af1f2d6d62ab3' + '784bc7b1a6ce2292232521bfaa9efd185fc36b6f6265ae382e9e8489de109706' '72525512a241589cecd6141f32ad36cbe1b5b6f2629dd8ead0e37812321bdde6') b2sums=('SKIP' 'SKIP' @@ -50,9 +53,10 @@ b2sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' - 'fe6432359f2ab2b7ad9d7541e96d46ab3113999c743bd46b021bc67247ea64d9b409b62580a8ffc857cbee7896c6bf0aeae5cb031c14901655d6a2be30ce3aa5' - 'a7e624148a9a0cd7617626fb2c6b07c2c6354bc1b0b09d31c93ea7b5dc9058e11a304da03a9b85d9483aea4b874d2ef3b346fec0da8e8df04fcec8bb9430c266' - '0de6ce0c2ed58839815571a5f747d8a726893b7daf3898fc338cd46834ce697bb42dd88ea71d5be1fee6c13dabc68f4c431fc67d9339fe7eeda515bb2bb71c14' + '3a2e8c935f5969269535cac4c1a4fecf321911bc122db0fa2c6e86644a5dc9a6fbfc4d2da61e6b0d917ff2e13713da3912cdb121812fda0e30e88246d11fbdc2' + '4958ecf7ccbb9af1daa5adc8f668832ae510c8f3d070eff19e9704252a20eae8c4b37b3d1609efd9832ee5cdc7a54ec726e543e80bdaf8774753774d9fa4641c' + 'ed121547ba4412600e3049ece962bcfdf72e2c9febc846165dc50492a7a6f1771660cd5b1b3417c1118f8ebb67be0c760961aa09d05a89bea14c70c761dd06b2' + 'e538cd745e6cc4bb7997230652dccb16f2372fe5ecb33c9613cdbb5a02e3e2887943b420aa71b817b7024931aac580b09c3bf5f91ab4f361ec5eda27414b7ba1' '7b2d029de385fdc2536f57a4364add9752b9a5dc31df501e07bff1fd69fdd1de2afa19a5ac5a4c87fbf21c5d87cc96d3fe30d58825c050f5a7d25f6d85d08efc') options=(!lto) @@ -71,7 +75,8 @@ prepare() { git apply \ "$srcdir/0001-makepkg-Remove-external-stuff.patch" \ "$srcdir/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch" \ - "$srcdir/0003-fix-Build-errors-with-GCC-12.1.0.patch" + "$srcdir/0003-fix-Build-errors-with-GCC-12.1.0.patch" \ + "$srcdir/0004-fix-Deduplicate-resources-directories.patch" } build() { |