summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucki2018-09-23 20:19:55 +0200
committerLucki2018-09-23 20:19:55 +0200
commit7b2b8e809fd6c1ecef2ba53af18efb138dcb1320 (patch)
tree55c034bf080b48ec84da01185e1bae50b8bbadca
parent60acaf7c152db0980060924539f902df0a8d2364 (diff)
downloadaur-7b2b8e809fd6c1ecef2ba53af18efb138dcb1320.tar.gz
Update to v0.9.20…
…let makepkg handle dub deps
-rw-r--r--.CHANGELOG35
-rw-r--r--.SRCINFO21
-rw-r--r--PKGBUILD167
3 files changed, 148 insertions, 75 deletions
diff --git a/.CHANGELOG b/.CHANGELOG
index 8c6260741be..dba720aa3c8 100644
--- a/.CHANGELOG
+++ b/.CHANGELOG
@@ -1,6 +1,41 @@
Version history
===============
+0.9.20
+------
+
+2018-09-23
+
+Backroute fixes in Continuum Hypothesis and Inside the Fourth Wall.
+Fewer lixes in Undercutting the Competition.
+
+Reshaded rectangular blocks in matt/marble: Shading at the left and top should
+only become lighter towards the outside. Before, the blocks looked flattened.
+Diagonal blocks in matt/marble still have this issue.
+
+Fix #349: Mirror button icon shows horizontal mirroring with two triangles,
+not vertical mirroring with an upside-down tree anymore.
+
+Partially fix #348: Custom grid button shows size of current custom grid.
+
+Center images on BitmapButtons more accurately.
+
+Removed unused UI graphics: Spawn interval graphic, hint selection graphic,
+editor hatch direction graphic that is shown with a unicode arrow instead.
+
+Fix #356: When you specify -w or --resol=XXXxYYY on the command line,
+loading/switching the user configuration will not override the command line's
+resolution in this session.
+
+Reorganized the trophy area of the singleplayer browser: Don't draw last
+game's results over the personal best of lix saved.
+
+dub package Optional: I use Optional 0.6.3 now instead of Optional 0.4.x. This
+requires a recent compiler (I know that 2.082 or newer works) when you build
+Lix yourself.
+
+
+
0.9.19
------
diff --git a/.SRCINFO b/.SRCINFO
index 3e25aee3840..62d58e05aef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = lix
pkgdesc = An action-puzzle game inspired by Lemmings
- pkgver = 0.9.19
- pkgrel = 2
+ pkgver = 0.9.20
+ pkgrel = 1
url = http://www.lixgame.com/
changelog = .CHANGELOG
arch = i686
@@ -13,13 +13,26 @@ pkgbase = lix
depends = allegro
depends = enet
depends = hicolor-icon-theme
- conflicts = lix-git
- source = lix::git+https://github.com/SimonN/LixD.git#commit=4e1204cf1770a2b48603fee7b570cd765979fa43
+ source = lix::git+https://github.com/SimonN/LixD.git#tag=v0.9.20
source = lix-music-1.zip::http://www.lixgame.com/dow/lix-music.zip
source = lix.desktop
+ source = allegro::git+https://github.com/SiegeLord/DAllegro5.git
+ source = bolts::git+https://github.com/aliak00/bolts.git#tag=v0.7.1
+ source = derelict-enet::git+https://github.com/DerelictOrg/DerelictENet.git#tag=v2.0.0
+ source = derelict-util::git+https://github.com/DerelictOrg/DerelictUtil.git#tag=v2.1.0
+ source = enumap::git+https://github.com/rcorre/enumap.git
+ source = optional::git+https://github.com/aliak00/optional.git#tag=v0.6.3
+ source = silly::git+https://github.com/ohdatboi/silly.git
sha512sums = SKIP
sha512sums = 37349c98b739ea43c25137dd03865f1c9c41eec91e5edc109afd9d50ce3871bd0c7f63c3f3599a47bb4ef52f5bfd14e034010de0ac2aec5a9c0c83eaf0b89425
sha512sums = 52d49562cd9be4eec76b464153af1cce2211fdbd6113a6a60df042f7e8f7e6a8f1942df883dfaaa6c1bbfea004c4154d884dfa767e25fa3fadf9c58be1103fe6
+ sha512sums = SKIP
+ sha512sums = SKIP
+ sha512sums = SKIP
+ sha512sums = SKIP
+ sha512sums = SKIP
+ sha512sums = SKIP
+ sha512sums = SKIP
pkgname = lix
diff --git a/PKGBUILD b/PKGBUILD
index ed9d18b9f74..f7e7c760ab3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,138 +2,163 @@
# Contributor: Carl Reinke <mindless2112 gmail com>
pkgname=lix
-pkgver=0.9.19
-pkgrel=2
+pkgver=0.9.20
+pkgrel=1
changelog=.CHANGELOG
-conflicts=("${pkgname}-git")
-source=(#"${pkgname}::git+https://github.com/SimonN/LixD.git#tag=v${pkgver}"
- "${pkgname}::git+https://github.com/SimonN/LixD.git#commit=4e1204cf1770a2b48603fee7b570cd765979fa43"
- "${pkgname}-music-1.zip::http://www.lixgame.com/dow/lix-music.zip"
- "${pkgname}.desktop")
-sha512sums=('SKIP'
- '37349c98b739ea43c25137dd03865f1c9c41eec91e5edc109afd9d50ce3871bd0c7f63c3f3599a47bb4ef52f5bfd14e034010de0ac2aec5a9c0c83eaf0b89425'
- '52d49562cd9be4eec76b464153af1cce2211fdbd6113a6a60df042f7e8f7e6a8f1942df883dfaaa6c1bbfea004c4154d884dfa767e25fa3fadf9c58be1103fe6')
+source=("${pkgname}::git+https://github.com/SimonN/LixD.git#tag=v${pkgver}")
+sha512sums=('SKIP')
_pkgname=${pkgname}
-# template start; name=lix; version=0.8;
+# template start; name=lix; version=0.9;
pkgdesc="An action-puzzle game inspired by Lemmings"
arch=('i686' 'x86_64')
url="http://www.lixgame.com/"
license=('custom:CC0')
depends=('allegro' 'enet' 'hicolor-icon-theme')
makedepends=('git' 'dmd' 'dub')
+_dub_versions=( '4.0.3+5.2.0' # Allegro
+ '0.7.1' # Bolts
+ '2.0.0' # Derelict-Enet
+ '2.1.0' # Derelict-Util
+ '0.4.2' # Enumap
+ '0.6.3' # Optional
+ '0.7.1') # Silly
+
+# let makepkg handle dub packages
+# https://wiki.archlinux.org/index.php/VCS_package_guidelines#Git_Submodules
+source+=( "${_pkgname}-music-1.zip::http://www.lixgame.com/dow/lix-music.zip"
+ "${_pkgname}.desktop"
+ "allegro::git+https://github.com/SiegeLord/DAllegro5.git" #tag=v${_dub_versions[0]}"
+ "bolts::git+https://github.com/aliak00/bolts.git#tag=v${_dub_versions[1]}"
+ "derelict-enet::git+https://github.com/DerelictOrg/DerelictENet.git#tag=v${_dub_versions[2]}"
+ "derelict-util::git+https://github.com/DerelictOrg/DerelictUtil.git#tag=v${_dub_versions[3]}"
+ "enumap::git+https://github.com/rcorre/enumap.git" #tag=v${_dub_versions[4]}"
+ "optional::git+https://github.com/aliak00/optional.git#tag=v${_dub_versions[5]}"
+ "silly::git+https://github.com/ohdatboi/silly.git" #tag=v${_dub_versions[6]}"
+ )
+sha512sums+=( '37349c98b739ea43c25137dd03865f1c9c41eec91e5edc109afd9d50ce3871bd0c7f63c3f3599a47bb4ef52f5bfd14e034010de0ac2aec5a9c0c83eaf0b89425'
+ '52d49562cd9be4eec76b464153af1cce2211fdbd6113a6a60df042f7e8f7e6a8f1942df883dfaaa6c1bbfea004c4154d884dfa767e25fa3fadf9c58be1103fe6'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP')
build()
{
- cd "${srcdir}/${_pkgname}"
+ cd "${srcdir}/${_pkgname}" || exit
_r=0
- # force an upgrade of the dependencies to the local folder, without
- # --cache=local 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
- dub add-local enumap-*/enumap
- dub add-local optional-*/optional
- dub add-local bolts-*/bolts
+ dub add-path "${srcdir}"
# force FHS compatibility with '-b releaseXDG'
- dub build -f -b releaseXDG --cache=local || _r=$?
+ # ensure with --cache=local dub stays outside the users home directory
+ dub build -f -b releaseXDG --cache=local || _r="${?}"
- # remove local dependencies from search path so dub don't find them
+ # remove local dependencies from search path so dub won'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 remove-local optional-*/optional
- dub remove-local bolts-*/bolts
+ dub remove-path "${srcdir}"
+
+ # removes any cached metadata like the list of available packages
+ # and their latest version
dub clean-caches
- if [[ "$_r" != 0 ]] ; then
+ if [[ "${_r}" != 0 ]]
+ then
# dub failed so we also fail after we removed the local dependencies
- return "$_r";
+ return "${_r}"
fi
}
check()
{
- cd "${srcdir}/${_pkgname}"
+ cd "${srcdir}/${_pkgname}" || exit
_r=0
- # force an upgrade of the dependencies to the local folder, without
- # --cache=local 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
- dub add-local enumap-*/enumap
- dub add-local optional-*/optional
- dub add-local bolts-*/bolts
+ dub add-path "${srcdir}"
- dub test --cache=local || _r=$?
+ # run test suite
+ # ensure with --cache=local dub stays outside the users home directory
+ dub test --cache=local || _r="${?}"
- # remove local dependencies from search path so dub don't find them
+ # remove local dependencies from search path so dub won'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 remove-local optional-*/optional
- dub remove-local bolts-*/bolts
+ dub remove-path "${srcdir}"
+
+ # removes any cached metadata like the list of available packages
+ # and their latest version
dub clean-caches
- if [[ "$_r" != 0 ]] ; then
+ if [[ "${_r}" != 0 ]]
+ then
# dub failed so we also fail after we removed the local dependencies
- return "$_r"
+ return "${_r}"
fi
}
package()
{
- cd "${srcdir}"
+ cd "${srcdir}" || exit
# install application entry
- install -Dm644 "${_pkgname}.desktop" \
- "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+ install -Dm644 \
+ `# SRCFILE:` \
+ "${_pkgname}.desktop" \
+ `# DSTFILE:` \
+ "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
- cd "${_pkgname}"
+ cd "${_pkgname}" || exit
# install application entry icon
- install -Dm644 "data/images/${_pkgname}_logo.svg" \
- "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
+ install -Dm644 \
+ `# SRCFILE:` \
+ "data/images/${_pkgname}_logo.svg" \
+ `# DSTFILE:` \
+ "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
# install license text
- install -Dm644 "doc/copying.txt" \
- "${pkgdir}/usr/share/licenses/${_pkgname}/COPYING"
+ install -Dm644 \
+ `# SRCFILE:` \
+ "doc/copying.txt" \
+ `# DSTFILE:` \
+ "${pkgdir}/usr/share/licenses/${_pkgname}/COPYING"
# install binary
- install -Dm755 "bin/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
+ install -Dm755 \
+ `# SRCFILE:` \
+ "bin/${_pkgname}" \
+ `# DSTFILE:` \
+ "${pkgdir}/usr/bin/${_pkgname}"
# remove unimportant files
# https://raw.githubusercontent.com/SimonN/LixD/master/doc/build/package.txt
rm -r "${srcdir}/${_pkgname}/doc/build"
- #https://lists.archlinux.org/pipermail/aur-general/2011-November/016777.html
+ # https://lists.archlinux.org/pipermail/aur-general/2011-November/016777.html
# make directories
- mkdir -p "${pkgdir}/usr/share/${_pkgname}" \
+ mkdir -p \
+ "${pkgdir}/usr/share/${_pkgname}" \
"${pkgdir}/usr/share/doc/${_pkgname}"
# copy documentary
- cp -dpr --no-preserve=ownership "doc/." \
- "${pkgdir}/usr/share/doc/${_pkgname}/"
+ cp -dpr --no-preserve=ownership \
+ `# SRCFILES:` \
+ "doc/." \
+ `# DSTDIR:` \
+ "${pkgdir}/usr/share/doc/${_pkgname}/"
# copy game files
cp -dpr --no-preserve=ownership \
- "data" \
- "images" \
- "levels" \
- "${srcdir}/music" \
- "${pkgdir}/usr/share/${_pkgname}"
+ `# SRCDIRS:` \
+ "data" \
+ "images" \
+ "levels" \
+ "${srcdir}/music" \
+ `# DSTDIR:` \
+ "${pkgdir}/usr/share/${_pkgname}"
}
# template end;