Remove flatbuffers, q3d git submodules

3 files changed, 33 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c83595676a18..cef0553c3225 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = solvespace-git
 	pkgdesc = Parametric 2d/3d CAD
-	pkgver = r1579.c514dda
-	pkgrel = 2
+	pkgver = r1635.942bf3f
+	pkgrel = 1
 	url = https://solvespace.com
 	arch = x86_64
 	license = GPL3
@@ -14,13 +14,11 @@ pkgbase = solvespace-git
 	source = git+https://github.com/solvespace/solvespace.git
 	source = git+https://github.com/solvespace/angle.git
 	source = git+https://github.com/solvespace/cairo.git
-	source = git+https://github.com/google/flatbuffers.git
 	source = git+https://git.savannah.nongnu.org/r/freetype/freetype2.git
 	source = git+https://github.com/solvespace/libdxfrw.git
 	source = git+https://github.com/glennrp/libpng.git
 	source = git+https://github.com/microsoft/mimalloc.git
 	source = git+https://github.com/solvespace/pixman.git
-	source = git+https://github.com/q3k/q3d.git
 	source = git+https://github.com/madler/zlib.git
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -31,8 +29,6 @@ pkgbase = solvespace-git
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
 
 pkgname = solvespace-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..4367ae4a50ac
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index e461e82d7a83..786e0ec2793c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 _pkgname='solvespace'
 pkgname="${_pkgname}-git"
-pkgver=r1579.c514dda
-pkgrel=2
+pkgver=r1635.942bf3f
+pkgrel=1
 pkgdesc='Parametric 2d/3d CAD'
 arch=('x86_64')
 url='https://solvespace.com'
@@ -17,31 +17,34 @@ conflicts=("${_pkgname}")
 source=("git+${_url_source}.git"
         "git+${_url_source%/*}/angle.git"
         "git+${_url_source%/*}/cairo.git"
-        "git+https://github.com/google/flatbuffers.git"
-        "git+https://git.savannah.nongnu.org/r/freetype/freetype2.git"
+        'git+https://git.savannah.nongnu.org/r/freetype/freetype2.git'
         "git+${_url_source%/*}/libdxfrw.git"
-        "git+https://github.com/glennrp/libpng.git"
-        "git+https://github.com/microsoft/mimalloc.git"
+        'git+https://github.com/glennrp/libpng.git'
+        'git+https://github.com/microsoft/mimalloc.git'
         "git+${_url_source%/*}/pixman.git"
-        "git+https://github.com/q3k/q3d.git"
-        "git+https://github.com/madler/zlib.git")
-sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
-            'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
+        'git+https://github.com/madler/zlib.git')
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP')
 
 prepare() {
   cd "${_pkgname}"
   # Submodule list: https://github.com/solvespace/solvespace/raw/master/.gitmodules
   git submodule init
-  git config submodule.extlib/angle.url "${srcdir}/angle"
-  git config submodule.extlib/cairo.url "${srcdir}/cairo"
-  git config submodule.extlib/flatbuffers.url "${srcdir}/flatbuffers"
-  git config submodule.extlib/freetype.url "${srcdir}/freetype2"
-  git config submodule.extlib/libdxfrw.url "${srcdir}/libdxfrw"
-  git config submodule.extlib/libpng.url "${srcdir}/libpng"
-  git config submodule.extlib/mimalloc.url "${srcdir}/mimalloc"
-  git config submodule.extlib/pixman.url "${srcdir}/pixman"
-  git config submodule.extlib/q3d.url "${srcdir}/q3d"
-  git config submodule.extlib/zlib.url "${srcdir}/zlib"
+  git config 'submodule.extlib/angle.url' "${srcdir}/angle"
+  git config 'submodule.extlib/cairo.url' "${srcdir}/cairo"
+  git config 'submodule.extlib/freetype.url' "${srcdir}/freetype2"
+  git config 'submodule.extlib/libdxfrw.url' "${srcdir}/libdxfrw"
+  git config 'submodule.extlib/libpng.url' "${srcdir}/libpng"
+  git config 'submodule.extlib/mimalloc.url' "${srcdir}/mimalloc"
+  git config 'submodule.extlib/pixman.url' "${srcdir}/pixman"
+  git config 'submodule.extlib/zlib.url' "${srcdir}/zlib"
   git submodule update
 }
 
@@ -53,16 +56,16 @@ pkgver() {
 build() {
   export CFLAGS+=" ${CPPFLAGS}"
   export CXXFLAGS+=" ${CPPFLAGS}"
-  cmake -B build -S "${_pkgname}" \
+  cmake -B 'build' -S "${_pkgname}" \
     -DCMAKE_BUILD_TYPE='None' \
     -DCMAKE_INSTALL_PREFIX='/usr' \
     -Wno-dev
-  make -C build
+  make -C 'build'
 }
 
 package() {
-  make DESTDIR="${pkgdir}" PREFIX="/usr" -C "build" install
-  install -Dm644 -t "${pkgdir}/usr/share/doc/${_pkgname}" "${_pkgname}/README.md"
+  make DESTDIR="${pkgdir}" PREFIX='/usr' -C 'build' install
+  install -Dvm644 "${_pkgname}/README.md" -t "${pkgdir}/usr/share/doc/${_pkgname}"
 }
 
 # vim: ts=2 sw=2 et: