upgpkg: imhex 1.6.1-1

2 files changed, 21 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a2f162b623c..6a01b2dabcd9 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.5.0
+	pkgver = 1.6.1
 	pkgrel = 1
 	url = https://github.com/WerWolv/ImHex
 	arch = x86_64
@@ -9,16 +9,15 @@ pkgbase = imhex
 	depends = glfw
 	depends = glm
 	depends = capstone
-	depends = llvm-libs
 	depends = llvm
 	depends = nlohmann-json
 	depends = python
-	source = imhex-1.5.0.tar.gz::https://github.com/WerWolv/ImHex/archive/v1.5.0.tar.gz
-	source = https://raw.githubusercontent.com/WerWolv/ImHex/59155256a99da8a7a476089507a6e294d68d6343/LICENSE
-	sha256sums = 211cca3a22d9c0d8a7a3bfa2a3aa7c29cd954c207979632fe9b9a08cf9b8444b
-	sha256sums = 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643
-	b2sums = 247233bab30c569b8b980b7ef436b572fdfb76ca8af92289af510907a20081d309f3f50b6c9a53c5e65e2250d96f45bf7b508719c9133b67fdc9f4d70544ce65
-	b2sums = 1e1e108a77d8676eb68467cdfbf95684f0bad991bfcc24e7bd3d1eec58d746f14d20798c3bcf64e9bdd1ff4a9c5ec02ccb4c06331bcf251a9d1d0f28b6875296
+	depends = freetype2
+	depends = file
+	depends = openssl
+	depends = libiconv
+	source = imhex-1.6.1.tar.gz::https://github.com/WerWolv/ImHex/archive/v1.6.1.tar.gz
+	b2sums = 6dcf7461fa15a396c5351942347e62e8a4bfdac47591761006001e8bd8d149d9208e01795eebc27fbdc2b5023021f783e7c6142a4da1b0fc484531b181d6b00f
 
 pkgname = imhex
 
diff --git a/PKGBUILD b/PKGBUILD
index 704d036011df..8398ee2a8eb0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,30 @@
 # Maintainer: KokaKiwi <kokakiwi+aur@kokakiwi.net>
+# Contributor: George Rawlinson <george@rawlinson.net.nz>
 
 _pkgname=ImHex
 pkgname=${_pkgname,,}
-pkgver=1.5.0
+pkgver=1.6.1
 pkgrel=1
 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')
 arch=('x86_64')
-depends=('glfw' 'glm' 'capstone' 'llvm-libs' 'llvm' 'nlohmann-json' 'python')
+depends=('glfw' 'glm' 'capstone' 'llvm' 'nlohmann-json' 'python' 'freetype2' 'file' 'openssl' 'libiconv')
 makedepends=('cmake')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/WerWolv/ImHex/archive/v${pkgver}.tar.gz"
-        'https://raw.githubusercontent.com/WerWolv/ImHex/59155256a99da8a7a476089507a6e294d68d6343/LICENSE')
-sha256sums=('211cca3a22d9c0d8a7a3bfa2a3aa7c29cd954c207979632fe9b9a08cf9b8444b'
-            '8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643')
-b2sums=('247233bab30c569b8b980b7ef436b572fdfb76ca8af92289af510907a20081d309f3f50b6c9a53c5e65e2250d96f45bf7b508719c9133b67fdc9f4d70544ce65'
-        '1e1e108a77d8676eb68467cdfbf95684f0bad991bfcc24e7bd3d1eec58d746f14d20798c3bcf64e9bdd1ff4a9c5ec02ccb4c06331bcf251a9d1d0f28b6875296')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
+b2sums=('6dcf7461fa15a396c5351942347e62e8a4bfdac47591761006001e8bd8d149d9208e01795eebc27fbdc2b5023021f783e7c6142a4da1b0fc484531b181d6b00f')
 
 build() {
-  cmake -B build -S "${_pkgname}-${pkgver}" \
-    -DCMAKE_BUILD_TYPE=None \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  cmake --build build
+  cmake -B build -S "$_pkgname-$pkgver" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPROJECT_VERSION="$pkgver" \
+    -Wno-dev
+  make -C build
 }
 
 package() {
-  # cmake --install build --prefix "${pkgdir}/usr"
-  install -Dm0755 "build/${_pkgname}" "${pkgdir}/usr/bin/imhex"
-
-  install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm0755 "build/$pkgname" -t "$pkgdir/usr/bin"
+  install -Dm0644 "$_pkgname-$pkgver/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname"
+  install -Dm0644 "$_pkgname-$pkgver/README.md" -t "$pkgdir/usr/share/doc/$pkgname"
 }