summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulianne H2023-01-05 17:08:03 +0100
committerJulianne H2023-01-05 17:08:03 +0100
commitdfeac280959b52301f3f89ffb8a9ae7962073320 (patch)
tree55ad56b2ad340f2bcab452b942c205e00af141b5
parent690bf2716c405d7827bee0c37b000b42acc36c37 (diff)
downloadaur-dfeac280959b52301f3f89ffb8a9ae7962073320.tar.gz
Update: 1.26.2
-rw-r--r--.SRCINFO14
-rw-r--r--0001-makepkg-Fix-compiler-check.patch2
-rw-r--r--0002-fix-Deduplicate-resources-directories.patch2
-rw-r--r--PKGBUILD13
4 files changed, 14 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1d117e104185..e5bc14d41474 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.26.1
+ pkgver = 1.26.2
pkgrel = 1
url = https://imhex.werwolv.net
arch = x86_64
@@ -25,12 +25,12 @@ pkgbase = imhex
optdepends = imhex-patterns-git: ImHex base patterns
options = !lto
options = !strip
- source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.26.1
+ source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.26.2
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.26.1
+ source = pattern_language::git+https://github.com/WerWolv/PatternLanguage#tag=ImHex-v1.26.2
source = 0001-makepkg-Fix-compiler-check.patch
source = 0002-fix-Deduplicate-resources-directories.patch
source = pl-0001-Use-C-23-standard.patch
@@ -41,8 +41,8 @@ pkgbase = imhex
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = 8e579494feb565e9030999d5c9336e46dee320bab34b19a657e2f27fe2edbe60
- sha256sums = 69058a91c48ed4fe19df17e6fe6b85d70630cbba42024495988397af1eb9ef86
+ sha256sums = 7b0bb2b80d345bde38e58c920ea26df8b468b379dd0ec6f13d41ba847eb46706
+ sha256sums = 91d97b57b1c9e9e61b7b7be4a7ec8dbc2c007cd231dc26064d1adbb7c88eda35
sha256sums = fc44726aceb321516e8edb3ae25d6bb1e00e0e49b8f2e65ec1388db455b3a382
sha256sums = 3e32d967b19b7fc5000888afcc611844977b4758aa73eba816fffb707c37fa5a
b2sums = SKIP
@@ -51,8 +51,8 @@ pkgbase = imhex
b2sums = SKIP
b2sums = SKIP
b2sums = SKIP
- b2sums = cbc3d2d3c74efcaf3d3e8a7da657a15a6ef0b47adc0b5dad7d3668d4ae4e98d0692e7ae02b0799fc5589dec9b889f2984d02ccb48a53d9dbdf379ceecda3c8ba
- b2sums = dc70424a94d4380de85d92e0fba22ae574a3f1a01447b72678ec3717d65bef98dc84e1c249682fedb191b625afded4b3a799ffda2d200e2040dc69f07aa7686d
+ b2sums = 6a74adf75063bf725fa80a4498a768d155ede519ec305a2008e423824305b9ec4fa5046c8c9c328e18b61a4ce592e75789e5b2a623805b4499cd440589510ae4
+ b2sums = 69febb21f4898a5571e4fc87e84da2f3345484c816dd176a629ed8c8cd5fd55193c89c371ced1c732b8aa666019c47bb1df884e4245838de7ea56d5410e723b4
b2sums = 5e15df92849d3068f04959c45bc8b8d678a2b4ca72ccb3c5e87f733c169919b4b5722eb9991398ecffd4a8b2709011fb0c49b684306981b1fb89888b1794b30c
b2sums = a215980d4e5faf4ab509b35a34e6c15da1ee8ab649ea1e98539129a43dd11a38906d1a178b6667662614cb48c2192f8e869cf602ede7b7aabe4baa6312dce56b
diff --git a/0001-makepkg-Fix-compiler-check.patch b/0001-makepkg-Fix-compiler-check.patch
index 457241916254..3f4a4c4913f0 100644
--- a/0001-makepkg-Fix-compiler-check.patch
+++ b/0001-makepkg-Fix-compiler-check.patch
@@ -1,4 +1,4 @@
-From a9ddb9da302e625926ce9f23824f9e768d69dd45 Mon Sep 17 00:00:00 2001
+From 5b38ec2a7231fb10c26a461d39c0d1b413f88e05 Mon Sep 17 00:00:00 2001
From: KokaKiwi <kokakiwi+git@kokakiwi.net>
Date: Mon, 14 Nov 2022 11:58:59 +0100
Subject: [PATCH 1/2] makepkg: Fix compiler check
diff --git a/0002-fix-Deduplicate-resources-directories.patch b/0002-fix-Deduplicate-resources-directories.patch
index 76a329df9432..b8159d4b7016 100644
--- a/0002-fix-Deduplicate-resources-directories.patch
+++ b/0002-fix-Deduplicate-resources-directories.patch
@@ -1,4 +1,4 @@
-From f7af803f6d32f9fb1297a268fc32e225db62e1bc Mon Sep 17 00:00:00 2001
+From 60b067f109875aa7bcc6e265c7a73619839b23b0 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
diff --git a/PKGBUILD b/PKGBUILD
index 00a339998eff..7eb7f77cee3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=ImHex
pkgname=${_pkgname,,}
-pkgver=1.26.1
+pkgver=1.26.2
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'
@@ -32,8 +32,8 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- '8e579494feb565e9030999d5c9336e46dee320bab34b19a657e2f27fe2edbe60'
- '69058a91c48ed4fe19df17e6fe6b85d70630cbba42024495988397af1eb9ef86'
+ '7b0bb2b80d345bde38e58c920ea26df8b468b379dd0ec6f13d41ba847eb46706'
+ '91d97b57b1c9e9e61b7b7be4a7ec8dbc2c007cd231dc26064d1adbb7c88eda35'
'fc44726aceb321516e8edb3ae25d6bb1e00e0e49b8f2e65ec1388db455b3a382'
'3e32d967b19b7fc5000888afcc611844977b4758aa73eba816fffb707c37fa5a')
b2sums=('SKIP'
@@ -42,8 +42,8 @@ b2sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- 'cbc3d2d3c74efcaf3d3e8a7da657a15a6ef0b47adc0b5dad7d3668d4ae4e98d0692e7ae02b0799fc5589dec9b889f2984d02ccb48a53d9dbdf379ceecda3c8ba'
- 'dc70424a94d4380de85d92e0fba22ae574a3f1a01447b72678ec3717d65bef98dc84e1c249682fedb191b625afded4b3a799ffda2d200e2040dc69f07aa7686d'
+ '6a74adf75063bf725fa80a4498a768d155ede519ec305a2008e423824305b9ec4fa5046c8c9c328e18b61a4ce592e75789e5b2a623805b4499cd440589510ae4'
+ '69febb21f4898a5571e4fc87e84da2f3345484c816dd176a629ed8c8cd5fd55193c89c371ced1c732b8aa666019c47bb1df884e4245838de7ea56d5410e723b4'
'5e15df92849d3068f04959c45bc8b8d678a2b4ca72ccb3c5e87f733c169919b4b5722eb9991398ecffd4a8b2709011fb0c49b684306981b1fb89888b1794b30c'
'a215980d4e5faf4ab509b35a34e6c15da1ee8ab649ea1e98539129a43dd11a38906d1a178b6667662614cb48c2192f8e869cf602ede7b7aabe4baa6312dce56b')
options=(!lto !strip)
@@ -60,9 +60,6 @@ prepare() {
done
git -c protocol.file.allow=always submodule update
- # Fix libromfs
- git -C lib/external/libromfs checkout 59d8ceccb0b668e16a5d2b25c457514c9e8c1493
-
git apply \
"$srcdir/0001-makepkg-Fix-compiler-check.patch" \
"$srcdir/0002-fix-Deduplicate-resources-directories.patch"