[arch-commits] Commit in dwarffortress/repos/community-i686 (10 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Thu Nov 13 17:01:59 UTC 2014


    Date: Thursday, November 13, 2014 @ 18:01:57
  Author: svenstaro
Revision: 122529

archrelease: copy trunk to community-i686

Added:
  dwarffortress/repos/community-i686/PKGBUILD
    (from rev 122528, dwarffortress/trunk/PKGBUILD)
  dwarffortress/repos/community-i686/dwarffortress
    (from rev 122528, dwarffortress/trunk/dwarffortress)
  dwarffortress/repos/community-i686/dwarffortress.desktop
    (from rev 122528, dwarffortress/trunk/dwarffortress.desktop)
  dwarffortress/repos/community-i686/dwarffortress.install
    (from rev 122528, dwarffortress/trunk/dwarffortress.install)
  dwarffortress/repos/community-i686/dwarffortress.png
    (from rev 122528, dwarffortress/trunk/dwarffortress.png)
Deleted:
  dwarffortress/repos/community-i686/PKGBUILD
  dwarffortress/repos/community-i686/dwarffortress
  dwarffortress/repos/community-i686/dwarffortress.desktop
  dwarffortress/repos/community-i686/dwarffortress.install
  dwarffortress/repos/community-i686/dwarffortress.png

-----------------------+
 PKGBUILD              |  146 ++++++++++++++++++++++++------------------------
 dwarffortress         |   40 ++++++-------
 dwarffortress.desktop |   18 ++---
 dwarffortress.install |   16 ++---
 4 files changed, 110 insertions(+), 110 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-13 17:01:43 UTC (rev 122528)
+++ PKGBUILD	2014-11-13 17:01:57 UTC (rev 122529)
@@ -1,73 +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.40.15
-_pkgver=40_15
-pkgrel=1
-pkgdesc="A single-player fantasy game. You control a dwarven outpost or an adventurer in a randomly generated persistent world."
-arch=(i686 x86_64)
-url="http://www.bay12games.com/dwarves/"
-license=('custom:dwarffortress')
-depends=(gtk2 glu sdl_image libsndfile openal sdl_ttf glew gcc-libs)
-makedepends=(git cmake)
-options=('!strip' '!buildflags')
-install=${pkgname}.install
-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
-# 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#commit=7c1d8b
-        dwarffortress
-        dwarffortress.desktop
-        dwarffortress.png)
-sha256sums=('56db3a425b4f0840e205685c239582a8504f5dfe60388f95b0c58baa6d3dbfd6'
-            'SKIP'
-            '7dc1f0ed0d496b21f4f240334f77dc43b728823f3e1c4ea25ce768691346ec07'
-            'e79e3d945c6cc0da58f4ca30a210c7bf1bc3149fd10406d1262a6214eb40445a'
-            '83183abc70b11944720b0d86f4efd07468f786b03fa52fe429ca8e371f708e0f')
-
-build() {
-  cd $srcdir/dwarf_fortress_unfuck
-
-  cmake .
-  make VERBOSE=1
-}
-
-package() {
-  install -dm755 $pkgdir/opt/
-  cp -r $srcdir/df_linux $pkgdir/opt/$pkgname
-  rm -r $pkgdir/opt/$pkgname/df $pkgdir/opt/$pkgname/libs/* $pkgdir/opt/$pkgname/g_src
-
-  find $pkgdir/opt/$pkgname -type d -exec chmod 755 {} +
-  find $pkgdir/opt/$pkgname -type f -exec chmod 644 {} +
-
-  install -Dm755 $srcdir/df_linux/libs/Dwarf_Fortress $pkgdir/opt/$pkgname/libs/Dwarf_Fortress
-  install -Dm755 $srcdir/dwarf_fortress_unfuck/libgraphics.so $pkgdir/opt/$pkgname/libs/libgraphics.so
-  install -Dm755 $srcdir/dwarffortress $pkgdir/usr/bin/$pkgname
-
-  # No idea why we need this. Really. This isn't being loaded dynamically, it's not linked and
-  # in general there is no indication this is being used. However, it doesn't work without this symlink.
-  [[ $CARCH == "x86_64" ]] && ln -s /usr/lib32/libpng.so $pkgdir/opt/$pkgname/libs/libpng.so.3
-  [[ $CARCH == "i686" ]] && ln -s /usr/lib/libpng.so $pkgdir/opt/$pkgname/libs/libpng.so.3
-
-  # Set pkgname in runscript
-  sed -i "s/^pkgname=.*/pkgname=$pkgname/" $pkgdir/usr/bin/$pkgname
-
-  # Desktop launcher with icon
-  install -Dm644 $srcdir/dwarffortress.desktop $pkgdir/usr/share/applications/"$pkgname".desktop
-  install -Dm644 $srcdir/dwarffortress.png     $pkgdir/usr/share/pixmaps/"$pkgname".png
-
-  install -Dm644 $srcdir/df_linux/readme.txt $pkgdir/usr/share/licenses/$pkgname/readme.txt
-}
-
-# vim:set ts=2 sw=2 et:

Copied: dwarffortress/repos/community-i686/PKGBUILD (from rev 122528, dwarffortress/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-11-13 17:01:57 UTC (rev 122529)
@@ -0,0 +1,73 @@
+# $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.40.16
+_pkgver=40_16
+pkgrel=1
+pkgdesc="A single-player fantasy game. You control a dwarven outpost or an adventurer in a randomly generated persistent world."
+arch=(i686 x86_64)
+url="http://www.bay12games.com/dwarves/"
+license=('custom:dwarffortress')
+depends=(gtk2 glu sdl_image libsndfile openal sdl_ttf glew gcc-libs)
+makedepends=(git cmake)
+options=('!strip' '!buildflags')
+install=${pkgname}.install
+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
+# 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#commit=e1c850
+        dwarffortress
+        dwarffortress.desktop
+        dwarffortress.png)
+sha256sums=('2cc70b5dd0618ca6e1c45f0832a552474f01d02ed866a93ca95787cf13538500'
+            'SKIP'
+            '7dc1f0ed0d496b21f4f240334f77dc43b728823f3e1c4ea25ce768691346ec07'
+            'e79e3d945c6cc0da58f4ca30a210c7bf1bc3149fd10406d1262a6214eb40445a'
+            '83183abc70b11944720b0d86f4efd07468f786b03fa52fe429ca8e371f708e0f')
+
+build() {
+  cd $srcdir/dwarf_fortress_unfuck
+
+  cmake .
+  make VERBOSE=1
+}
+
+package() {
+  install -dm755 $pkgdir/opt/
+  cp -r $srcdir/df_linux $pkgdir/opt/$pkgname
+  rm -r $pkgdir/opt/$pkgname/df $pkgdir/opt/$pkgname/libs/* $pkgdir/opt/$pkgname/g_src
+
+  find $pkgdir/opt/$pkgname -type d -exec chmod 755 {} +
+  find $pkgdir/opt/$pkgname -type f -exec chmod 644 {} +
+
+  install -Dm755 $srcdir/df_linux/libs/Dwarf_Fortress $pkgdir/opt/$pkgname/libs/Dwarf_Fortress
+  install -Dm755 $srcdir/dwarf_fortress_unfuck/libgraphics.so $pkgdir/opt/$pkgname/libs/libgraphics.so
+  install -Dm755 $srcdir/dwarffortress $pkgdir/usr/bin/$pkgname
+
+  # No idea why we need this. Really. This isn't being loaded dynamically, it's not linked and
+  # in general there is no indication this is being used. However, it doesn't work without this symlink.
+  [[ $CARCH == "x86_64" ]] && ln -s /usr/lib32/libpng.so $pkgdir/opt/$pkgname/libs/libpng.so.3
+  [[ $CARCH == "i686" ]] && ln -s /usr/lib/libpng.so $pkgdir/opt/$pkgname/libs/libpng.so.3
+
+  # Set pkgname in runscript
+  sed -i "s/^pkgname=.*/pkgname=$pkgname/" $pkgdir/usr/bin/$pkgname
+
+  # Desktop launcher with icon
+  install -Dm644 $srcdir/dwarffortress.desktop $pkgdir/usr/share/applications/"$pkgname".desktop
+  install -Dm644 $srcdir/dwarffortress.png     $pkgdir/usr/share/pixmaps/"$pkgname".png
+
+  install -Dm644 $srcdir/df_linux/readme.txt $pkgdir/usr/share/licenses/$pkgname/readme.txt
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: dwarffortress
===================================================================
--- dwarffortress	2014-11-13 17:01:43 UTC (rev 122528)
+++ dwarffortress	2014-11-13 17:01:57 UTC (rev 122529)
@@ -1,20 +0,0 @@
-#!/bin/sh
-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.
-
-pkgname=dwarffortress #To be set by PKGBUILD
-
-if [[ ! -d "$HOME/.$pkgname" ]]; then
-    mkdir -p "$HOME/.$pkgname/data"
-    ln -s /opt/"$pkgname"/raw "$HOME/.$pkgname/raw"
-    ln -s /opt/"$pkgname"/libs "$HOME/.$pkgname/libs"
-    cp -rn /opt/"$pkgname"/data/init "$HOME/.$pkgname/data/init"
-fi
-
-for link in announcement art dipscript help index initial_movies movies shader.fs shader.vs sound speech; do
-    cp -r /opt/"$pkgname"/data/$link "$HOME/.$pkgname/data/$link"
-done
-
-cd "$HOME/.$pkgname"
-exec ./libs/Dwarf_Fortress "$@"
-

Copied: dwarffortress/repos/community-i686/dwarffortress (from rev 122528, dwarffortress/trunk/dwarffortress)
===================================================================
--- dwarffortress	                        (rev 0)
+++ dwarffortress	2014-11-13 17:01:57 UTC (rev 122529)
@@ -0,0 +1,20 @@
+#!/bin/sh
+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.
+
+pkgname=dwarffortress #To be set by PKGBUILD
+
+if [[ ! -d "$HOME/.$pkgname" ]]; then
+    mkdir -p "$HOME/.$pkgname/data"
+    ln -s /opt/"$pkgname"/raw "$HOME/.$pkgname/raw"
+    ln -s /opt/"$pkgname"/libs "$HOME/.$pkgname/libs"
+    cp -rn /opt/"$pkgname"/data/init "$HOME/.$pkgname/data/init"
+fi
+
+for link in announcement art dipscript help index initial_movies movies shader.fs shader.vs sound speech; do
+    cp -r /opt/"$pkgname"/data/$link "$HOME/.$pkgname/data/$link"
+done
+
+cd "$HOME/.$pkgname"
+exec ./libs/Dwarf_Fortress "$@"
+

Deleted: dwarffortress.desktop
===================================================================
--- dwarffortress.desktop	2014-11-13 17:01:43 UTC (rev 122528)
+++ dwarffortress.desktop	2014-11-13 17:01:57 UTC (rev 122529)
@@ -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/community-i686/dwarffortress.desktop (from rev 122528, dwarffortress/trunk/dwarffortress.desktop)
===================================================================
--- dwarffortress.desktop	                        (rev 0)
+++ dwarffortress.desktop	2014-11-13 17:01:57 UTC (rev 122529)
@@ -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-11-13 17:01:43 UTC (rev 122528)
+++ dwarffortress.install	2014-11-13 17:01:57 UTC (rev 122529)
@@ -1,8 +0,0 @@
-post_upgrade() {
-    echo "You might have delete your ~/.dwarffortress directory to get the new file layout."
-    echo "Of course, you can backup your saves."
-}
-
-post_install() {
-    post_upgrade
-}

Copied: dwarffortress/repos/community-i686/dwarffortress.install (from rev 122528, dwarffortress/trunk/dwarffortress.install)
===================================================================
--- dwarffortress.install	                        (rev 0)
+++ dwarffortress.install	2014-11-13 17:01:57 UTC (rev 122529)
@@ -0,0 +1,8 @@
+post_upgrade() {
+    echo "You might have delete your ~/.dwarffortress directory to get the new file layout."
+    echo "Of course, you can backup your saves."
+}
+
+post_install() {
+    post_upgrade
+}

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

Copied: dwarffortress/repos/community-i686/dwarffortress.png (from rev 122528, dwarffortress/trunk/dwarffortress.png)
===================================================================
(Binary files differ)


More information about the arch-commits mailing list