revision

1 files changed, 18 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c8b8735f1f68..3006f10fd66a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=redasm
 _pkgver=2.1.1-fix
 pkgver=${_pkgver//-/.}
-pkgrel=1
+pkgrel=2
 url="https://redasm.io/"
 arch=(i686 x86_64)
 pkgdesc="The OpenSource Disassembler"
@@ -14,7 +14,8 @@ makedepends=(git cmake)
 source=("git+https://github.com/REDasmOrg/REDasm.git#tag=v${_pkgver}"
         "git+https://github.com/REDasmOrg/REDasm-Library.git"
         "git+https://github.com/Dax89/QHexView.git"
-        "git+https://github.com/aquynh/capstone.git")
+        #"git+https://github.com/aquynh/capstone.git"
+        "git+https://github.com/capstone-engine/capstone.git")
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
@@ -23,27 +24,28 @@ sha256sums=('SKIP'
 prepare() {
   cd REDasm
   git submodule init
-  git config submodule.LibREDasm.url "$srcdir/REDasm-Library"
-  git config submodule.QHexView.url "$srcdir/QHexView"
-  git submodule update
-  mkdir -p build
+  git config submodule.LibREDasm.url "${srcdir}/REDasm-Library"
+  git config submodule.QHexView.url "${srcdir}/QHexView"
+  git -c protocol.file.allow=always submodule update
 
   cd LibREDasm
   git submodule init
-  git config submodule.depends/capstone.url "$srcdir/capstone"
-  git submodule update
+  git config submodule.depends/capstone.url "${srcdir}/capstone"
+  git -c protocol.file.allow=always submodule update
 }
 
 build() {
-  cd REDasm/build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-  make
+  cmake -B build -S "REDasm" -Wno-dev \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr
+
+  cmake --build build
 }
 
 package() {
-  cd REDasm/build
-  install -D -m755 REDasm ${pkgdir}/usr/bin/REDasm
-  install -D -m755 LibREDasm.so ${pkgdir}/usr/lib/LibREDasm.so
-  install -D -m644 ../README.md ${pkgdir}/usr/share/doc/${pkgname}/README
-  install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  cd build
+  install -D -m755 REDasm                 "${pkgdir}"/usr/bin/REDasm
+  install -D -m755 LibREDasm.so           "${pkgdir}"/usr/lib/LibREDasm.so
+  install -D -m644 "${srcdir}"/REDasm/README.md  "${pkgdir}"/usr/share/doc/${pkgname}/README
+  install -D -m644 "${srcdir}"/REDasm/LICENSE    "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }