Fixed fundamental issues with build()

2 files changed, 19 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16e54a1deb3b..202bd8340b5c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,11 +2,12 @@ pkgbase = godot-voxel
 	pkgdesc = The Godot game engine with Zylann's voxel tools module
 	pkgver = 4.0
 	pkgrel = 1
-	url = https://voxel-tools.readthedocs.io/en/latest/
+	url = https://voxel-tools.readthedocs.io/
 	arch = x86_64
 	license = MIT
 	makedepends = scons
 	makedepends = gcc
+	makedepends = git
 	depends = pkgconf
 	depends = libxcursor
 	depends = libxinerama
@@ -18,7 +19,7 @@ pkgbase = godot-voxel
 	depends = alsa-lib
 	depends = pulseaudio
 	source = godot::git+https://github.com/godotengine/godot.git#branch=4.0
-	source = godot_voxel::git+https://github.com/Zylann/godot_voxel.git#branch=godot4
+	source = voxel::git+https://github.com/Zylann/godot_voxel.git#branch=godot4.0
 	source = godot-voxel.desktop
 	sha256sums = SKIP
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 6a5e6fdda646..34cf07462365 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,36 +8,36 @@ pkgname=godot-voxel
 pkgver=4.0
 pkgrel=1
 pkgdesc="The Godot game engine with Zylann's voxel tools module"
-url="https://voxel-tools.readthedocs.io/en/latest/"
+url="https://voxel-tools.readthedocs.io/"
 license=('MIT')
 arch=('x86_64')
-makedepends=('scons' 'gcc')
+makedepends=('scons' 'gcc' 'git')
 depends=('pkgconf' 'libxcursor' 'libxinerama' 'libxi' 'libxrandr' 'mesa' 'glu' 'libglvnd' 'alsa-lib' 'pulseaudio')
 source=("godot::git+https://github.com/godotengine/godot.git#branch=4.0"
-        "godot_voxel::git+https://github.com/Zylann/godot_voxel.git#branch=godot4"
-        "godot-voxel.desktop" )
+        "voxel::git+https://github.com/Zylann/godot_voxel.git#branch=godot4.0"
+        "$pkgname.desktop" )
 sha256sums=('SKIP'
             'SKIP'
             'SKIP')
 
 prepare() {
-  cd "${srcdir}" 
-  ln -s "$srcdir/godot_voxel" "$srcdir/godot/modules/voxel"
+  ln -s "$srcdir/voxel" "$srcdir/godot/modules/voxel"
+  
+  # Source: https://github.com/Zylann/godot_voxel/commit/13567b4fb8f20ca0b5dcf71e76c9c7a6452dc5ca
+  cd voxel
+  git cherry-pick -n 13567b4fb8f20ca0b5dcf71e76c9c7a6452dc5ca
 }
 
-build() { 
-  cd "${srcdir}/godot"
+build() {
+  cd $srcdir/godot
   scons platform=linuxbsd colored=yes
 }
 
 package() {
-  cd ${srcdir}
-  install -Dm644 ${srcdir}/godot-voxel.desktop "${pkgdir}"/usr/share/applications/godot-voxel.desktop
-  install -Dm644 "${srcdir}"/godot/icon.svg "${pkgdir}"/usr/share/pixmaps/godot-voxel.svg
-
-  cd "${srcdir}"/godot
-  install -D -m755 ./bin/godot.linuxbsd.editor.x86_64 "${pkgdir}"/usr/bin/godot-voxel
-  #install -D -m644 "${srcdir}"/godot/LICENSE.txt "${pkgdir}"/usr/share/licenses/godot/LICENSE
-  #install -D -m644 "${srcdir}"/godot/misc/dist/linux/godot.6 "${pkgdir}"/usr/share/man/man6/godot.6
+  install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
+  install -Dm644 $srcdir/godot/icon.svg $pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg
+  install -D -m755 $srcdir/godot/bin/godot.linuxbsd.editor.x86_64 $pkgdir/usr/bin/$pkgname
+  install -D -m644 ${srcdir}/godot/LICENSE.txt "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+  install -D -m644 ${srcdir}/godot/misc/dist/linux/godot.6 "${pkgdir}"/usr/share/man/man6/$pkgname.6
 }