[arch-commits] Commit in simutrans/repos/community-x86_64 (12 files)
Balló György
bgyorgy at archlinux.org
Sat Oct 24 20:07:02 UTC 2020
Date: Saturday, October 24, 2020 @ 20:07:02
Author: bgyorgy
Revision: 731633
archrelease: copy trunk to community-x86_64
Added:
simutrans/repos/community-x86_64/PKGBUILD
(from rev 731632, simutrans/trunk/PKGBUILD)
simutrans/repos/community-x86_64/config.patch
(from rev 731632, simutrans/trunk/config.patch)
simutrans/repos/community-x86_64/path-for-game-data.patch
(from rev 731632, simutrans/trunk/path-for-game-data.patch)
simutrans/repos/community-x86_64/settings-folder.patch
(from rev 731632, simutrans/trunk/settings-folder.patch)
simutrans/repos/community-x86_64/simutrans.appdata.xml
(from rev 731632, simutrans/trunk/simutrans.appdata.xml)
simutrans/repos/community-x86_64/simutrans.desktop
(from rev 731632, simutrans/trunk/simutrans.desktop)
Deleted:
simutrans/repos/community-x86_64/PKGBUILD
simutrans/repos/community-x86_64/config.patch
simutrans/repos/community-x86_64/path-for-game-data.patch
simutrans/repos/community-x86_64/settings-folder.patch
simutrans/repos/community-x86_64/simutrans.appdata.xml
simutrans/repos/community-x86_64/simutrans.desktop
--------------------------+
PKGBUILD | 129 ++++++++++++++++++++++-----------------------
config.patch | 62 ++++++++++-----------
path-for-game-data.patch | 36 ++++++------
settings-folder.patch | 24 ++++----
simutrans.appdata.xml | 38 ++++++-------
simutrans.desktop | 18 +++---
6 files changed, 151 insertions(+), 156 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-10-24 20:06:57 UTC (rev 731632)
+++ PKGBUILD 2020-10-24 20:07:02 UTC (rev 731633)
@@ -1,65 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-# Contributor: Gilles Gagniard <gilles at gagniard.org>
-# Contributor: JD Steffen <jd at steffennet dot org>
-
-pkgname=simutrans
-pkgver=121.0
-_pkgver=121-0
-pkgrel=1
-pkgdesc="Transportation simulation game"
-arch=('x86_64')
-url="https://www.simutrans.com/"
-license=('custom:Artistic')
-depends=('gcc-libs' 'zlib' 'sdl_mixer' 'bzip2' 'simutrans-pak64' 'hicolor-icon-theme')
-makedepends=('dos2unix')
-optdepends=('timidity++: play MIDI music')
-source=(https://downloads.sourceforge.net/$pkgname/$pkgname-src-$_pkgver.zip
- https://raw.githubusercontent.com/aburch/simutrans/8593f5b1248d03f907a149f7abc41ae6512009e1/simutrans.svg
- settings-folder.patch
- path-for-game-data.patch
- config.patch
- simutrans.desktop
- simutrans.appdata.xml)
-sha256sums=('69fd95989761a013729106b48135f772f59126398cd93ada072f963c4d1e86b8'
- 'c0c2dd5da146f64901b00c6ee67e0818a166b983a81cee7897c4843aa9f21c81'
- 'cbe5d7c7be96e6e7262c1e3b1c16155f5c179609f081e3ee050bbfc277845f71'
- '1a0fc75fe1422404e424c91f5a23301234b2997cb727b4985c98ac1af6a4582a'
- '24bf2b611706c42fd52dc00d61fa2e28f54a614f17e43bc463817406e63eba3a'
- '99545152f5e739b7eb028152383fa10d3e3d303c99167e1c6e5a6bd7dcd00fa3'
- 'f3d2416de0f725d15b18482c20231228791e65ceeeb7305115a8ea6a2e591dd6')
-
-prepare() {
- # Some files are distributed in DOS format
- find . -type f -exec dos2unix -q '{}' \;
-
- # Adjust paths
- patch -Np0 -i settings-folder.patch
- patch -Np1 -i path-for-game-data.patch
-
- # Configure the build process
- cp config.template config.default
- patch -Np0 -i config.patch
-}
-
-build() {
- make -j1
-}
-
-package() {
- #binary
- install -Dm755 build/default/sim "$pkgdir/usr/bin/simutrans"
-
- #data
- mkdir -p "$pkgdir/usr/share/games"
- cp -r $pkgname "$pkgdir/usr/share/games/"
-
- #desktop file and icon
- install -Dm644 simutrans.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/simutrans.svg"
- install -Dm644 simutrans.desktop "$pkgdir/usr/share/applications/simutrans.desktop"
- install -Dm644 simutrans.appdata.xml "$pkgdir/usr/share/metainfo/simutrans.appdata.xml"
-
- #license
- install -Dm644 simutrans/license.txt "$pkgdir/usr/share/licenses/simutrans/license.txt"
-}
Copied: simutrans/repos/community-x86_64/PKGBUILD (from rev 731632, simutrans/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-10-24 20:07:02 UTC (rev 731633)
@@ -0,0 +1,64 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
+# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: Gilles Gagniard <gilles at gagniard.org>
+# Contributor: JD Steffen <jd at steffennet dot org>
+
+pkgname=simutrans
+pkgver=122.0
+pkgrel=1
+pkgdesc="Transportation simulation game"
+arch=('x86_64')
+url="https://www.simutrans.com/"
+license=('custom:Artistic')
+depends=('gcc-libs' 'zlib' 'sdl2_mixer' 'bzip2' 'simutrans-pak64' 'hicolor-icon-theme')
+makedepends=('dos2unix')
+optdepends=('timidity++: play MIDI music')
+source=(https://downloads.sourceforge.net/$pkgname/$pkgname-src-${pkgver/./-}.zip
+ https://raw.githubusercontent.com/aburch/simutrans/8593f5b1248d03f907a149f7abc41ae6512009e1/simutrans.svg
+ settings-folder.patch
+ path-for-game-data.patch
+ config.patch
+ simutrans.desktop
+ simutrans.appdata.xml)
+sha256sums=('d3b729afc22abe5a3104868f2462305258045082993069a2230b508c02899f03'
+ 'c0c2dd5da146f64901b00c6ee67e0818a166b983a81cee7897c4843aa9f21c81'
+ '5f009471489583fd48bcce5d4869048d1164423771cfd955840ae995cd6a70ca'
+ '1a0fc75fe1422404e424c91f5a23301234b2997cb727b4985c98ac1af6a4582a'
+ 'b80452cf985bde7d86e8e5fca95fb5921bac96a245ff9a2a331e8910b73a3747'
+ '99545152f5e739b7eb028152383fa10d3e3d303c99167e1c6e5a6bd7dcd00fa3'
+ 'f3d2416de0f725d15b18482c20231228791e65ceeeb7305115a8ea6a2e591dd6')
+
+prepare() {
+ # Some files are distributed in DOS format
+ find . -type f -exec dos2unix -q '{}' \;
+
+ # Adjust paths
+ patch -Np0 -i settings-folder.patch
+ patch -Np1 -i path-for-game-data.patch
+
+ # Configure the build process
+ cp config.template config.default
+ patch -Np0 -i config.patch
+}
+
+build() {
+ make
+}
+
+package() {
+ #binary
+ install -Dm755 build/default/sim "$pkgdir/usr/bin/simutrans"
+
+ #data
+ mkdir -p "$pkgdir/usr/share/games"
+ cp -r $pkgname "$pkgdir/usr/share/games/"
+
+ #desktop file and icon
+ install -Dm644 simutrans.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/simutrans.svg"
+ install -Dm644 simutrans.desktop "$pkgdir/usr/share/applications/simutrans.desktop"
+ install -Dm644 simutrans.appdata.xml "$pkgdir/usr/share/metainfo/simutrans.appdata.xml"
+
+ #license
+ install -Dm644 simutrans/license.txt "$pkgdir/usr/share/licenses/simutrans/license.txt"
+}
Deleted: config.patch
===================================================================
--- config.patch 2020-10-24 20:06:57 UTC (rev 731632)
+++ config.patch 2020-10-24 20:07:02 UTC (rev 731633)
@@ -1,33 +0,0 @@
---- config.default.orig 2011-11-10 21:48:01.000000000 +0100
-+++ config.default 2011-11-10 21:51:58.383221979 +0100
-@@ -6,18 +6,18 @@
- #BACKEND = opengl
- #BACKEND = sdl
- #BACKEND = sdl2
--#BACKEND = mixer_sdl
-+BACKEND = mixer_sdl
- #BACKEND = posix
-
- #COLOUR_DEPTH = 0
--#COLOUR_DEPTH = 16
-+COLOUR_DEPTH = 16
-
- #OSTYPE = amiga
- #OSTYPE = beos
- #OSTYPE = cygwin
- #OSTYPE = freebsd
- #OSTYPE = haiku
--#OSTYPE = linux
-+OSTYPE = linux
- #OSTYPE = mingw
- #OSTYPE = mac
-
-@@ -37,6 +37,6 @@
- #SDL_CONFIG = sdl-config
- #SDL2_CONFIG = sdl2-config
-
--#VERBOSE = 1
-+VERBOSE = 1
-
- # The following useful conditional compilation flags exist
- #
Copied: simutrans/repos/community-x86_64/config.patch (from rev 731632, simutrans/trunk/config.patch)
===================================================================
--- config.patch (rev 0)
+++ config.patch 2020-10-24 20:07:02 UTC (rev 731633)
@@ -0,0 +1,29 @@
+--- config.default.orig 2011-11-10 21:48:01.000000000 +0100
++++ config.default 2011-11-10 21:51:58.383221979 +0100
+@@ -6,15 +6,15 @@
+ #BACKEND = sdl
+ #BACKEND = sdl2
+ #BACKEND = mixer_sdl
+-#BACKEND = mixer_sdl2
++BACKEND = mixer_sdl2
+ #BACKEND = posix
+
+ #OSTYPE = amiga
+ #OSTYPE = beos
+ #OSTYPE = cygwin
+ #OSTYPE = freebsd
+ #OSTYPE = haiku
+-#OSTYPE = linux
++OSTYPE = linux
+ #OSTYPE = mingw
+ #OSTYPE = mac
+
+@@ -37,6 +37,6 @@
+ #SDL2_CONFIG = sdl2-config
+ #FREETYPE_CONFIG = freetype-config
+
+-#VERBOSE = 1
++VERBOSE = 1
+
+ # Use static libraries instead
+ # STATIC = 1
Deleted: path-for-game-data.patch
===================================================================
--- path-for-game-data.patch 2020-10-24 20:06:57 UTC (rev 731632)
+++ path-for-game-data.patch 2020-10-24 20:07:02 UTC (rev 731633)
@@ -1,18 +0,0 @@
-look in /usr/share/games/simutrans for game data
-
- at DPATCH@
-
---- simutrans.orig/simmain.cc
-+++ simutrans/simmain.cc
-@@ -437,8 +437,9 @@
- strcat( env_t::program_dir, PATH_SEPARATOR );
- }
- else {
-- strcpy( env_t::program_dir, argv[0] );
-- *(strrchr( env_t::program_dir, PATH_SEPARATOR[0] )+1) = 0;
-+ // strcpy( env_t::program_dir, argv[0] );
-+ // *(strrchr( env_t::program_dir, PATH_SEPARATOR[0] )+1) = 0;
-+ strcpy(env_t::program_dir, "/usr/share/games/simutrans/");
-
- #ifdef __APPLE__
- // change working directory from binary dir to bundle dir
Copied: simutrans/repos/community-x86_64/path-for-game-data.patch (from rev 731632, simutrans/trunk/path-for-game-data.patch)
===================================================================
--- path-for-game-data.patch (rev 0)
+++ path-for-game-data.patch 2020-10-24 20:07:02 UTC (rev 731633)
@@ -0,0 +1,18 @@
+look in /usr/share/games/simutrans for game data
+
+ at DPATCH@
+
+--- simutrans.orig/simmain.cc
++++ simutrans/simmain.cc
+@@ -437,8 +437,9 @@
+ strcat( env_t::program_dir, PATH_SEPARATOR );
+ }
+ else {
+- strcpy( env_t::program_dir, argv[0] );
+- *(strrchr( env_t::program_dir, PATH_SEPARATOR[0] )+1) = 0;
++ // strcpy( env_t::program_dir, argv[0] );
++ // *(strrchr( env_t::program_dir, PATH_SEPARATOR[0] )+1) = 0;
++ strcpy(env_t::program_dir, "/usr/share/games/simutrans/");
+
+ #ifdef __APPLE__
+ // change working directory from binary dir to bundle dir
Deleted: settings-folder.patch
===================================================================
--- settings-folder.patch 2020-10-24 20:06:57 UTC (rev 731632)
+++ settings-folder.patch 2020-10-24 20:07:02 UTC (rev 731633)
@@ -1,12 +0,0 @@
---- simsys.cc.orig 2011-10-28 20:32:25.000000000 +0200
-+++ simsys.cc 2011-11-10 23:09:10.380031846 +0100
-@@ -47,7 +47,7 @@
- #elif defined __APPLE__
- sprintf(buffer, "%s/Library/Simutrans", getenv("HOME"));
- #else
-- sprintf(buffer, "%s/simutrans", getenv("HOME"));
-+ sprintf(buffer, "%s/.simutrans", getenv("HOME"));
- #endif
-
- dr_mkdir(buffer);
-
Copied: simutrans/repos/community-x86_64/settings-folder.patch (from rev 731632, simutrans/trunk/settings-folder.patch)
===================================================================
--- settings-folder.patch (rev 0)
+++ settings-folder.patch 2020-10-24 20:07:02 UTC (rev 731633)
@@ -0,0 +1,12 @@
+--- sys/simsys.cc.orig 2011-10-28 20:32:25.000000000 +0200
++++ sys/simsys.cc 2011-11-10 23:09:10.380031846 +0100
+@@ -47,7 +47,7 @@
+ #elif defined __APPLE__
+ sprintf(buffer, "%s/Library/Simutrans", getenv("HOME"));
+ #else
+- sprintf(buffer, "%s/simutrans", getenv("HOME"));
++ sprintf(buffer, "%s/.simutrans", getenv("HOME"));
+ #endif
+
+ dr_mkdir(buffer);
+
Deleted: simutrans.appdata.xml
===================================================================
--- simutrans.appdata.xml 2020-10-24 20:06:57 UTC (rev 731632)
+++ simutrans.appdata.xml 2020-10-24 20:07:02 UTC (rev 731633)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
- <id>com.simutrans.simutrans</id>
- <launchable type="desktop-id">simutrans.desktop</launchable>
- <name>Simutrans</name>
- <summary>Transportation simulator</summary>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>Artistic-1.0</project_license>
- <description>
- <p>Simutrans is a free transportation simulator: the player operates a transportation company and has to transport goods and passengers between factories and different cities.</p>
- </description>
- <screenshots>
- <screenshot type="default">
- <image>https://screenshots.debian.net/screenshots/000/001/205/large.png</image>
- </screenshot>
- </screenshots>
- <url type="bugtracker">https://forum.simutrans.com/index.php?board=8.0</url>
- <url type="homepage">https://www.simutrans.com/</url>
-</component>
Copied: simutrans/repos/community-x86_64/simutrans.appdata.xml (from rev 731632, simutrans/trunk/simutrans.appdata.xml)
===================================================================
--- simutrans.appdata.xml (rev 0)
+++ simutrans.appdata.xml 2020-10-24 20:07:02 UTC (rev 731633)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+ <id>com.simutrans.simutrans</id>
+ <launchable type="desktop-id">simutrans.desktop</launchable>
+ <name>Simutrans</name>
+ <summary>Transportation simulator</summary>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>Artistic-1.0</project_license>
+ <description>
+ <p>Simutrans is a free transportation simulator: the player operates a transportation company and has to transport goods and passengers between factories and different cities.</p>
+ </description>
+ <screenshots>
+ <screenshot type="default">
+ <image>https://screenshots.debian.net/screenshots/000/001/205/large.png</image>
+ </screenshot>
+ </screenshots>
+ <url type="bugtracker">https://forum.simutrans.com/index.php?board=8.0</url>
+ <url type="homepage">https://www.simutrans.com/</url>
+</component>
Deleted: simutrans.desktop
===================================================================
--- simutrans.desktop 2020-10-24 20:06:57 UTC (rev 731632)
+++ simutrans.desktop 2020-10-24 20:07:02 UTC (rev 731633)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Simutrans
-Comment=Transportation simulator
-Exec=simutrans
-Icon=simutrans
-Terminal=false
-Type=Application
-Categories=Game;Simulation;
-
Copied: simutrans/repos/community-x86_64/simutrans.desktop (from rev 731632, simutrans/trunk/simutrans.desktop)
===================================================================
--- simutrans.desktop (rev 0)
+++ simutrans.desktop 2020-10-24 20:07:02 UTC (rev 731633)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Simutrans
+Comment=Transportation simulator
+Exec=simutrans
+Icon=simutrans
+Terminal=false
+Type=Application
+Categories=Game;Simulation;
+
More information about the arch-commits
mailing list