Update the "git submodule" command with new Git security settings

2 files changed, 20 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fde3f6a7be5f..f558b9411581 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,25 @@
 pkgbase = natron-compositor-git
 	pkgdesc = Open source compositing software
-	pkgver = 2.5.0.alpha.2.r83.g395c2227a
+	pkgver = 2.6.0.alpha1.r4.gdd42d8a93
 	pkgrel = 1
 	url = https://natrongithub.github.io/
 	arch = x86_64
 	license = GPL
 	makedepends = boost
 	makedepends = extra-cmake-modules
-	makedepends = expat
 	makedepends = git
+	makedepends = glfw
 	makedepends = openmp
 	makedepends = ninja
+	makedepends = python-qtpy
+	makedepends = shiboken2
 	depends = boost-libs
 	depends = cairo
-	depends = glfw
 	depends = pyside2
-	depends = python-qtpy
-	depends = shiboken2
-	optdepends = openfx-arena-git: Extra OpenFX plugins for Natron
-	optdepends = openfx-gmic-git: OpenFX wrapper for the GMIC framework
-	optdepends = openfx-io-git: Readers/Writers plugins
-	optdepends = openfx-misc-git: Miscellaneous OpenFX plugins
+	optdepends = openfx-arena: Extra OpenFX plugins for Natron
+	optdepends = openfx-gmic: OpenFX wrapper for the GMIC framework
+	optdepends = openfx-io: Readers/Writers plugins
+	optdepends = openfx-misc: Miscellaneous OpenFX plugins
 	conflicts = natron-compositor
 	source = natron::git+https://github.com/NatronGitHub/Natron
 	source = openfx::git+https://github.com/NatronGitHub/openfx
diff --git a/PKGBUILD b/PKGBUILD
index d20ac45171c5..2bee60b022b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,18 +4,18 @@
 # Contributor: liberodark
 
 pkgname=natron-compositor-git
-pkgver=2.5.0.alpha.2.r83.g395c2227a
+pkgver=2.6.0.alpha1.r4.gdd42d8a93
 pkgrel=1
 pkgdesc="Open source compositing software"
 arch=('x86_64')
 url="https://natrongithub.github.io/"
 license=('GPL')
-depends=('boost-libs' 'cairo' 'glfw' 'pyside2' 'python-qtpy' 'shiboken2')
-makedepends=('boost' 'extra-cmake-modules' 'expat' 'git' 'openmp' 'ninja')
-optdepends=('openfx-arena-git: Extra OpenFX plugins for Natron'
-            'openfx-gmic-git: OpenFX wrapper for the GMIC framework'
-            'openfx-io-git: Readers/Writers plugins'
-            'openfx-misc-git: Miscellaneous OpenFX plugins')
+depends=('boost-libs' 'cairo' 'pyside2')
+makedepends=('boost' 'extra-cmake-modules' 'git' 'glfw' 'openmp' 'ninja' 'python-qtpy' 'shiboken2')
+optdepends=('openfx-arena: Extra OpenFX plugins for Natron'
+            'openfx-gmic: OpenFX wrapper for the GMIC framework'
+            'openfx-io: Readers/Writers plugins'
+            'openfx-misc: Miscellaneous OpenFX plugins')
 
 _pkgname=${pkgname%%-*}
 _url="https://github.com/NatronGitHub"
@@ -52,11 +52,11 @@ prepare() {
   git config submodule.libs/SequenceParsing.url "$srcdir/SequenceParsing"
   git config submodule.Tests/google-mock.url "$srcdir/google-mock"
   git config submodule.Tests/google-test.url "$srcdir/google-test"
-  git submodule update
+  git -c protocol.file.allow=always submodule update
 
   cd libs/SequenceParsing
   git config submodule.tinydir.url "$srcdir/tinydir"
-  git submodule update
+  git -c protocol.file.allow=always submodule update
 }
 
 build() {
@@ -64,9 +64,9 @@ build() {
 
   cmake -G Ninja \
         -B build \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DNATRON_BUILD_TESTS=OFF
+        -D CMAKE_BUILD_TYPE=Release \
+        -D CMAKE_INSTALL_PREFIX=/usr \
+        -D NATRON_BUILD_TESTS=OFF
 
   ninja -C build/
 }