upgpkg: imhex 1.32.2-2

- Use full-sources archives with checksums

2 files changed, 24 insertions, 75 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e7bd2642893..2c4521346cf3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = imhex
 	pkgdesc = A Hex Editor for Reverse Engineers, Programmers and people that value their eye sight when working at 3 AM
 	pkgver = 1.32.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://imhex.werwolv.net
 	arch = x86_64
-	license = GPL2
+	license = GPL-2.0-or-later
 	makedepends = git
 	makedepends = cmake
 	makedepends = llvm
@@ -29,31 +29,16 @@ pkgbase = imhex
 	conflicts = imhex-patterns-git
 	options = !lto
 	options = !strip
-	source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.32.2
-	source = nativefiledialog::git+https://github.com/btzy/nativefiledialog-extended.git#commit=5786fabceeaee4d892f3c7a16b243796244cdddc
-	source = xdgpp::git+https://git.sr.ht/~danyspin97/xdgpp#commit=f01f810714443d0f10c333d4d1d9c0383be41375
-	source = libromfs::git+https://github.com/WerWolv/libromfs#commit=0a72f7bb33d87c4fb2709b6b94bf83518ab0022d
-	source = libwolv::git+https://github.com/WerWolv/libwolv#commit=d25459dfa8e706af938427e979e454a8326c5984
-	source = pattern_language::git+https://github.com/WerWolv/PatternLanguage#tag=ImHex-v1.32.2
-	source = imhex-patterns::git+https://github.com/WerWolv/ImHex-Patterns#tag=ImHex-v1.32.2
+	source = imhex-1.32.2.tar.gz::https://github.com/WerWolv/ImHex/releases/download/v1.32.2/Full.Sources.tar.gz
+	source = imhex-patterns-1.32.2.tar.gz::https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v1.32.2.tar.gz
 	source = 0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch
 	source = 0002-fix-main-Handle-different-LLVM-version.patch
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
+	sha256sums = 44564e7326e056f9ee698ae972bb0fb624716052466f0f504404e3f366c4c9ed
+	sha256sums = c2bf92cf468498ccc8a27ff6c3284f59946b0cc064fe41c37885a31018360ad0
 	sha256sums = 3b27f99abc4040630f53cb098b67d4a8086d87c9c2c6e0a6a29afd83dcd6ec3a
 	sha256sums = 6cd6297b2269a7299f81781e9f4bcaa4b78bc69d757d2eafab10433daee6ed48
-	b2sums = SKIP
-	b2sums = SKIP
-	b2sums = SKIP
-	b2sums = SKIP
-	b2sums = SKIP
-	b2sums = SKIP
-	b2sums = SKIP
+	b2sums = 75d595e5acb05429b114f4d4c61981080797f7b88d41a219c93f6512c4b204dd164a8886c00af4ee539cb7d6f7baaa49084b349806357fb872a1ebb30e82cfba
+	b2sums = b171669c17c0a7aef0ba65b66c2f68f7581a8e11d61365363fd28cfedfa2658c8833181d5e8a4c789ff011c5afadafec8149b43852319cae161c9bb5c26be2ec
 	b2sums = 4c1c0451e3c4033ed331f6339342926f1ee25b6097cc9bf540f6944f089a3db2eaa42237a673522dbcfe37540b9be9563a12b5aa146d5c5e873cce36ca637b99
 	b2sums = 0e6fdf7cb14df8c2983822c5bc52c080d68fbc57d995cc9e24c6a84589e2dd904e48e4657a27155dcab9048a720f5d60e8fc2d70ab5d8d42b3186703a878a960
 
diff --git a/PKGBUILD b/PKGBUILD
index dd566d28bf5a..29db5b30c569 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,10 @@
 _pkgname=ImHex
 pkgname=${_pkgname,,}
 pkgver=1.32.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://imhex.werwolv.net'
-license=('GPL2')
+license=('GPL-2.0-or-later')
 arch=('x86_64')
 depends=('glfw' 'mbedtls' 'curl' 'dbus'
          'freetype2' 'file' 'hicolor-icon-theme' 'xdg-desktop-portal'
@@ -18,67 +18,31 @@ makedepends=('git' 'cmake'
 optdepends=('dotnet-runtime: support for .NET scripts')
 provides=('imhex-patterns')
 conflicts=('imhex-patterns-git')
-source=("$pkgname::git+https://github.com/WerWolv/ImHex.git#tag=v$pkgver"
-        "nativefiledialog::git+https://github.com/btzy/nativefiledialog-extended.git#commit=5786fabceeaee4d892f3c7a16b243796244cdddc"
-        "xdgpp::git+https://git.sr.ht/~danyspin97/xdgpp#commit=f01f810714443d0f10c333d4d1d9c0383be41375"
-        # "capstone::git+https://github.com/capstone-engine/capstone#commit=097c04d9413c59a58b00d4d1c8d5dc0ac158ffaa"
-        "libromfs::git+https://github.com/WerWolv/libromfs#commit=0a72f7bb33d87c4fb2709b6b94bf83518ab0022d"
-        "libwolv::git+https://github.com/WerWolv/libwolv#commit=d25459dfa8e706af938427e979e454a8326c5984"
-        "pattern_language::git+https://github.com/WerWolv/PatternLanguage#tag=ImHex-v$pkgver"
-        "imhex-patterns::git+https://github.com/WerWolv/ImHex-Patterns#tag=ImHex-v$pkgver"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/WerWolv/ImHex/releases/download/v$pkgver/Full.Sources.tar.gz"
+        "imhex-patterns-$pkgver.tar.gz::https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v$pkgver.tar.gz"
         0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch
         0002-fix-main-Handle-different-LLVM-version.patch)
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
+sha256sums=('44564e7326e056f9ee698ae972bb0fb624716052466f0f504404e3f366c4c9ed'
+            'c2bf92cf468498ccc8a27ff6c3284f59946b0cc064fe41c37885a31018360ad0'
             '3b27f99abc4040630f53cb098b67d4a8086d87c9c2c6e0a6a29afd83dcd6ec3a'
             '6cd6297b2269a7299f81781e9f4bcaa4b78bc69d757d2eafab10433daee6ed48')
-b2sums=('SKIP'
-        'SKIP'
-        'SKIP'
-        'SKIP'
-        'SKIP'
-        'SKIP'
-        'SKIP'
+b2sums=('75d595e5acb05429b114f4d4c61981080797f7b88d41a219c93f6512c4b204dd164a8886c00af4ee539cb7d6f7baaa49084b349806357fb872a1ebb30e82cfba'
+        'b171669c17c0a7aef0ba65b66c2f68f7581a8e11d61365363fd28cfedfa2658c8833181d5e8a4c789ff011c5afadafec8149b43852319cae161c9bb5c26be2ec'
         '4c1c0451e3c4033ed331f6339342926f1ee25b6097cc9bf540f6944f089a3db2eaa42237a673522dbcfe37540b9be9563a12b5aa146d5c5e873cce36ca637b99'
         '0e6fdf7cb14df8c2983822c5bc52c080d68fbc57d995cc9e24c6a84589e2dd904e48e4657a27155dcab9048a720f5d60e8fc2d70ab5d8d42b3186703a878a960')
 options=(!lto !strip)
 
 prepare() {
-  cd "$pkgname"
+  cd "$_pkgname"
 
-  git submodule init
-  for name in nativefiledialog xdgpp; do
-    git config submodule.lib/third_party/$name.url "$srcdir/$name"
-  done
-  for name in libromfs libwolv pattern_language; do
-    git config submodule.lib/external/$name.url "$srcdir/$name"
-  done
-  for name in capstone fmt yara/yara; do
-    git config --remove submodule.lib/third_party/$name
-  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-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch" \
-    "$srcdir/0002-fix-main-Handle-different-LLVM-version.patch"
+  patch -Np1 -i "$srcdir/0001-fix-cmake-Fix-when-multiple-.NET-packages-are-instal.patch"
+  patch -Np1 -i "$srcdir/0002-fix-main-Handle-different-LLVM-version.patch"
 }
 
 build() {
   export CXXFLAGS="$CXXFLAGS -Wno-inconsistent-missing-override"
 
-  cmake -B build -S "$pkgname" \
+  cmake -B build -S "$_pkgname" \
     -Wno-dev \
     -D CMAKE_BUILD_TYPE=Release \
     -D CMAKE_INSTALL_PREFIX=/usr \
@@ -105,17 +69,17 @@ package() {
   # Patterns
   install -dm0755 "$pkgdir/usr/share/imhex"
   cp -r -t "$pkgdir/usr/share/imhex" \
-    "$srcdir/imhex-patterns"/{constants,encodings,includes,magic,patterns,themes,tips}
+    "$srcdir/ImHex-Patterns-ImHex-v$pkgver"/{constants,encodings,includes,magic,nodes,patterns,plugins,scripts,tests,themes,tips,yara}
 
   # Desktop file(s)
-  install -Dm0644 "$pkgname/resources/icon.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/imhex.svg"
+  install -Dm0644 "$_pkgname/resources/icon.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/imhex.svg"
   for size in 32 48 64 128 256; do
     install -dm0755 "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps"
     rsvg-convert -a -f png -w $size -o "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/imhex.png" \
-      "$pkgname/resources/icon.svg"
+      "$_pkgname/resources/icon.svg"
   done
 
   # Documentation
   install -Dm0644 -t "$pkgdir/usr/share/doc/$pkgname" \
-    "$pkgname/README.md"
+    "$_pkgname/README.md"
 }