Date: Tuesday, July 3, 2018 @ 07:38:59 Author: svenstaro Revision: 350549
archrelease: copy trunk to community-x86_64 Added: dwarffortress/repos/community-x86_64/PKGBUILD (from rev 350548, dwarffortress/trunk/PKGBUILD) dwarffortress/repos/community-x86_64/dwarffortress (from rev 350548, dwarffortress/trunk/dwarffortress) dwarffortress/repos/community-x86_64/dwarffortress.desktop (from rev 350548, dwarffortress/trunk/dwarffortress.desktop) dwarffortress/repos/community-x86_64/dwarffortress.install (from rev 350548, dwarffortress/trunk/dwarffortress.install) dwarffortress/repos/community-x86_64/dwarffortress.png (from rev 350548, dwarffortress/trunk/dwarffortress.png) Deleted: dwarffortress/repos/community-x86_64/PKGBUILD dwarffortress/repos/community-x86_64/dwarffortress dwarffortress/repos/community-x86_64/dwarffortress.desktop dwarffortress/repos/community-x86_64/dwarffortress.install dwarffortress/repos/community-x86_64/dwarffortress.png -----------------------+ PKGBUILD | 132 ++++++++++++++++++++++++------------------------ dwarffortress | 40 +++++++------- dwarffortress.desktop | 18 +++--- dwarffortress.install | 18 +++--- 4 files changed, 104 insertions(+), 104 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-07-03 07:38:49 UTC (rev 350548) +++ PKGBUILD 2018-07-03 07:38:59 UTC (rev 350549) @@ -1,66 +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.44.11 -_pkgver=44_11 -pkgrel=1 -pkgdesc="A single-player fantasy game in which you build a dwarven outpost or play an adventurer in a randomly generated world" -arch=(x86_64) -url="http://www.bay12games.com/dwarves/" -license=('custom:dwarffortress') -depends=(gtk2 glu sdl_image libsndfile openal sdl_ttf glew gcc-libs glib2) -makedepends=(git cmake) -optdepends=('nvidia-utils: If you have nvidia graphics' - 'alsa-lib: for alsa sound' - 'libpulse: for pulse sound') -options=('!strip' '!buildflags') -install=${pkgname}.install -# 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=(git://github.com/svenstaro/dwarf_fortress_unfuck.git#tag=${pkgver} - dwarffortress - dwarffortress.desktop - dwarffortress.png - http://www.bay12games.com/dwarves/df_${_pkgver}_linux.tar.bz2) -sha256sums=('SKIP' - '211eaec6559d4fd5c08341dbed1f27bfab997a57bdf61fd268f9940e244652c5' - 'e79e3d945c6cc0da58f4ca30a210c7bf1bc3149fd10406d1262a6214eb40445a' - '83183abc70b11944720b0d86f4efd07468f786b03fa52fe429ca8e371f708e0f' - '4e13652d0b9c9a88bdc9628d50ef60ab944930497f131dc1b1d74c41fb743fe2') - -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. - 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-x86_64/PKGBUILD (from rev 350548, dwarffortress/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-07-03 07:38:59 UTC (rev 350549) @@ -0,0 +1,66 @@ +# $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.44.11.1 +_pkgver=44_11 +pkgrel=1 +pkgdesc="A single-player fantasy game in which you build a dwarven outpost or play an adventurer in a randomly generated world" +arch=(x86_64) +url="http://www.bay12games.com/dwarves/" +license=('custom:dwarffortress') +depends=(gtk2 glu sdl_image libsndfile openal sdl_ttf glew gcc-libs glib2) +makedepends=(git cmake) +optdepends=('nvidia-utils: If you have nvidia graphics' + 'alsa-lib: for alsa sound' + 'libpulse: for pulse sound') +options=('!strip' '!buildflags') +install=${pkgname}.install +# 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=(git://github.com/svenstaro/dwarf_fortress_unfuck.git#tag=${pkgver} + dwarffortress + dwarffortress.desktop + dwarffortress.png + http://www.bay12games.com/dwarves/df_${_pkgver}_linux.tar.bz2) +sha256sums=('SKIP' + '211eaec6559d4fd5c08341dbed1f27bfab997a57bdf61fd268f9940e244652c5' + 'e79e3d945c6cc0da58f4ca30a210c7bf1bc3149fd10406d1262a6214eb40445a' + '83183abc70b11944720b0d86f4efd07468f786b03fa52fe429ca8e371f708e0f' + '4e13652d0b9c9a88bdc9628d50ef60ab944930497f131dc1b1d74c41fb743fe2') + +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. + 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 2018-07-03 07:38:49 UTC (rev 350548) +++ dwarffortress 2018-07-03 07:38:59 UTC (rev 350549) @@ -1,20 +0,0 @@ -#!/bin/bash -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-x86_64/dwarffortress (from rev 350548, dwarffortress/trunk/dwarffortress) =================================================================== --- dwarffortress (rev 0) +++ dwarffortress 2018-07-03 07:38:59 UTC (rev 350549) @@ -0,0 +1,20 @@ +#!/bin/bash +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 2018-07-03 07:38:49 UTC (rev 350548) +++ dwarffortress.desktop 2018-07-03 07:38:59 UTC (rev 350549) @@ -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-x86_64/dwarffortress.desktop (from rev 350548, dwarffortress/trunk/dwarffortress.desktop) =================================================================== --- dwarffortress.desktop (rev 0) +++ dwarffortress.desktop 2018-07-03 07:38:59 UTC (rev 350549) @@ -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 2018-07-03 07:38:49 UTC (rev 350548) +++ dwarffortress.install 2018-07-03 07:38:59 UTC (rev 350549) @@ -1,9 +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." - echo "This might also be necessary if you have custom keybinds." -} - -post_install() { - post_upgrade -} Copied: dwarffortress/repos/community-x86_64/dwarffortress.install (from rev 350548, dwarffortress/trunk/dwarffortress.install) =================================================================== --- dwarffortress.install (rev 0) +++ dwarffortress.install 2018-07-03 07:38:59 UTC (rev 350549) @@ -0,0 +1,9 @@ +post_upgrade() { + echo "You might have delete your ~/.dwarffortress directory to get the new file layout." + echo "Of course, you can backup your saves." + echo "This might also be necessary if you have custom keybinds." +} + +post_install() { + post_upgrade +} Deleted: dwarffortress.png =================================================================== (Binary files differ) Copied: dwarffortress/repos/community-x86_64/dwarffortress.png (from rev 350548, dwarffortress/trunk/dwarffortress.png) =================================================================== (Binary files differ)