Add and track the submodules sources in the PKGBUILD file

2 files changed, 123 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1775de3bb4fe..f7071d424c30 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = detect-it-easy-git
 	pkgdesc = Detect It Easy, or abbreviated "DIE" is a program for determining types of files
 	pkgver = 3.02.r8.bf4dfe4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/horsicq/Detect-It-Easy/
 	arch = x86_64
 	license = MIT
@@ -21,8 +21,80 @@ pkgbase = detect-it-easy-git
 	provides = detect-it-easy
 	conflicts = detect-it-easy
 	source = git+https://github.com/horsicq/DIE-engine.git
+	source = DIE-engine/Controls::git+https://github.com/horsicq/Controls.git
+	source = DIE-engine/Detect-It-Easy::git+https://github.com/horsicq/Detect-It-Easy.git
+	source = DIE-engine/FormatDialogs::git+https://github.com/horsicq/FormatDialogs.git
+	source = DIE-engine/FormatWidgets::git+https://github.com/horsicq/FormatWidgets.git
+	source = DIE-engine/Formats::git+https://github.com/horsicq/Formats.git
+	source = DIE-engine/QHexView::git+https://github.com/horsicq/QHexView.git
+	source = DIE-engine/SpecAbstract::git+https://github.com/horsicq/SpecAbstract.git
+	source = DIE-engine/StaticScan::git+https://github.com/horsicq/StaticScan.git
+	source = DIE-engine/XArchive::git+https://github.com/horsicq/XArchive.git
+	source = DIE-engine/XCapstone::git+https://github.com/horsicq/XCapstone.git
+	source = DIE-engine/XDEX::git+https://github.com/horsicq/XDEX.git
+	source = DIE-engine/XDemangle::git+https://github.com/horsicq/XDemangle.git
+	source = DIE-engine/XDemangleWidget::git+https://github.com/horsicq/XDemangleWidget.git
+	source = DIE-engine/XDisasm::git+https://github.com/horsicq/XDisasm.git
+	source = DIE-engine/XDisasmView::git+https://github.com/horsicq/XDisasmView.git
+	source = DIE-engine/XEntropyWidget::git+https://github.com/horsicq/XEntropyWidget.git
+	source = DIE-engine/XGithub::git+https://github.com/horsicq/XGithub.git
+	source = DIE-engine/XHashWidget::git+https://github.com/horsicq/XHashWidget.git
+	source = DIE-engine/XHexEdit::git+https://github.com/horsicq/XHexEdit.git
+	source = DIE-engine/XHexView::git+https://github.com/horsicq/XHexView.git
+	source = DIE-engine/XLLVMDemangler::git+https://github.com/horsicq/XLLVMDemangler.git
+	source = DIE-engine/XMIME::git+https://github.com/horsicq/XMIME.git
+	source = DIE-engine/XMIMEWidget::git+https://github.com/horsicq/XMIMEWidget.git
+	source = DIE-engine/XMemoryMapWidget::git+https://github.com/horsicq/XMemoryMapWidget.git
+	source = DIE-engine/XOptions::git+https://github.com/horsicq/XOptions.git
+	source = DIE-engine/XQwt::git+https://github.com/horsicq/XQwt.git
+	source = DIE-engine/XShortcuts::git+https://github.com/horsicq/XShortcuts.git
+	source = DIE-engine/XSingleApplication::git+https://github.com/horsicq/XSingleApplication.git
+	source = DIE-engine/XStyles::git+https://github.com/horsicq/XStyles.git
+	source = DIE-engine/XTranslation::git+https://github.com/horsicq/XTranslation.git
+	source = DIE-engine/archive_widget::git+https://github.com/horsicq/archive_widget.git
+	source = DIE-engine/build_tools::git+https://github.com/horsicq/build_tools.git
+	source = DIE-engine/die_script::git+https://github.com/horsicq/die_script.git
+	source = DIE-engine/die_widget::git+https://github.com/horsicq/die_widget.git
+	source = DIE-engine/nfd_widget::git+https://github.com/horsicq/nfd_widget.git
+	source = DIE-engine/signatures::git+https://github.com/horsicq/signatures.git
 	source = detect-it-easy.desktop
 	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
 	sha512sums = 65f33f3c5f3d01e771d3f9c5b1d59b4cedc2441cf002f762239580592b2d98820173427d6385ac1fd339a8ae105a89705caa8540e20b3c65640f80ba4711f446
 
 pkgname = detect-it-easy-git
diff --git a/PKGBUILD b/PKGBUILD
index 4a3052947299..2f2300d306ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=detect-it-easy-git
 pkgver=3.02.r8.bf4dfe4
-pkgrel=1
+pkgrel=2
 pkgdesc='Detect It Easy, or abbreviated "DIE" is a program for determining types of files'
 arch=('x86_64')
 url='https://github.com/horsicq/Detect-It-Easy/'
@@ -30,15 +30,53 @@ makedepends=(
   'imagemagick'
   'qt5-tools'
 )
+_srcname="DIE-engine"
 source=(
   'git+https://github.com/horsicq/DIE-engine.git'
+  "${_srcname}/Controls::git+https://github.com/horsicq/Controls.git"
+  "${_srcname}/Detect-It-Easy::git+https://github.com/horsicq/Detect-It-Easy.git"
+  "${_srcname}/FormatDialogs::git+https://github.com/horsicq/FormatDialogs.git"
+  "${_srcname}/FormatWidgets::git+https://github.com/horsicq/FormatWidgets.git"
+  "${_srcname}/Formats::git+https://github.com/horsicq/Formats.git"
+  "${_srcname}/QHexView::git+https://github.com/horsicq/QHexView.git"
+  "${_srcname}/SpecAbstract::git+https://github.com/horsicq/SpecAbstract.git"
+  "${_srcname}/StaticScan::git+https://github.com/horsicq/StaticScan.git"
+  "${_srcname}/XArchive::git+https://github.com/horsicq/XArchive.git"
+  "${_srcname}/XCapstone::git+https://github.com/horsicq/XCapstone.git"
+  "${_srcname}/XDEX::git+https://github.com/horsicq/XDEX.git"
+  "${_srcname}/XDemangle::git+https://github.com/horsicq/XDemangle.git"
+  "${_srcname}/XDemangleWidget::git+https://github.com/horsicq/XDemangleWidget.git"
+  "${_srcname}/XDisasm::git+https://github.com/horsicq/XDisasm.git"
+  "${_srcname}/XDisasmView::git+https://github.com/horsicq/XDisasmView.git"
+  "${_srcname}/XEntropyWidget::git+https://github.com/horsicq/XEntropyWidget.git"
+  "${_srcname}/XGithub::git+https://github.com/horsicq/XGithub.git"
+  "${_srcname}/XHashWidget::git+https://github.com/horsicq/XHashWidget.git"
+  "${_srcname}/XHexEdit::git+https://github.com/horsicq/XHexEdit.git"
+  "${_srcname}/XHexView::git+https://github.com/horsicq/XHexView.git"
+  "${_srcname}/XLLVMDemangler::git+https://github.com/horsicq/XLLVMDemangler.git"
+  "${_srcname}/XMIME::git+https://github.com/horsicq/XMIME.git"
+  "${_srcname}/XMIMEWidget::git+https://github.com/horsicq/XMIMEWidget.git"
+  "${_srcname}/XMemoryMapWidget::git+https://github.com/horsicq/XMemoryMapWidget.git"
+  "${_srcname}/XOptions::git+https://github.com/horsicq/XOptions.git"
+  "${_srcname}/XQwt::git+https://github.com/horsicq/XQwt.git"
+  "${_srcname}/XShortcuts::git+https://github.com/horsicq/XShortcuts.git"
+  "${_srcname}/XSingleApplication::git+https://github.com/horsicq/XSingleApplication.git"
+  "${_srcname}/XStyles::git+https://github.com/horsicq/XStyles.git"
+  "${_srcname}/XTranslation::git+https://github.com/horsicq/XTranslation.git"
+  "${_srcname}/archive_widget::git+https://github.com/horsicq/archive_widget.git"
+  "${_srcname}/build_tools::git+https://github.com/horsicq/build_tools.git"
+  "${_srcname}/die_script::git+https://github.com/horsicq/die_script.git"
+  "${_srcname}/die_widget::git+https://github.com/horsicq/die_widget.git"
+  "${_srcname}/nfd_widget::git+https://github.com/horsicq/nfd_widget.git"
+  "${_srcname}/signatures::git+https://github.com/horsicq/signatures.git"
   'detect-it-easy.desktop'
 )
 sha512sums=(
-  'SKIP'
+  'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
+  'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
+  'SKIP' 'SKIP' 'SKIP'
   '65f33f3c5f3d01e771d3f9c5b1d59b4cedc2441cf002f762239580592b2d98820173427d6385ac1fd339a8ae105a89705caa8540e20b3c65640f80ba4711f446'
 )
-_srcname="DIE-engine"
 _pkgname="${pkgname/-git/}"
 _stop='\e[m'
 _color="\e[33m"
@@ -53,9 +91,15 @@ pkgver() {
 }
 
 prepare() {
-  cd "$_srcname" || return
-  echo -e "${_prefix}Checking out external dependencies (git submodules)"
-  git submodule update --init --recursive
+  #cd "$_srcname" || return
+  echo -e "${_prefix}Moving external dependencies (git submodules)"
+  _subdirs="Controls Detect-It-Easy FormatDialogs FormatWidgets Formats QHexView SpecAbstract StaticScan XArchive XCapstone \
+XDEX XDemangle XDemangleWidget XDisasm XDisasmView XEntropyWidget XGithub XHashWidget XHexEdit XHexView XLLVMDemangler XMIME \
+XMIMEWidget XMemoryMapWidget XOptions XQwt XShortcuts XSingleApplication XStyles XTranslation archive_widget build_tools \
+die_script die_widget nfd_widget signatures"
+  for _subdir in $_subdirs; do
+    mv "$_subdir" "$_srcname"
+  done
 }
 
 build() {