mirror of
https://github.com/void-linux/void-packages.git
synced 2025-04-16 06:07:00 +02:00
endless-sky: update to 0.10.4.
This commit is contained in:
Andrew J. Hesford
parent
559ab36d29
commit
8558f33408
3 changed files with 9 additions and 95 deletions
|
|
@ -1,82 +0,0 @@
|
|||
We need to patch for PREFIX and s/games/bin anyway,
|
||||
let's patch $DESTDIR, too
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -37,7 +37,7 @@ opts.AddVariables(
|
||||
PathVariable("BUILDDIR", "Directory to store compiled object files in", "build", PathVariable.PathIsDirCreate),
|
||||
PathVariable("BIN_DIR", "Directory to store binaries in", ".", PathVariable.PathIsDirCreate),
|
||||
PathVariable("DESTDIR", "Destination root directory, e.g. if building a package", "", PathVariable.PathAccept),
|
||||
- PathVariable("PREFIX", "Directory to install under (will be prefixed by DESTDIR)", "/usr/local", PathVariable.PathIsDirCreate),
|
||||
+ PathVariable("PREFIX", "Directory to install under (will be prefixed by DESTDIR)", "/usr", PathVariable.PathIsDirCreate),
|
||||
)
|
||||
opts.Update(env)
|
||||
Help(opts.GenerateHelpText(env))
|
||||
@@ -157,22 +157,22 @@ env.AlwaysBuild("test")
|
||||
|
||||
|
||||
# Install the binary:
|
||||
-env.Install("$DESTDIR$PREFIX/games", sky)
|
||||
+install = env.Install("$PREFIX/bin", sky)
|
||||
|
||||
# Install the desktop file:
|
||||
-env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop")
|
||||
+install += env.Install("$PREFIX/share/applications", "endless-sky.desktop")
|
||||
|
||||
# Install app center metadata:
|
||||
-env.Install("$DESTDIR$PREFIX/share/appdata", "endless-sky.appdata.xml")
|
||||
+install += env.Install("$PREFIX/share/appdata", "endless-sky.appdata.xml")
|
||||
|
||||
# Install icons, keeping track of all the paths.
|
||||
# Most Ubuntu apps supply 16, 22, 24, 32, 48, and 256, and sometimes others.
|
||||
sizes = ["16x16", "22x22", "24x24", "32x32", "48x48", "128x128", "256x256", "512x512"]
|
||||
icons = []
|
||||
for size in sizes:
|
||||
- destination = "$DESTDIR$PREFIX/share/icons/hicolor/" + size + "/apps/endless-sky.png"
|
||||
+ destination = "$PREFIX/share/icons/hicolor/" + size + "/apps/endless-sky.png"
|
||||
icons.append(destination)
|
||||
- env.InstallAs(destination, "icons/icon_" + size + ".png")
|
||||
+ install += env.InstallAs(destination, "icons/icon_" + size + ".png")
|
||||
|
||||
# If any of those icons changed, also update the cache.
|
||||
# Do not update the cache if we're not installing into "usr".
|
||||
@@ -181,28 +181,30 @@ if env.get("PREFIX").startswith("/usr/")
|
||||
env.Command(
|
||||
[],
|
||||
icons,
|
||||
- "gtk-update-icon-cache -t $DESTDIR$PREFIX/share/icons/hicolor/")
|
||||
+ "gtk-update-icon-cache -t $PREFIX/share/icons/hicolor/")
|
||||
|
||||
# Install the man page.
|
||||
env.Command(
|
||||
- "$DESTDIR$PREFIX/share/man/man6/endless-sky.6.gz",
|
||||
+ "$PREFIX/share/man/man6/endless-sky.6.gz",
|
||||
"endless-sky.6",
|
||||
"gzip -c $SOURCE > $TARGET")
|
||||
|
||||
# Install the data files.
|
||||
def RecursiveInstall(env, target, source):
|
||||
rootIndex = len(env.Dir(source).abspath) + 1
|
||||
+ install = []
|
||||
for node in env.Glob(pathjoin(source, '*')):
|
||||
if node.isdir():
|
||||
name = node.abspath[rootIndex:]
|
||||
- RecursiveInstall(env, pathjoin(target, name), node.abspath)
|
||||
+ install += RecursiveInstall(env, pathjoin(target, name), node.abspath)
|
||||
else:
|
||||
- env.Install(target, node)
|
||||
-RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/data", "data")
|
||||
-RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/images", "images")
|
||||
-RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/sounds", "sounds")
|
||||
-env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "credits.txt")
|
||||
-env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "keys.txt")
|
||||
+ install += env.Install(target, node)
|
||||
+ return install
|
||||
+install += RecursiveInstall(env, "$PREFIX/share/games/endless-sky/data", "data")
|
||||
+install += RecursiveInstall(env, "$PREFIX/share/games/endless-sky/images", "images")
|
||||
+install += RecursiveInstall(env, "$PREFIX/share/games/endless-sky/sounds", "sounds")
|
||||
+install += env.Install("$PREFIX/share/games/endless-sky", "credits.txt")
|
||||
+install += env.Install("$PREFIX/share/games/endless-sky", "keys.txt")
|
||||
|
||||
# Make the word "install" in the command line do an installation.
|
||||
-env.Alias("install", "$DESTDIR$PREFIX")
|
||||
+env.Alias("install", install)
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- a/source/Panel.h 2020-05-01 21:02:38.000000000 +0200
|
||||
+++ b/source/Panel.h 2020-09-05 07:34:01.667091079 +0200
|
||||
@@ -15,6 +15,7 @@
|
||||
|
||||
#include "Rectangle.h"
|
||||
|
||||
+#include <string>
|
||||
#include <functional>
|
||||
#include <list>
|
||||
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
# Template file for 'endless-sky'
|
||||
pkgname=endless-sky
|
||||
version=0.9.14
|
||||
version=0.10.4
|
||||
revision=1
|
||||
build_style=scons
|
||||
build_style=cmake
|
||||
configure_args="-DES_USE_VCPKG=OFF -DCMAKE_BUILD_TYPE=Release"
|
||||
makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel
|
||||
libopenal-devel libpng-devel"
|
||||
short_desc="Space exploring, trading, and combat game"
|
||||
|
|
@ -11,5 +12,10 @@ license="GPL-3.0-or-later"
|
|||
homepage="http://endless-sky.github.io/"
|
||||
changelog=https://raw.githubusercontent.com/endless-sky/endless-sky/master/changelog
|
||||
distfiles="https://github.com/endless-sky/endless-sky/archive/v${version}.tar.gz"
|
||||
checksum=6c22571b5398a18297aa7410890c319b5cb292a833889b4e7c0cd94d831f29af
|
||||
checksum=baeaa462315587788d81c58847d600f66f1ced063cdfb4cf108d6a26fe75e175
|
||||
replaces="endless-sky-data>=0"
|
||||
|
||||
post_install() {
|
||||
vmkdir usr/bin
|
||||
mv "${DESTDIR}/usr/games/endless-sky" "${DESTDIR}/usr/bin"
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue