From e7002af8e962b0c1913f2f0febbdfb60999e488c Mon Sep 17 00:00:00 2001 From: HurricanePootis Date: Fri, 10 Mar 2023 19:01:01 -0600 Subject: [PATCH] Make godot3 be able to be installed with godot --- .SRCINFO | 6 +++--- PKGBUILD | 32 +++++++++++++++++++++----------- godot3.patch | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 14 deletions(-) create mode 100644 godot3.patch diff --git a/.SRCINFO b/.SRCINFO index 0f7e1e2..aba6154 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = godot3 pkgdesc = Advanced cross-platform 2D and 3D game engine (3.x Branch) pkgver = 3.5.2 - pkgrel = 1 + pkgrel = 2 url = https://godotengine.org arch = x86_64 license = MIT @@ -28,9 +28,9 @@ pkgbase = godot3 depends = opusfile optdepends = pipewire-alsa optdepends = pipewire-pulse - provides = godot - conflicts = godot source = godot-3.5.2.tar.gz::https://github.com/godotengine/godot/archive/3.5.2-stable.tar.gz + source = godot3.patch b2sums = f5f9449711b7727846dcc34d0ff44c7fdb64fbdf29c85ca0ba42c2933d01c41aaac8f584e1b9c33b36fc30cfe47710fae935502855255da305694873a9148e7c + b2sums = 5ed41b79e0121e66614cce997d8c05b3efafefb45d93a426fe4f63bc9917a8dad8519d3f11021a62d6b3a8f7210f2cc86d03361a51dcf79007b0eb71289c1370 pkgname = godot3 diff --git a/PKGBUILD b/PKGBUILD index dbb94df..82bb98d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer: HurricanePootis +# Contributor: seth # Contributor: Alexander F. Rødseth # Contributor: loqs # Contributor: Jorge Araya Navarro @@ -8,7 +9,7 @@ _pkgname=godot pkgname=godot3 pkgver=3.5.2 -pkgrel=1 +pkgrel=2 pkgdesc='Advanced cross-platform 2D and 3D game engine (3.x Branch)' url='https://godotengine.org' license=(MIT) @@ -17,14 +18,18 @@ makedepends=(gcc scons yasm alsa-lib pulseaudio) depends=(embree freetype2 libglvnd libtheora libvorbis libvpx libwebp libwslay libsquish libxcursor libxi libxinerama libxrandr mbedtls miniupnpc opusfile) optdepends=(pipewire-alsa pipewire-pulse) -provides=("godot") -conflicts=("godot") -source=("$_pkgname-$pkgver.tar.gz::https://github.com/godotengine/godot/archive/$pkgver-stable.tar.gz") -b2sums=('f5f9449711b7727846dcc34d0ff44c7fdb64fbdf29c85ca0ba42c2933d01c41aaac8f584e1b9c33b36fc30cfe47710fae935502855255da305694873a9148e7c') +source=("$_pkgname-$pkgver.tar.gz::https://github.com/godotengine/godot/archive/$pkgver-stable.tar.gz" + "godot3.patch") +b2sums=('f5f9449711b7727846dcc34d0ff44c7fdb64fbdf29c85ca0ba42c2933d01c41aaac8f584e1b9c33b36fc30cfe47710fae935502855255da305694873a9148e7c' + '5ed41b79e0121e66614cce997d8c05b3efafefb45d93a426fe4f63bc9917a8dad8519d3f11021a62d6b3a8f7210f2cc86d03361a51dcf79007b0eb71289c1370') prepare() { # Disable the check that adds -no-pie to LINKFLAGS, for gcc != 6 sed -i 's,0] >,0] =,g' $_pkgname-$pkgver-stable/platform/x11/detect.py + + # Make godot build a binary compatible with Godot 4 + cd "$srcdir/$_pkgname-$pkgver-stable" + patch -p1 < "$srcdir/godot3.patch" } build() { @@ -59,13 +64,18 @@ build() { } package() { + # make godot3 compatible with godot + cd "$srcdir/$_pkgname-$pkgver-stable/misc/dist/linux/" + + sed -i 's/Godot Engine/Godot Engine 3 LTS/g' org.godotengine.Godot.desktop + cd $srcdir/$_pkgname-$pkgver-stable install -Dm644 misc/dist/linux/org.godotengine.Godot.desktop \ - "$pkgdir/usr/share/applications/godot.desktop" - install -Dm644 icon.svg "$pkgdir/usr/share/pixmaps/godot.svg" - install -Dm755 bin/godot.x11.opt.tools.64 "$pkgdir/usr/bin/$_pkgname" - install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/godot/LICENSE" - install -Dm644 misc/dist/linux/godot.6 "$pkgdir/usr/share/man/man6/godot.6" + "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 icon.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg" + install -Dm755 bin/godot.x11.opt.tools.64 "$pkgdir/usr/bin/$pkgname" + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 misc/dist/linux/godot.6 "$pkgdir/usr/share/man/man6/$pkgname.6" install -Dm644 misc/dist/linux/org.godotengine.Godot.xml \ - "$pkgdir/usr/share/mime/packages/org.godotengine.Godot.xml" + "$pkgdir/usr/share/mime/packages/org.godotengine.Godot3.xml" } diff --git a/godot3.patch b/godot3.patch new file mode 100644 index 0000000..ce9cd4d --- /dev/null +++ b/godot3.patch @@ -0,0 +1,40 @@ +From 170a35983d6421b6c6f50e3211561688b914c960 Mon Sep 17 00:00:00 2001 +From: seth +Date: Fri, 10 Mar 2023 19:28:55 -0500 +Subject: [PATCH] specify 3 in version + +this avoids conflicts with newer and older versions of godot +--- + misc/dist/linux/org.godotengine.Godot.desktop | 4 ++-- + version.py | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/misc/dist/linux/org.godotengine.Godot.desktop b/misc/dist/linux/org.godotengine.Godot.desktop +index db0c80e4f1..71be0c88d3 100644 +--- a/misc/dist/linux/org.godotengine.Godot.desktop ++++ b/misc/dist/linux/org.godotengine.Godot.desktop +@@ -8,8 +8,8 @@ Comment=Multi-platform 2D and 3D game engine with a feature-rich editor + Comment[el]=2D και 3D μηχανή παιχνιδιού πολλαπλών πλατφορμών με επεξεργαστή πλούσιο σε χαρακτηριστικά + Comment[fr]=Moteur de jeu 2D et 3D multiplateforme avec un éditeur riche en fonctionnalités + Comment[zh_CN]=多平台 2D 和 3D 游戏引擎,带有功能丰富的编辑器 +-Exec=godot %f +-Icon=godot ++Exec=godot3 %f ++Icon=godot3 + Terminal=false + PrefersNonDefaultGPU=true + Type=Application +diff --git a/version.py b/version.py +index 153c199892..2376dcf2fc 100644 +--- a/version.py ++++ b/version.py +@@ -1,5 +1,5 @@ +-short_name = "godot" +-name = "Godot Engine" ++short_name = "godot3" ++name = "Godot Engine 3" + major = 3 + minor = 5 + patch = 2 +-- +2.39.2.windows.1