Date: Tuesday, August 5, 2014 @ 19:34:51 Author: svenstaro Revision: 116905
archrelease: copy trunk to multilib-x86_64 Added: dwarffortress/repos/multilib-x86_64/PKGBUILD (from rev 116904, dwarffortress/trunk/PKGBUILD) dwarffortress/repos/multilib-x86_64/dwarffortress (from rev 116904, dwarffortress/trunk/dwarffortress) dwarffortress/repos/multilib-x86_64/dwarffortress.desktop (from rev 116904, dwarffortress/trunk/dwarffortress.desktop) dwarffortress/repos/multilib-x86_64/dwarffortress.png (from rev 116904, 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.png -----------------------+ PKGBUILD | 144 ++++++++++++++++++++++++------------------------ dwarffortress | 30 +++++----- dwarffortress.desktop | 18 +++--- 3 files changed, 96 insertions(+), 96 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2014-08-05 17:32:23 UTC (rev 116904) +++ PKGBUILD 2014-08-05 17:34:51 UTC (rev 116905) @@ -1,72 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com> -# Contributor: djnm <nmihalich [at} gmail dott com> -pkgname=dwarffortress -pkgver=0.40.05 -_pkgver=40_05 -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') -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 - dwarffortress - dwarffortress.desktop - dwarffortress.png) -sha256sums=('7a90beadb9e91567b83b1034510338311c4d6688117b9976214995efc76836ad' - 'SKIP' - '4a7cc39dabe4fa3c28fdb9bdff83f7cdf55de0beff700fd6ebe605dda2f81688' - 'e79e3d945c6cc0da58f4ca30a210c7bf1bc3149fd10406d1262a6214eb40445a' - '83183abc70b11944720b0d86f4efd07468f786b03fa52fe429ca8e371f708e0f') - -build() { - cd $srcdir/dwarf_fortress_unfuck - - cmake . - make -} - -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/multilib-x86_64/PKGBUILD (from rev 116904, dwarffortress/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2014-08-05 17:34:51 UTC (rev 116905) @@ -0,0 +1,72 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com> +# Contributor: djnm <nmihalich [at} gmail dott com> +pkgname=dwarffortress +pkgver=0.40.06 +_pkgver=40_06 +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') +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 + dwarffortress + dwarffortress.desktop + dwarffortress.png) +sha256sums=('90ba51d59484d210e04f287526aec72712bff9db2e0becc3638207d3cf9f7e68' + 'SKIP' + '4a7cc39dabe4fa3c28fdb9bdff83f7cdf55de0beff700fd6ebe605dda2f81688' + 'e79e3d945c6cc0da58f4ca30a210c7bf1bc3149fd10406d1262a6214eb40445a' + '83183abc70b11944720b0d86f4efd07468f786b03fa52fe429ca8e371f708e0f') + +build() { + cd $srcdir/dwarf_fortress_unfuck + + cmake . + make +} + +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-08-05 17:32:23 UTC (rev 116904) +++ dwarffortress 2014-08-05 17:34:51 UTC (rev 116905) @@ -1,15 +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 "$HOME/.$pkgname" - cp -rn /opt/"$pkgname"/data "$HOME/.$pkgname/" - cp -rsn /opt/"$pkgname"/* "$HOME/.$pkgname/" -fi - -cd "$HOME/.$pkgname" -exec ./libs/Dwarf_Fortress "$@" - Copied: dwarffortress/repos/multilib-x86_64/dwarffortress (from rev 116904, dwarffortress/trunk/dwarffortress) =================================================================== --- dwarffortress (rev 0) +++ dwarffortress 2014-08-05 17:34:51 UTC (rev 116905) @@ -0,0 +1,15 @@ +#!/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 "$HOME/.$pkgname" + cp -rn /opt/"$pkgname"/data "$HOME/.$pkgname/" + cp -rsn /opt/"$pkgname"/* "$HOME/.$pkgname/" +fi + +cd "$HOME/.$pkgname" +exec ./libs/Dwarf_Fortress "$@" + Deleted: dwarffortress.desktop =================================================================== --- dwarffortress.desktop 2014-08-05 17:32:23 UTC (rev 116904) +++ dwarffortress.desktop 2014-08-05 17:34:51 UTC (rev 116905) @@ -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 116904, dwarffortress/trunk/dwarffortress.desktop) =================================================================== --- dwarffortress.desktop (rev 0) +++ dwarffortress.desktop 2014-08-05 17:34:51 UTC (rev 116905) @@ -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.png =================================================================== (Binary files differ) Copied: dwarffortress/repos/multilib-x86_64/dwarffortress.png (from rev 116904, dwarffortress/trunk/dwarffortress.png) =================================================================== (Binary files differ)