[arch-commits] Commit in dwarffortress/repos/multilib-x86_64 (10 files)

Sven-Hendrik Haase svenstaro at nymeria.archlinux.org
Mon Jun 9 00:37:35 UTC 2014


    Date: Monday, June 9, 2014 @ 02:37:34
  Author: svenstaro
Revision: 112854

archrelease: copy trunk to multilib-x86_64

Added:
  dwarffortress/repos/multilib-x86_64/PKGBUILD
    (from rev 112853, dwarffortress/trunk/PKGBUILD)
  dwarffortress/repos/multilib-x86_64/dwarffortress
    (from rev 112853, dwarffortress/trunk/dwarffortress)
  dwarffortress/repos/multilib-x86_64/dwarffortress.desktop
    (from rev 112853, dwarffortress/trunk/dwarffortress.desktop)
  dwarffortress/repos/multilib-x86_64/dwarffortress.install
    (from rev 112853, dwarffortress/trunk/dwarffortress.install)
  dwarffortress/repos/multilib-x86_64/dwarffortress.png
    (from rev 112853, dwarffortress/trunk/dwarffortress.png)
Deleted:
  dwarffortress/repos/multilib-x86_64/PKGBUILD
  dwarffortress/repos/multilib-x86_64/dwarffortress
  dwarffortress/repos/multilib-x86_64/dwarffortress.desktop
  dwarffortress/repos/multilib-x86_64/dwarffortress.install
  dwarffortress/repos/multilib-x86_64/dwarffortress.png

-----------------------+
 PKGBUILD              |  162 ++++++++++++++++++++++++------------------------
 dwarffortress         |   14 ++--
 dwarffortress.desktop |   18 ++---
 dwarffortress.install |   32 ++++-----
 4 files changed, 114 insertions(+), 112 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-08 21:54:55 UTC (rev 112853)
+++ PKGBUILD	2014-06-09 00:37:34 UTC (rev 112854)
@@ -1,80 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com>
-# Contributor: djnm <nmihalich [at} gmail dott com>
-pkgname=dwarffortress
-pkgver=0.34.11
-_pkgver=34_11
-pkgrel=4
-pkgdesc="A single-player fantasy game. You control a dwarven outpost or an adventurer in a randomly generated persistent world."
-arch=(i686 x86_64)
-# WIP Thread: http://www.bay12forums.com/smf/index.php?topic=66142.0
-url="http://www.bay12games.com/dwarves/"
-install="$pkgname.install"
-license=('custom:dwarffortress')
-depends=(gtk2 glu sdl_image libsndfile openal sdl_ttf glew)
-makedepends=(git)
-if [[ $CARCH == 'x86_64' ]]; then
-  depends=(gcc-multilib lib32-gtk2 lib32-glu lib32-sdl_image lib32-libsndfile lib32-openal
-           lib32-libxdamage lib32-ncurses lib32-sdl_ttf lib32-glew)
-  optdepends=('lib32-nvidia-utils: If you have nvidia graphics'
-              'lib32-catalyst-utils: If you have ATI graphics'
-              'lib32-alsa-lib: for alsa sound'
-              'lib32-libpulse: for pulse sound')
-fi
-backup=('opt/df_linux/data/init/colors.txt'
-        'opt/df_linux/data/init/init.txt'
-        'opt/df_linux/data/init/d_init.txt'
-        'opt/df_linux/data/init/interface.txt')
-# I made a fucking github repo with the sole purpose of unfucking df a bit
-# We try to compile whatever little bit of df is open source
-source=(http://www.bay12games.com/dwarves/df_${_pkgver}_linux.tar.bz2
-        git://github.com/svenstaro/dwarf_fortress_unfuck.git
-        dwarffortress
-        dwarffortress.desktop
-        dwarffortress.png)
-md5sums=('33e26a93e5914f7545fa1aaa53706eeb'
-         'SKIP'
-         'c19aacc31e8df354827db352fecfd200'
-         'c8984d1eea6e409ecf339d6ee9e91e42'
-         'b1d51f82400073af9bb179e34a9209d0')
-
-build() {
-  cd $srcdir/dwarf_fortress_unfuck
-
-  make
-}
-
-package() {
-  cd $srcdir/df_linux
-  install -dm755 $pkgdir/opt/
-  cp -r $srcdir/df_linux/ $pkgdir/opt/
-
-  # Yay for precompiled stuff with junk permissions! :D
-  find $pkgdir/opt/df_linux -type d -exec chmod 755 {} +
-  find $pkgdir/opt/df_linux -type f -exec chmod 644 {} +
-
-  install -Dm755 $srcdir/dwarffortress $pkgdir/usr/bin/dwarffortress
-
-  chmod 755 $pkgdir/opt/df_linux/libs/Dwarf_Fortress
-  install -Dm755 $srcdir/dwarf_fortress_unfuck/libs/libgraphics.so $pkgdir/opt/df_linux/libs/libgraphics.so
-  ln -s /usr/lib32/libpng.so $pkgdir/opt/df_linux/libs/libpng.so.3
-  rm $pkgdir/opt/df_linux/libs/{libgcc_s.so.1,libstdc++.so.6}
-
-  install -d -m775 -o root -g games $pkgdir/opt/df_linux/data/save
-
-  # This probably is overkill, but I don't know what specific files df needs permission for in here.
-  chmod 775 $pkgdir/opt/df_linux
-  chown root:games $pkgdir/opt/df_linux
-  chown -R root:games $pkgdir/opt/df_linux/data
-  find $pkgdir/opt/df_linux/data -type d -exec chmod 775 {} +
-  find $pkgdir/opt/df_linux/data -type f -exec chmod 664 {} +
-
-  # Desktop launcher with icon
-  install -Dm644 $srcdir/dwarffortress.desktop $pkgdir/usr/share/applications/dwarffortress.desktop
-  install -Dm644 $srcdir/dwarffortress.png     $pkgdir/usr/share/pixmaps/dwarffortress.png
-
-  install -Dm644 $srcdir/df_linux/readme.txt $pkgdir/usr/share/licenses/dwarffortress/readme.txt
-}
-
-# vim:set ts=2 sw=2 et:

Copied: dwarffortress/repos/multilib-x86_64/PKGBUILD (from rev 112853, dwarffortress/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-06-09 00:37:34 UTC (rev 112854)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com>
+# Contributor: djnm <nmihalich [at} gmail dott com>
+pkgname=dwarffortress
+pkgver=0.34.11
+_pkgver=34_11
+pkgrel=5
+pkgdesc="A single-player fantasy game. You control a dwarven outpost or an adventurer in a randomly generated persistent world."
+arch=(i686 x86_64)
+# WIP Thread: http://www.bay12forums.com/smf/index.php?topic=66142.0
+url="http://www.bay12games.com/dwarves/"
+install="$pkgname.install"
+license=('custom:dwarffortress')
+depends=(gtk2 glu sdl_image libsndfile openal sdl_ttf glew gcc-libs)
+makedepends=(git cmake)
+if [[ $CARCH == 'x86_64' ]]; then
+  makedepends+=(gcc-multilib)
+  depends=(gcc-libs-multilib lib32-gtk2 lib32-glu lib32-sdl_image lib32-libsndfile lib32-openal
+           lib32-libxdamage lib32-ncurses lib32-sdl_ttf lib32-glew)
+  optdepends=('lib32-nvidia-utils: If you have nvidia graphics'
+              'lib32-catalyst-utils: If you have ATI graphics'
+              'lib32-alsa-lib: for alsa sound'
+              'lib32-libpulse: for pulse sound')
+fi
+backup=('opt/df_linux/data/init/colors.txt'
+        'opt/df_linux/data/init/init.txt'
+        'opt/df_linux/data/init/d_init.txt'
+        'opt/df_linux/data/init/interface.txt')
+# I made a fucking github repo with the sole purpose of unfucking df a bit
+# We try to compile whatever little bit of df is open source
+source=(http://www.bay12games.com/dwarves/df_${_pkgver}_linux.tar.bz2
+        git://github.com/svenstaro/dwarf_fortress_unfuck.git
+        dwarffortress
+        dwarffortress.desktop
+        dwarffortress.png)
+md5sums=('33e26a93e5914f7545fa1aaa53706eeb'
+         'SKIP'
+         'c19aacc31e8df354827db352fecfd200'
+         'c8984d1eea6e409ecf339d6ee9e91e42'
+         'b1d51f82400073af9bb179e34a9209d0')
+
+build() {
+  cd $srcdir/dwarf_fortress_unfuck
+
+  cmake .
+  make
+}
+
+package() {
+  cd $srcdir/df_linux
+  install -dm755 $pkgdir/opt/
+  cp -r $srcdir/df_linux/ $pkgdir/opt/
+
+  # Yay for precompiled stuff with junk permissions! :D
+  find $pkgdir/opt/df_linux -type d -exec chmod 755 {} +
+  find $pkgdir/opt/df_linux -type f -exec chmod 644 {} +
+
+  install -Dm755 $srcdir/dwarffortress $pkgdir/usr/bin/dwarffortress
+
+  chmod 755 $pkgdir/opt/df_linux/libs/Dwarf_Fortress
+  install -Dm755 $srcdir/dwarf_fortress_unfuck/libgraphics.so $pkgdir/opt/df_linux/libs/libgraphics.so
+  ln -s /usr/lib32/libpng.so $pkgdir/opt/df_linux/libs/libpng.so.3
+  rm $pkgdir/opt/df_linux/libs/{libgcc_s.so.1,libstdc++.so.6}
+
+  install -d -m775 -o root -g games $pkgdir/opt/df_linux/data/save
+
+  # This probably is overkill, but I don't know what specific files df needs permission for in here.
+  chmod 775 $pkgdir/opt/df_linux
+  chown root:games $pkgdir/opt/df_linux
+  chown -R root:games $pkgdir/opt/df_linux/data
+  find $pkgdir/opt/df_linux/data -type d -exec chmod 775 {} +
+  find $pkgdir/opt/df_linux/data -type f -exec chmod 664 {} +
+
+  # Desktop launcher with icon
+  install -Dm644 $srcdir/dwarffortress.desktop $pkgdir/usr/share/applications/dwarffortress.desktop
+  install -Dm644 $srcdir/dwarffortress.png     $pkgdir/usr/share/pixmaps/dwarffortress.png
+
+  install -Dm644 $srcdir/df_linux/readme.txt $pkgdir/usr/share/licenses/dwarffortress/readme.txt
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: dwarffortress
===================================================================
--- dwarffortress	2014-06-08 21:54:55 UTC (rev 112853)
+++ dwarffortress	2014-06-09 00:37:34 UTC (rev 112854)
@@ -1,7 +0,0 @@
-#!/bin/sh
-cd /opt/df_linux
-export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch.
-#export SDL_VIDEO_CENTERED=1    # Centre the screen.  Messes up resizing.
-
-umask 0002 # Make sure that any saves created get 775/664
-exec ./libs/Dwarf_Fortress "$@"

Copied: dwarffortress/repos/multilib-x86_64/dwarffortress (from rev 112853, dwarffortress/trunk/dwarffortress)
===================================================================
--- dwarffortress	                        (rev 0)
+++ dwarffortress	2014-06-09 00:37:34 UTC (rev 112854)
@@ -0,0 +1,7 @@
+#!/bin/sh
+cd /opt/df_linux
+export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch.
+#export SDL_VIDEO_CENTERED=1    # Centre the screen.  Messes up resizing.
+
+umask 0002 # Make sure that any saves created get 775/664
+exec ./libs/Dwarf_Fortress "$@"

Deleted: dwarffortress.desktop
===================================================================
--- dwarffortress.desktop	2014-06-08 21:54:55 UTC (rev 112853)
+++ dwarffortress.desktop	2014-06-09 00:37:34 UTC (rev 112854)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Dwarf Fortress
-GenericName=Dwarf Fortress
-Comment=A single-player fantasy game.
-Exec=dwarffortress
-Icon=/usr/share/pixmaps/dwarffortress.png
-Terminal=false
-Type=Application
-Categories=Game;
\ No newline at end of file

Copied: dwarffortress/repos/multilib-x86_64/dwarffortress.desktop (from rev 112853, dwarffortress/trunk/dwarffortress.desktop)
===================================================================
--- dwarffortress.desktop	                        (rev 0)
+++ dwarffortress.desktop	2014-06-09 00:37:34 UTC (rev 112854)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Dwarf Fortress
+GenericName=Dwarf Fortress
+Comment=A single-player fantasy game.
+Exec=dwarffortress
+Icon=/usr/share/pixmaps/dwarffortress.png
+Terminal=false
+Type=Application
+Categories=Game;
\ No newline at end of file

Deleted: dwarffortress.install
===================================================================
--- dwarffortress.install	2014-06-08 21:54:55 UTC (rev 112853)
+++ dwarffortress.install	2014-06-09 00:37:34 UTC (rev 112854)
@@ -1,16 +0,0 @@
-## arg 1:  the new package version
-post_install() {
-  echo "Make sure to add your user to the games group to play dwarffortress"
-  post_upgrade $1 0
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  # Make sure that permissions are correct
-  chown -R root:games /opt/df_linux/data
-  find /opt/df_linux/data/save -type d -exec chmod 775 {} + &
-  find /opt/df_linux/data/save -type f -exec chmod 664 {} + &
-}
-
-# vim:set ts=2 sw=2 et:

Copied: dwarffortress/repos/multilib-x86_64/dwarffortress.install (from rev 112853, dwarffortress/trunk/dwarffortress.install)
===================================================================
--- dwarffortress.install	                        (rev 0)
+++ dwarffortress.install	2014-06-09 00:37:34 UTC (rev 112854)
@@ -0,0 +1,16 @@
+## arg 1:  the new package version
+post_install() {
+  echo "Make sure to add your user to the games group to play dwarffortress"
+  post_upgrade $1 0
+}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  # Make sure that permissions are correct
+  chown -R root:games /opt/df_linux/data
+  find /opt/df_linux/data/save -type d -exec chmod 775 {} + &
+  find /opt/df_linux/data/save -type f -exec chmod 664 {} + &
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: dwarffortress.png
===================================================================
(Binary files differ)

Copied: dwarffortress/repos/multilib-x86_64/dwarffortress.png (from rev 112853, dwarffortress/trunk/dwarffortress.png)
===================================================================
(Binary files differ)




More information about the arch-commits mailing list