summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKokaKiwi2023-04-04 15:34:45 +0200
committerKokaKiwi2023-04-04 15:34:45 +0200
commitf2757dfe17084b8bf64567830f499604c2a57b30 (patch)
tree7bf2e0b9842ddafe107a26d1157c82bf28e460e9
parent3df7965147d80a70413fb5dad794b0d4d0159e22 (diff)
downloadaur-f2757dfe17084b8bf64567830f499604c2a57b30.tar.gz
upgpkg: imhex 1.28.0-1
upstream release
Diffstat
-rw-r--r--.SRCINFO21
-rw-r--r--0001-makepkg-Fix-compiler-check.patch68
-rw-r--r--PKGBUILD26
-rw-r--r--pl-0001-Use-C-23-standard.patch6
-rw-r--r--pl-0002-makepkg-Remove-extraneous-compiler-flags.patch28
5 files changed, 110 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f14d5dec1cc1..855124f0b824 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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.27.1
+ pkgver = 1.28.0
pkgrel = 1
url = https://imhex.werwolv.net
arch = x86_64
@@ -25,12 +25,13 @@ pkgbase = imhex
optdepends = imhex-patterns-git: ImHex base patterns
options = !lto
options = !strip
- source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.27.1
+ source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.28.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.27.1
+ source = libwolv::git+https://github.com/WerWolv/libwolv
+ source = pattern_language::git+https://github.com/WerWolv/PatternLanguage#tag=ImHex-v1.28.0
source = 0001-makepkg-Fix-compiler-check.patch
source = pl-0001-Use-C-23-standard.patch
source = pl-0002-makepkg-Remove-extraneous-compiler-flags.patch
@@ -40,17 +41,19 @@ pkgbase = imhex
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = b85e294923db8ef8688e388800ebc384fe75da3cfad13029e421d858f7ec9fc4
- sha256sums = 220c8477d1dbdd9ae34f438aec63cca2d8431d012a82873bd648b5c9d396c3c1
- sha256sums = cf24fc2ae2e4fd72afac855f66f39ee6ea8ca4a551f2ec6671ddd611daa49a3a
+ sha256sums = SKIP
+ sha256sums = 43bdbbb6edf567201fa52f1c695f77fea9a27dd5c62de615ef74d64a5e676a98
+ sha256sums = 4c3e667d40eabe2a5ea724125c69f73bcb6774c01db9ad97bc6b633e1c284fc5
+ sha256sums = 7a7f17c95bfe9de4cda023aa29dfa019ea2870c29e14fa559c2be8b725649d57
+ b2sums = SKIP
b2sums = SKIP
b2sums = SKIP
b2sums = SKIP
b2sums = SKIP
b2sums = SKIP
b2sums = SKIP
- b2sums = 02f273787f1dd80ca52490d0ae342579356f9d366306ae78777df2821dfba79883535091c221d79a721cdb155d71686f3a0126e2c0a7ceff1df47c87fbad6f87
- b2sums = 2f54ec7342b7c43c443d45bfba2bb74e2b7fbc190d89d2cb529ff51cb4bbd9e7a61e141b9414fce11900e173a305a0a9edd510f0c5ba965e7f804193238ef8a7
- b2sums = 2ccfa6f03521e70f6fa6d6e09597bb01214d8d367d27a6aeee49b235cb078c8c59ef03be1a7971687e2503c743d5767e6e23df4108be33d02013b2c542f5f459
+ b2sums = 99e8c5fb5dc0ad07039731c3245bec097de25e675be0f5c52c799738d794ee26df6506adf34fac42663dd39f1c84e7e1675aac5b2f47ef4f2d5ebb903ad4b3a3
+ b2sums = ca3779e974709fa15e55255973eb2ff34fb21251c9f8b00c5b2efcfb175add34b503063984589c8d716b650a9543aa19dc2185b2f531ab8d4363635724114199
+ b2sums = cc2c7d42f18bfb5da0c962b1f3a98c19aec541df9464a3a7a4ac118def9f81e41ac38967c95aba1bc17b3b48630dcef5c9c51bbaf8eed4f386c9aa46a21d2d78
pkgname = imhex
diff --git a/0001-makepkg-Fix-compiler-check.patch b/0001-makepkg-Fix-compiler-check.patch
index a122c4d42a0a..6a870a396317 100644
--- a/0001-makepkg-Fix-compiler-check.patch
+++ b/0001-makepkg-Fix-compiler-check.patch
@@ -1,30 +1,82 @@
-From e408912623c2eb4c945a0b75f3caffaffa971371 Mon Sep 17 00:00:00 2001
+From 935af505d61e4f7e2324cd34833d24e6f789e61a Mon Sep 17 00:00:00 2001
From: KokaKiwi <kokakiwi+git@kokakiwi.net>
Date: Mon, 14 Nov 2022 11:58:59 +0100
Subject: [PATCH] makepkg: Fix compiler check
---
- cmake/build_helpers.cmake | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
+ cmake/build_helpers.cmake | 23 +++++++++++++----------
+ 1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
-index 13a08ecc..e9d7770a 100644
+index 0227511b..048e350c 100644
--- a/cmake/build_helpers.cmake
+++ b/cmake/build_helpers.cmake
-@@ -383,8 +383,11 @@ function(downloadImHexPatternsFiles dest)
+@@ -238,27 +238,27 @@ macro(createPackage)
+ elseif(UNIX AND NOT APPLE)
+
+ set_target_properties(libimhex PROPERTIES SOVERSION ${IMHEX_VERSION})
+-
++
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dist/DEBIAN/control.in ${CMAKE_BINARY_DIR}/DEBIAN/control)
+-
++
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION ${CMAKE_INSTALL_PREFIX}/share/licenses/imhex)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dist/imhex.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/icon.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME imhex.png)
+ install(FILES "$<TARGET_FILE:libimhex>" DESTINATION "${CMAKE_INSTALL_LIBDIR}" PERMISSIONS ${LIBRARY_PERMISSIONS})
+ downloadImHexPatternsFiles("./share/imhex")
+-
++
+ # install AppStream file
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dist/net.werwolv.imhex.metainfo.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
+-
++
+ # install symlink for the old standard name
+ file(CREATE_LINK net.werwolv.imhex.metainfo.xml ${CMAKE_CURRENT_BINARY_DIR}/net.werwolv.imhex.appdata.xml SYMBOLIC)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/net.werwolv.imhex.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
+
+ endif()
+-
++
+ if (CREATE_BUNDLE)
+ include(PostprocessBundle)
+-
++
+ set_target_properties(libimhex PROPERTIES SOVERSION ${IMHEX_VERSION})
+
+ set_property(TARGET main PROPERTY MACOSX_BUNDLE_INFO_PLIST ${MACOSX_BUNDLE_INFO_PLIST})
+@@ -271,7 +271,7 @@ macro(createPackage)
+ add_custom_target(build-time-make-resources-directory ALL COMMAND ${CMAKE_COMMAND} -E make_directory "${IMHEX_BUNDLE_PATH}/Contents/Resources")
+
+ downloadImHexPatternsFiles("${IMHEX_BUNDLE_PATH}/Contents/MacOS")
+-
++
+ install(FILES ${IMHEX_ICON} DESTINATION "${IMHEX_BUNDLE_PATH}/Contents/Resources")
+ install(TARGETS main BUNDLE DESTINATION ".")
+ install(FILES $<TARGET_FILE:main> DESTINATION "${IMHEX_BUNDLE_PATH}")
+@@ -391,8 +391,11 @@ function(downloadImHexPatternsFiles dest)
endfunction()
macro(setupCompilerWarnings target)
- set(IMHEX_COMMON_FLAGS "-Wall -Wextra -Wpedantic -Werror")
-- set(IMHEX_C_FLAGS "${IMHEX_COMMON_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow")
+- set(IMHEX_C_FLAGS "${IMHEX_COMMON_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow -Wno-array-bounds")
+ set(IMHEX_C_FLAGS "")
+
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-+ set(IMHEX_C_FLAGS "${IMHEX_C_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow")
++ set(IMHEX_C_FLAGS "${IMHEX_C_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow -Wno-array-bounds")
+ endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IMHEX_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMHEX_C_FLAGS}")
+@@ -406,7 +409,7 @@ macro(setUninstallTarget)
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+ IMMEDIATE @ONLY)
+-
++
+ add_custom_target(uninstall
+ COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+ endif()
--
-2.39.1
+2.40.0
diff --git a/PKGBUILD b/PKGBUILD
index 304559ab5fb9..c9d2d2cac125 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=ImHex
pkgname=${_pkgname,,}
-pkgver=1.27.1
+pkgver=1.28.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'
@@ -21,6 +21,7 @@ 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"
+ "libwolv::git+https://github.com/WerWolv/libwolv"
"pattern_language::git+https://github.com/WerWolv/PatternLanguage#tag=ImHex-v$pkgver"
0001-makepkg-Fix-compiler-check.patch
pl-0001-Use-C-23-standard.patch
@@ -31,25 +32,27 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- 'b85e294923db8ef8688e388800ebc384fe75da3cfad13029e421d858f7ec9fc4'
- '220c8477d1dbdd9ae34f438aec63cca2d8431d012a82873bd648b5c9d396c3c1'
- 'cf24fc2ae2e4fd72afac855f66f39ee6ea8ca4a551f2ec6671ddd611daa49a3a')
+ 'SKIP'
+ '43bdbbb6edf567201fa52f1c695f77fea9a27dd5c62de615ef74d64a5e676a98'
+ '4c3e667d40eabe2a5ea724125c69f73bcb6774c01db9ad97bc6b633e1c284fc5'
+ '7a7f17c95bfe9de4cda023aa29dfa019ea2870c29e14fa559c2be8b725649d57')
b2sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
'SKIP'
'SKIP'
- '02f273787f1dd80ca52490d0ae342579356f9d366306ae78777df2821dfba79883535091c221d79a721cdb155d71686f3a0126e2c0a7ceff1df47c87fbad6f87'
- '2f54ec7342b7c43c443d45bfba2bb74e2b7fbc190d89d2cb529ff51cb4bbd9e7a61e141b9414fce11900e173a305a0a9edd510f0c5ba965e7f804193238ef8a7'
- '2ccfa6f03521e70f6fa6d6e09597bb01214d8d367d27a6aeee49b235cb078c8c59ef03be1a7971687e2503c743d5767e6e23df4108be33d02013b2c542f5f459')
+ 'SKIP'
+ '99e8c5fb5dc0ad07039731c3245bec097de25e675be0f5c52c799738d794ee26df6506adf34fac42663dd39f1c84e7e1675aac5b2f47ef4f2d5ebb903ad4b3a3'
+ 'ca3779e974709fa15e55255973eb2ff34fb21251c9f8b00c5b2efcfb175add34b503063984589c8d716b650a9543aa19dc2185b2f531ab8d4363635724114199'
+ 'cc2c7d42f18bfb5da0c962b1f3a98c19aec541df9464a3a7a4ac118def9f81e41ac38967c95aba1bc17b3b48630dcef5c9c51bbaf8eed4f386c9aa46a21d2d78')
options=(!lto !strip)
prepare() {
cd "$pkgname"
git submodule init
- for name in nativefiledialog xdgpp libromfs capstone pattern_language; do
+ for name in nativefiledialog xdgpp libromfs capstone libwolv pattern_language; do
git config submodule.lib/external/$name.url "$srcdir/$name"
done
for name in fmt curl yara/yara; do
@@ -57,6 +60,13 @@ prepare() {
done
git -c protocol.file.allow=always submodule update
+ for name in libwolv; do
+ git -C lib/external/pattern_language \
+ config submodule.external/$name.url "$srcdir/$name"
+ done
+ git -C lib/external/pattern_language -c protocol.file.allow=always \
+ submodule update
+
git apply \
"$srcdir/0001-makepkg-Fix-compiler-check.patch"
diff --git a/pl-0001-Use-C-23-standard.patch b/pl-0001-Use-C-23-standard.patch
index 0eb296b82058..225c1c0b8874 100644
--- a/pl-0001-Use-C-23-standard.patch
+++ b/pl-0001-Use-C-23-standard.patch
@@ -1,4 +1,4 @@
-From 59c08b21717f3f5a22117b2f4f415f890b9228c2 Mon Sep 17 00:00:00 2001
+From 5ca59e77063effc934988c16301dbc7ac821755e Mon Sep 17 00:00:00 2001
From: KokaKiwi <kokakiwi+git@kokakiwi.net>
Date: Thu, 18 Aug 2022 00:57:02 +0200
Subject: [PATCH 1/2] Use C++23 standard
@@ -8,7 +8,7 @@ Subject: [PATCH 1/2] Use C++23 standard
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 508d079..f801e3e 100644
+index f7e8c68..e1a1384 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,4 +1,4 @@
@@ -18,5 +18,5 @@ index 508d079..f801e3e 100644
set(CMAKE_CXX_STANDARD 23)
--
-2.39.1
+2.40.0
diff --git a/pl-0002-makepkg-Remove-extraneous-compiler-flags.patch b/pl-0002-makepkg-Remove-extraneous-compiler-flags.patch
index ea39a53742bf..52b5342687aa 100644
--- a/pl-0002-makepkg-Remove-extraneous-compiler-flags.patch
+++ b/pl-0002-makepkg-Remove-extraneous-compiler-flags.patch
@@ -1,26 +1,32 @@
-From b6b11e11956f02660fc67836ec718fd96c185abd Mon Sep 17 00:00:00 2001
+From 457106b700371e66d701efd6668d0f59083c5925 Mon Sep 17 00:00:00 2001
From: KokaKiwi <kokakiwi+git@kokakiwi.net>
Date: Sat, 17 Sep 2022 16:27:17 +0200
Subject: [PATCH 2/2] makepkg: Remove extraneous compiler flags
---
- lib/CMakeLists.txt | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
+ lib/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index f801e3e..1a36e9a 100644
+index e1a1384..14eb593 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
-@@ -34,8 +34,7 @@ add_library(libpl ${LIBRARY_TYPE}
- source/pl/lib/std/hash.cpp
+@@ -34,7 +34,7 @@ add_library(libpl ${LIBRARY_TYPE}
+ source/pl/lib/std/random.cpp
)
--target_compile_options(libpl PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-unknown-pragmas)
--
-+target_compile_options(libpl PRIVATE -Wno-unknown-pragmas)
+-target_compile_options(libpl PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-unknown-pragmas -Wno-stringop-overread -Wno-stringop-overflow -Wno-array-bounds)
++target_compile_options(libpl PRIVATE -Wno-unknown-pragmas -Wno-stringop-overread -Wno-stringop-overflow -Wno-array-bounds)
+
target_include_directories(libpl PUBLIC include)
target_link_libraries(libpl PRIVATE fmt::fmt-header-only)
- target_link_libraries(libpl PUBLIC intervaltree)
+@@ -46,4 +46,4 @@ set_target_properties(libpl PROPERTIES PREFIX "")
+
+ if (LIBPL_SHARED_LIBRARY)
+ install(TARGETS libpl DESTINATION lib)
+-endif ()
+\ No newline at end of file
++endif ()
--
-2.39.1
+2.40.0