upgpkg: imhex 1.29.0-1

upstream release

5 files changed, 43 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 44b40e6047cf..e527aae46615 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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.28.0
-	pkgrel = 3
+	pkgver = 1.29.0
+	pkgrel = 1
 	url = https://imhex.werwolv.net
 	arch = x86_64
 	license = GPL2
@@ -26,14 +26,14 @@ pkgbase = imhex
 	conflicts = imhex-patterns-git
 	options = !lto
 	options = !strip
-	source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.28.0
+	source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.29.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 = libwolv::git+https://github.com/WerWolv/libwolv
-	source = pattern_language::git+https://github.com/WerWolv/PatternLanguage#tag=ImHex-v1.28.0
-	source = imhex-patterns::git+https://github.com/WerWolv/ImHex-Patterns#tag=ImHex-v1.28.0
+	source = pattern_language::git+https://github.com/WerWolv/PatternLanguage#tag=ImHex-v1.29.0
+	source = imhex-patterns::git+https://github.com/WerWolv/ImHex-Patterns#tag=ImHex-v1.29.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
@@ -45,9 +45,9 @@ pkgbase = imhex
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 43bdbbb6edf567201fa52f1c695f77fea9a27dd5c62de615ef74d64a5e676a98
-	sha256sums = 4c3e667d40eabe2a5ea724125c69f73bcb6774c01db9ad97bc6b633e1c284fc5
-	sha256sums = 7a7f17c95bfe9de4cda023aa29dfa019ea2870c29e14fa559c2be8b725649d57
+	sha256sums = e8696d29050d5dbf34b250d68c730e973fda88c342a801e2da36da804f4f1c45
+	sha256sums = 6e1a6a914da49a3d9c20ffa5bc728e1901dc01e962f05f70ec60c97cba2dd0d0
+	sha256sums = 9b5b3a5aac5297f7ca9c8fd94a37fc7c57e869c83f5874976a1256d0021f7618
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
@@ -56,8 +56,8 @@ pkgbase = imhex
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
-	b2sums = 99e8c5fb5dc0ad07039731c3245bec097de25e675be0f5c52c799738d794ee26df6506adf34fac42663dd39f1c84e7e1675aac5b2f47ef4f2d5ebb903ad4b3a3
-	b2sums = ca3779e974709fa15e55255973eb2ff34fb21251c9f8b00c5b2efcfb175add34b503063984589c8d716b650a9543aa19dc2185b2f531ab8d4363635724114199
-	b2sums = cc2c7d42f18bfb5da0c962b1f3a98c19aec541df9464a3a7a4ac118def9f81e41ac38967c95aba1bc17b3b48630dcef5c9c51bbaf8eed4f386c9aa46a21d2d78
+	b2sums = 28956371b44540ff27eaf21841196afad87d2d5f0c0bf426b4d5d6774ff58a9d012c0b0bd692b8e422f24196f8bf21ec18c97e5076ed139d84d5f4c4755fee77
+	b2sums = 95658194c900d00877aa13fb206bdca5071070a7689676b1ddb4e607fb621a6d88ea994c789d02107c2864c28a08e73d21133705d059fcdf15cb3d05d344a309
+	b2sums = d1d4e35b5dce8e6a257e2978821ed60bf9715bc703d00b2ec5823c234da3f4f862f7fd89a05cd89cb5a9b7eb00bb9a695bbfa6d5ff375853afd85df9e1785fa6
 
 pkgname = imhex
diff --git a/0001-makepkg-Fix-compiler-check.patch b/0001-makepkg-Fix-compiler-check.patch
index 6a870a396317..352e31f54c4a 100644
--- a/0001-makepkg-Fix-compiler-check.patch
+++ b/0001-makepkg-Fix-compiler-check.patch
@@ -1,4 +1,4 @@
-From 935af505d61e4f7e2324cd34833d24e6f789e61a Mon Sep 17 00:00:00 2001
+From f9d65dc25c5446a144f2542b486bd72d2ff1320d 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
@@ -8,10 +8,10 @@ Subject: [PATCH] makepkg: Fix compiler check
  1 file changed, 13 insertions(+), 10 deletions(-)
 
 diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
-index 0227511b..048e350c 100644
+index 4acbeaab..c1c46bb2 100644
 --- a/cmake/build_helpers.cmake
 +++ b/cmake/build_helpers.cmake
-@@ -238,27 +238,27 @@ macro(createPackage)
+@@ -259,27 +259,27 @@ macro(createPackage)
      elseif(UNIX AND NOT APPLE)
  
          set_target_properties(libimhex PROPERTIES SOVERSION ${IMHEX_VERSION})
@@ -45,7 +45,7 @@ index 0227511b..048e350c 100644
          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)
+@@ -292,7 +292,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")
@@ -54,21 +54,21 @@ index 0227511b..048e350c 100644
          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)
+@@ -412,8 +412,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 -Wno-array-bounds")
+-    set(IMHEX_C_FLAGS "${IMHEX_COMMON_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow -Wno-array-bounds -Wno-dangling-reference")
 +    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 -Wno-array-bounds")
++        set(IMHEX_C_FLAGS "${IMHEX_C_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow -Wno-array-bounds -Wno-dangling-reference")
 +    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)
+@@ -427,7 +430,7 @@ macro(setUninstallTarget)
          "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
          "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
          IMMEDIATE @ONLY)
@@ -78,5 +78,5 @@ index 0227511b..048e350c 100644
          COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
      endif()
 -- 
-2.40.0
+2.40.1
 
diff --git a/PKGBUILD b/PKGBUILD
index e2523260132e..baf86054ef53 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 _pkgname=ImHex
 pkgname=${_pkgname,,}
-pkgver=1.28.0
-pkgrel=3
+pkgver=1.29.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'
 license=('GPL2')
@@ -34,9 +34,9 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '43bdbbb6edf567201fa52f1c695f77fea9a27dd5c62de615ef74d64a5e676a98'
-            '4c3e667d40eabe2a5ea724125c69f73bcb6774c01db9ad97bc6b633e1c284fc5'
-            '7a7f17c95bfe9de4cda023aa29dfa019ea2870c29e14fa559c2be8b725649d57')
+            'e8696d29050d5dbf34b250d68c730e973fda88c342a801e2da36da804f4f1c45'
+            '6e1a6a914da49a3d9c20ffa5bc728e1901dc01e962f05f70ec60c97cba2dd0d0'
+            '9b5b3a5aac5297f7ca9c8fd94a37fc7c57e869c83f5874976a1256d0021f7618')
 b2sums=('SKIP'
         'SKIP'
         'SKIP'
@@ -45,9 +45,9 @@ b2sums=('SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
-        '99e8c5fb5dc0ad07039731c3245bec097de25e675be0f5c52c799738d794ee26df6506adf34fac42663dd39f1c84e7e1675aac5b2f47ef4f2d5ebb903ad4b3a3'
-        'ca3779e974709fa15e55255973eb2ff34fb21251c9f8b00c5b2efcfb175add34b503063984589c8d716b650a9543aa19dc2185b2f531ab8d4363635724114199'
-        'cc2c7d42f18bfb5da0c962b1f3a98c19aec541df9464a3a7a4ac118def9f81e41ac38967c95aba1bc17b3b48630dcef5c9c51bbaf8eed4f386c9aa46a21d2d78')
+        '28956371b44540ff27eaf21841196afad87d2d5f0c0bf426b4d5d6774ff58a9d012c0b0bd692b8e422f24196f8bf21ec18c97e5076ed139d84d5f4c4755fee77'
+        '95658194c900d00877aa13fb206bdca5071070a7689676b1ddb4e607fb621a6d88ea994c789d02107c2864c28a08e73d21133705d059fcdf15cb3d05d344a309'
+        'd1d4e35b5dce8e6a257e2978821ed60bf9715bc703d00b2ec5823c234da3f4f862f7fd89a05cd89cb5a9b7eb00bb9a695bbfa6d5ff375853afd85df9e1785fa6')
 options=(!lto !strip)
 
 prepare() {
diff --git a/pl-0001-Use-C-23-standard.patch b/pl-0001-Use-C-23-standard.patch
index 225c1c0b8874..32352611e8ba 100644
--- a/pl-0001-Use-C-23-standard.patch
+++ b/pl-0001-Use-C-23-standard.patch
@@ -1,4 +1,4 @@
-From 5ca59e77063effc934988c16301dbc7ac821755e Mon Sep 17 00:00:00 2001
+From f2b9d27386607a9bfccdcab35ffb4bd69ac7fbfc 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 f7e8c68..e1a1384 100644
+index b1bad4e..c3bbdb9 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
 @@ -1,4 +1,4 @@
@@ -18,5 +18,5 @@ index f7e8c68..e1a1384 100644
  
  set(CMAKE_CXX_STANDARD 23)
 -- 
-2.40.0
+2.40.1
 
diff --git a/pl-0002-makepkg-Remove-extraneous-compiler-flags.patch b/pl-0002-makepkg-Remove-extraneous-compiler-flags.patch
index 52b5342687aa..577e5c0c9bc2 100644
--- a/pl-0002-makepkg-Remove-extraneous-compiler-flags.patch
+++ b/pl-0002-makepkg-Remove-extraneous-compiler-flags.patch
@@ -1,32 +1,25 @@
-From 457106b700371e66d701efd6668d0f59083c5925 Mon Sep 17 00:00:00 2001
+From 70b78112938e5c8def03baa65588e63674008490 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 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ lib/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index e1a1384..14eb593 100644
+index c3bbdb9..64c3306 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
-@@ -34,7 +34,7 @@ add_library(libpl ${LIBRARY_TYPE}
-         source/pl/lib/std/random.cpp
+@@ -35,7 +35,7 @@ add_library(libpl ${LIBRARY_TYPE}
  )
  
--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)
-@@ -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 ()
+ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+-    target_compile_options(libpl PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds)
++    target_compile_options(libpl PRIVATE -Wno-unknown-pragmas -Wno-array-bounds)
+     if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+         target_compile_options(libpl PRIVATE -Wno-stringop-overflow)
+     endif()
 -- 
-2.40.0
+2.40.1