[arch-commits] Commit in simutrans/repos/community-x86_64 (10 files)

Antonio Rojas arojas at gemini.archlinux.org
Sun Mar 13 18:45:16 UTC 2022


    Date: Sunday, March 13, 2022 @ 18:45:16
  Author: arojas
Revision: 1151180

archrelease: copy trunk to community-x86_64

Added:
  simutrans/repos/community-x86_64/PKGBUILD
    (from rev 1151179, simutrans/trunk/PKGBUILD)
  simutrans/repos/community-x86_64/path-for-game-data.patch
    (from rev 1151179, simutrans/trunk/path-for-game-data.patch)
  simutrans/repos/community-x86_64/settings-folder.patch
    (from rev 1151179, simutrans/trunk/settings-folder.patch)
  simutrans/repos/community-x86_64/simutrans.appdata.xml
    (from rev 1151179, simutrans/trunk/simutrans.appdata.xml)
  simutrans/repos/community-x86_64/simutrans.desktop
    (from rev 1151179, simutrans/trunk/simutrans.desktop)
Deleted:
  simutrans/repos/community-x86_64/PKGBUILD
  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                 |  124 ++++++++++++++++++++++-----------------------
 path-for-game-data.patch |   32 +++++------
 settings-folder.patch    |   24 ++++----
 simutrans.appdata.xml    |   38 ++++++-------
 simutrans.desktop        |   18 +++---
 5 files changed, 119 insertions(+), 117 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-13 18:45:01 UTC (rev 1151179)
+++ PKGBUILD	2022-03-13 18:45:16 UTC (rev 1151180)
@@ -1,61 +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=123.0
-pkgrel=1
-pkgdesc="Transportation simulation game"
-arch=('x86_64')
-url="https://www.simutrans.com/"
-license=('custom:Artistic')
-depends=('gcc-libs' 'zlib' 'sdl2' 'libpng' '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
-        simutrans.desktop
-        simutrans.appdata.xml)
-sha256sums=('02e20fe41216dce13cd02908b647f5e48ec737d67e869b5e4f1ef9235a402080'
-            'c0c2dd5da146f64901b00c6ee67e0818a166b983a81cee7897c4843aa9f21c81'
-            '5f009471489583fd48bcce5d4869048d1164423771cfd955840ae995cd6a70ca'
-            '895405df0904e6c245ab5b6e1824a59e0af7a0a0ef5ccb6f69f20b6ab8223092'
-            '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
-}
-
-build() {
-  make VERBOSE=1 BACKEND=sdl2 OSTYPE=linux
-}
-
-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 1151179, simutrans/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-03-13 18:45:16 UTC (rev 1151180)
@@ -0,0 +1,63 @@
+# 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=123.0.1
+pkgrel=1
+pkgdesc="Transportation simulation game"
+arch=('x86_64')
+url="https://www.simutrans.com/"
+license=('custom:Artistic')
+depends=('gcc-libs' 'zlib' 'sdl2' 'libpng' '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
+        simutrans.desktop
+        simutrans.appdata.xml)
+sha256sums=('8deb38c8de41fb5558640cdd4b9b161c38de92c077b3e506f74c34f93214f469'
+            'c0c2dd5da146f64901b00c6ee67e0818a166b983a81cee7897c4843aa9f21c81'
+            '5f009471489583fd48bcce5d4869048d1164423771cfd955840ae995cd6a70ca'
+            '895405df0904e6c245ab5b6e1824a59e0af7a0a0ef5ccb6f69f20b6ab8223092'
+            '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
+
+  sed -e 's|\\#define|#define|' -i Makefile
+}
+
+build() {
+  make VERBOSE=1 BACKEND=sdl2 OSTYPE=linux
+}
+
+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: path-for-game-data.patch
===================================================================
--- path-for-game-data.patch	2022-03-13 18:45:01 UTC (rev 1151179)
+++ path-for-game-data.patch	2022-03-13 18:45:16 UTC (rev 1151180)
@@ -1,16 +0,0 @@
-look in /usr/share/games/simutrans for game data
-
- at DPATCH@
-
---- simutrans.orig/simmain.cc
-+++ simutrans/simmain.cc
-@@ -437,8 +437,7 @@
- 		strcat( env_t::data_dir, PATH_SEPARATOR );
- 	}
- 	else {
--		strcpy( env_t::data_dir, argv[0] );
--		*(strrchr( env_t::data_dir, PATH_SEPARATOR[0] )+1) = 0;
-+		strcpy(env_t::data_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 1151179, simutrans/trunk/path-for-game-data.patch)
===================================================================
--- path-for-game-data.patch	                        (rev 0)
+++ path-for-game-data.patch	2022-03-13 18:45:16 UTC (rev 1151180)
@@ -0,0 +1,16 @@
+look in /usr/share/games/simutrans for game data
+
+ at DPATCH@
+
+--- simutrans.orig/simmain.cc
++++ simutrans/simmain.cc
+@@ -437,8 +437,7 @@
+ 		strcat( env_t::data_dir, PATH_SEPARATOR );
+ 	}
+ 	else {
+-		strcpy( env_t::data_dir, argv[0] );
+-		*(strrchr( env_t::data_dir, PATH_SEPARATOR[0] )+1) = 0;
++		strcpy(env_t::data_dir, "/usr/share/games/simutrans/");
+ 
+ #ifdef __APPLE__
+ 		// change working directory from binary dir to bundle dir

Deleted: settings-folder.patch
===================================================================
--- settings-folder.patch	2022-03-13 18:45:01 UTC (rev 1151179)
+++ settings-folder.patch	2022-03-13 18:45:16 UTC (rev 1151180)
@@ -1,12 +0,0 @@
---- 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);
-

Copied: simutrans/repos/community-x86_64/settings-folder.patch (from rev 1151179, simutrans/trunk/settings-folder.patch)
===================================================================
--- settings-folder.patch	                        (rev 0)
+++ settings-folder.patch	2022-03-13 18:45:16 UTC (rev 1151180)
@@ -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	2022-03-13 18:45:01 UTC (rev 1151179)
+++ simutrans.appdata.xml	2022-03-13 18:45:16 UTC (rev 1151180)
@@ -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 1151179, simutrans/trunk/simutrans.appdata.xml)
===================================================================
--- simutrans.appdata.xml	                        (rev 0)
+++ simutrans.appdata.xml	2022-03-13 18:45:16 UTC (rev 1151180)
@@ -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	2022-03-13 18:45:01 UTC (rev 1151179)
+++ simutrans.desktop	2022-03-13 18:45:16 UTC (rev 1151180)
@@ -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 1151179, simutrans/trunk/simutrans.desktop)
===================================================================
--- simutrans.desktop	                        (rev 0)
+++ simutrans.desktop	2022-03-13 18:45:16 UTC (rev 1151180)
@@ -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