diff options
-rw-r--r-- | .CHANGELOG | 107 | ||||
-rw-r--r-- | .SRCINFO | 17 | ||||
-rw-r--r-- | PKGBUILD | 61 | ||||
-rw-r--r-- | lix-git.install | 9 | ||||
-rw-r--r-- | lix-server.sh | 3 | ||||
-rw-r--r-- | lix.sh | 3 |
6 files changed, 90 insertions, 110 deletions
diff --git a/.CHANGELOG b/.CHANGELOG index 1fb4fa645b3c..a57243b1353f 100644 --- a/.CHANGELOG +++ b/.CHANGELOG @@ -1,76 +1,73 @@ -* commit 64c9b940d2b0ba354226fc023ffca6ca77a7b630 +* commit a2b7c3fe224eea7cbff8e2dc647f3541d9b8e95d | Author: SimonN <eiderdaus@gmail.com> -| Date: Fri Sep 4 19:43:31 2015 +0200 +| Date: Tue Sep 5 03:52:24 2017 +0200 | -| advance on click or assign during pause -| -* commit a61fcfd6f66af9e1910e6163006fb1f30b6aa230 +| 0.8.5 +| +* commit 2e35c3cc363d6bb3fb004a51e6cc261b5a05811c | Author: SimonN <eiderdaus@gmail.com> -| Date: Sun Jan 31 14:11:49 2016 +0100 +| Date: Sat Sep 9 02:32:29 2017 +0200 | -| replay verifier can convert and overwrite -| -| Run lix --help for instructions -| -* commit e5c3d13b43daecfa9d3840d504f41942773e9d3c +| fix #224: don't interpret grouped tiles as anim +| +* commit 6c459cb86f6c3b02fd0d95ab62796f5483899c06 | Author: SimonN <eiderdaus@gmail.com> -| Date: Sun Jan 31 09:13:59 2016 +0100 +| Date: Fri Sep 8 18:49:24 2017 +0200 +| +| fix: newly-inserted tile rounds to grid | -| level export, text won't overflow -| -* commit da33317129efa59e83cfebeafea8e01d69791eae +* commit 5406122244f7814ea26ee4b5ce5651156a05e4d0 | Author: SimonN <eiderdaus@gmail.com> -| Date: Sat Jan 30 22:29:41 2016 +0100 +| Date: Mon Sep 4 04:41:15 2017 +0200 | -| removed circle on visited/failed levels -| -| The failing result isn't even saved to the user file. -| -* commit 47dfd2317509ed5cb39b7b230b2de138dc613a6d +| levels: hanging gardens 3p, 6p +| +* commit 883af44817dfb7f11acde5c9d8860f4915fab64b | Author: SimonN <eiderdaus@gmail.com> -| Date: Sat Jan 9 05:40:45 2016 +0100 +| Date: Fri Sep 8 00:19:03 2017 +0200 | -| lemforum levels updated to 2015-06 -| -* commit dead180bf5961f804dd1920958061e39f30a7484 +| part of #216: button to flash own goals +| +* commit 7b571e601d0bbb90a686e869f3c60b16c0f14948 | Author: SimonN <eiderdaus@gmail.com> -| Date: Sat Jan 9 04:52:13 2016 +0100 +| Date: Tue Sep 5 03:52:24 2017 +0200 | -| bugfix: too many effects generated on framestep -| -| This fix works for replays played from the replay browser, -| and for normal play with framestepping. -| -| It does not work for loading the user savestate: Effects will -| probably be drawn at least once. I'd have to save the entire effect -| list with the user savestate, which would be overkill right now. -| -* commit 0595af31d07289c6cb246e3e1ddb07c4f42c3dfd +| optimized Lixxie/Jobs by packing into structs +| +* commit dcc6321d387cfb82e54f4ca4435cd0b82d60c697 | Author: SimonN <eiderdaus@gmail.com> -| Date: Thu Oct 8 18:44:44 2015 +0200 +| Date: Thu Aug 31 18:11:53 2017 +0200 | -| don't savestate during verify mode +| fix #211: FHS-friendly, opt. build with XDG dirs +| +| To build Lix self-contained: +| dub, or dub -b release +| +| To build Lix following the XDG Base Directory specification: +| dub -b releaseXDG | -| This cuts the time per verified level to about a fifth. -| -* commit 9dbef36198b49aa6dea5d94bb0785abc0903e7b6 +| Linux package maintainers, please see `doc/build/package.txt' +| for a longer description of this build flag. +| +* commit 0bc1eeb7a599579b401ddb664bd503bd5f1dec6a | Author: SimonN <eiderdaus@gmail.com> -| Date: Thu Sep 10 04:13:49 2015 +0200 +| Date: Mon Sep 4 17:28:02 2017 +0200 +| +| enforce bitmap creation, not assert | -| bugfix: panel displays 'Shrugger', not 'Shrugger2' -| -* commit 1766ca0f8046ba07b4a3d403278a165f1e84d177 -| Author: geoo89 <geoo89@gmail.com> -| Date: Tue Sep 8 19:55:19 2015 +0200 +* commit a939d73e85d1d4b16d4e6d8b6f4e49ba3bae4a09 +| Author: SimonN <eiderdaus@gmail.com> +| Date: Sun Sep 3 00:54:01 2017 +0200 | -| L1 levels: read 2 bytes, ignore big byte +| fix #162: options menu warns about duplicate keys | -| Some values in the L1 format were treated as 2 byte values while -| one of the two bytes should be ignored. Fixed. -| This especially affects Lemmix levels exported with NeoLemmix. -| -* commit 6d737facec033e7e53f449431e681a6588f6d862 +| All KeyButtons with duplicate bindings have red text. +| It's perfectly fine to have these, but the user shall +| at least know that he has bound a key to two functions. +| This red text, never deleting binds, seems least intrusive. +| +* commit 4e4751a6d7c1bf2f5bfe44b66fc0528f423958f5 | Author: SimonN <eiderdaus@gmail.com> -| Date: Fri Sep 4 12:29:05 2015 +0200 +| Date: Mon Aug 28 06:51:34 2017 +0200 | -| umlauts in _german.X and jumpers tutorial +| 0.8.4 @@ -1,32 +1,23 @@ # Generated by mksrcinfo v8 -# Thu Apr 6 12:42:05 UTC 2017 +# Sat Sep 9 11:18:25 UTC 2017 pkgbase = lix-git pkgdesc = An action-puzzle game inspired by Lemmings - pkgver = r856.524b41b + pkgver = r973.a2b7c3f pkgrel = 1 url = http://www.lixgame.com/ - install = lix-git.install changelog = .CHANGELOG arch = i686 arch = x86_64 license = custom:CC0 + makedepends = git makedepends = gendesk makedepends = dmd makedepends = dub depends = allegro - depends = enet - depends = libpng - depends = zlib - depends = libvorbis - depends = freetype2 provides = lix conflicts = lix - source = lix-git::git://github.com/SimonN/LixD.git - source = lix-logo.png::https://www.holarse-linuxgaming.de/sites/default/files/imagecache/screenshots/2012-01-22-932/lix_with_lem.png - source = lix.sh + source = lix::git+https://github.com/SimonN/LixD.git sha512sums = SKIP - sha512sums = 15cfddcdc3b97e61a32763c2410601d5579aeee0900d8175053cc098dce12dd4c3508d2f6c690f77048ebb8d5b617f86374d8e97ba0a6a166b782c177293025c - sha512sums = 82fdaa227c9a86a55a02e6f0409f39c9f72e26e956d55b593df3d7fd4c5368ce904868b1603acb1a17ea502c0d5a26586ccbae7c67bb377b204b5b0d3f5455be pkgname = lix-git @@ -2,30 +2,24 @@ # Contributor: Carl Reinke <mindless2112 gmail com> pkgname=lix-git -_pkgname=lix -pkgver=r856.524b41b +pkgver=r973.a2b7c3f pkgrel=1 pkgdesc="An action-puzzle game inspired by Lemmings" arch=('i686' 'x86_64') url="http://www.lixgame.com/" license=('custom:CC0') changelog=.CHANGELOG -install=${pkgname}.install -depends=('allegro' 'enet' 'libpng' 'zlib' 'libvorbis' 'freetype2') -makedepends=('gendesk' 'dmd' 'dub') -provides=('lix') -conflicts=('lix') -source=(${pkgname}::git://github.com/SimonN/LixD.git - ${_pkgname}-logo.png::https://www.holarse-linuxgaming.de/sites/default/files/imagecache/screenshots/2012-01-22-932/lix_with_lem.png - ${_pkgname}.sh) -sha512sums=('SKIP' - '15cfddcdc3b97e61a32763c2410601d5579aeee0900d8175053cc098dce12dd4c3508d2f6c690f77048ebb8d5b617f86374d8e97ba0a6a166b782c177293025c' - '82fdaa227c9a86a55a02e6f0409f39c9f72e26e956d55b593df3d7fd4c5368ce904868b1603acb1a17ea502c0d5a26586ccbae7c67bb377b204b5b0d3f5455be') +depends=('allegro') +makedepends=('git' 'gendesk' 'dmd' 'dub') +provides=("${pkgname%-git}") +conflicts=("${pkgname%-git}") +source=(${pkgname%-git}::git+https://github.com/SimonN/LixD.git) +sha512sums=('SKIP') pkgver() { # https://wiki.archlinux.org/index.php/VCS_package_guidelines#Git - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname%-git}" ( set -o pipefail git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' || printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" @@ -34,15 +28,20 @@ pkgver() prepare() { + cd "${srcdir}" + # generate .desktop-file gendesk -n -f --categories "Game" # update .CHANGELOG - git -C "${srcdir}/${pkgname}" log --graph -10 > "${startdir}/.CHANGELOG" + git -C "${srcdir}/${pkgname%-git}" log --graph -10 > "${startdir}/.CHANGELOG" + + cd "${pkgname%-git}" - # Force an upgrade of the dependencies - cd "${srcdir}/${pkgname}" + # force an upgrade of the dependencies to the local folder, without --cache=lokal they get added to the users home directory dub upgrade --cache=local + + # add local dependencies to search path dub add-local allegro-*/allegro dub add-local derelict-enet-*/derelict-enet dub add-local derelict-util-*/derelict-util @@ -51,23 +50,31 @@ prepare() build() { - cd "${srcdir}/${pkgname}" - dub build -b release-nobounds --cache=local + cd "${srcdir}/${pkgname%-git}" + + # force FHS compatibility with '-b releaseXDG' + dub build -b releaseXDG --cache=local + + # remove local dependencies from search path so dub don't find them later again dub remove-local allegro-*/allegro dub remove-local derelict-enet-*/derelict-enet dub remove-local derelict-util-*/derelict-util dub remove-local enumap-*/enumap + dub clean-caches } package() { - install -Dm644 "${srcdir}/${pkgname}/doc/copying.txt" "${pkgdir}/usr/share/licenses/${_pkgname}/COPYING" - install -Dm755 "${srcdir}/${_pkgname}.sh" "${pkgdir}/usr/bin/${_pkgname}" - install -Dm644 "${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop" - install -Dm644 "${srcdir}/${_pkgname}-logo.png" "${pkgdir}/usr/share/pixmaps/${_pkgname}.png" + cd "${srcdir}" + install -Dm644 "${pkgname%-git}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-git}.desktop" + + cd "${pkgname%-git}" + install -Dm644 "data/images/app_icon.I.png" "${pkgdir}/usr/share/icons/hicolor/16x16/apps/${pkgname%-git}.png" + install -Dm644 "doc/copying.txt" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + install -Dm755 "bin/${pkgname%-git}" "${pkgdir}/usr/bin/${pkgname%-git}" - mkdir -p "${pkgdir}/opt/${_pkgname}" "${pkgdir}/opt/${_pkgname}/replays" #"${pkgdir}/opt/${_pkgname}/data/user" - cp -R "${srcdir}/${pkgname}/bin/" "${srcdir}/${pkgname}/data/" "${srcdir}/${pkgname}/doc/" "${srcdir}/${pkgname}/levels/" "${srcdir}/${pkgname}/images/" "${pkgdir}/opt/${_pkgname}/" - chown :games "${pkgdir}/opt/${_pkgname}/data" "${pkgdir}/opt/${_pkgname}/levels" "${pkgdir}/opt/${_pkgname}/images" "${pkgdir}/opt/${_pkgname}/replays" #"${pkgdir}/opt/${_pkgname}/data/user" - chmod 775 "${pkgdir}/opt/${_pkgname}/data" "${pkgdir}/opt/${_pkgname}/levels" "${pkgdir}/opt/${_pkgname}/images" "${pkgdir}/opt/${_pkgname}/replays" #"${pkgdir}/opt/${_pkgname}/data/user" + # https://lists.archlinux.org/pipermail/aur-general/2011-November/016777.html + mkdir -p "${pkgdir}/usr/share/${pkgname%-git}" "${pkgdir}/usr/share/doc/${pkgname%-git}" + cp -dpr --no-preserve=ownership "doc/." "${pkgdir}/usr/share/doc/${pkgname%-git}/" + cp -dpr --no-preserve=ownership "data" "images" "levels" "${pkgdir}/usr/share/${pkgname%-git}" } diff --git a/lix-git.install b/lix-git.install deleted file mode 100644 index 87fc372697d8..000000000000 --- a/lix-git.install +++ /dev/null @@ -1,9 +0,0 @@ -post_install() { - echo "Add your user to the games group to save configurations." -} - -post_remove() { - if [ -d "/opt/lix" ]; then - rm -r /opt/lix - fi -} diff --git a/lix-server.sh b/lix-server.sh deleted file mode 100644 index b9d0d9a76e06..000000000000 --- a/lix-server.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /opt/lix/ -exec ./bin/lixd "$@" diff --git a/lix.sh b/lix.sh deleted file mode 100644 index 4e3c0dda6e61..000000000000 --- a/lix.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /opt/lix/ -exec ./bin/lix "$@" |