diff options
author | Benedict Etzel | 2018-02-05 01:54:36 +0100 |
---|---|---|
committer | Benedict Etzel | 2018-02-05 01:54:36 +0100 |
commit | 59f160e6df816784fe0adf1ebc3138ca3fe495c1 (patch) | |
tree | 9cb2d10b867451fcfe17e93885f52eed04861bb2 | |
parent | b17385bf7e2d6a3ea7d297cceb72e11826dc244c (diff) | |
download | aur-59f160e6df816784fe0adf1ebc3138ca3fe495c1.tar.gz |
8.0-1
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 20 | ||||
-rw-r--r-- | directories.patch | 39 |
3 files changed, 36 insertions, 35 deletions
@@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Wed Jan 20 12:34:05 UTC 2016 pkgbase = openclonk pkgdesc = Multiplayer-action-tactic-skill game - pkgver = 7.0 - pkgrel = 4 + pkgver = 8.0 + pkgrel = 1 url = http://openclonk.org install = openclonk.install arch = i686 @@ -30,10 +28,10 @@ pkgbase = openclonk depends = desktop-file-utils optdepends = openclonk-music: proprietary music package conflicts = clonk_rage - source = http://openclonk.org/builds/release/7.0/openclonk-7.0-src.tar.bz2 + source = https://git.openclonk.org/openclonk.git/archive/openclonk-release-8.0-src.tar.bz2 source = directories.patch - sha256sums = bc1a231d72774a7aa8819e54e1f79be27a21b579fb057609398f2aa5700b0732 - sha256sums = 1dca1c23c342fa6b41ba72065217e31f5f5604a1500e16de54f26e9ce760f869 + sha256sums = 6fc88e8c9bb0ca7eb3e3c8f60af80f77bd6d8f23632bb03f4f5e6ac4e97ae354 + sha256sums = b3104190549b35206158b58c61b80b26f300efd9dd30f507361234d7d70fd10a pkgname = openclonk @@ -5,8 +5,8 @@ # Contributor: Lukas Werling <lukas.werling@gmail.com> pkgname=openclonk -pkgver=7.0 -pkgrel=4 +pkgver=8.0 +pkgrel=1 pkgdesc='Multiplayer-action-tactic-skill game' arch=('i686' 'x86_64') url='http://openclonk.org' @@ -16,18 +16,18 @@ install=openclonk.install makedepends=('cmake' 'boost' 'mesa') optdepends=('openclonk-music: proprietary music package') conflicts=('clonk_rage') -source=("http://openclonk.org/builds/release/$pkgver/$pkgname-$pkgver-src.tar.bz2" +source=("https://git.openclonk.org/openclonk.git/archive/$pkgname-release-$pkgver-src.tar.bz2" 'directories.patch') -sha256sums=('bc1a231d72774a7aa8819e54e1f79be27a21b579fb057609398f2aa5700b0732' - '1dca1c23c342fa6b41ba72065217e31f5f5604a1500e16de54f26e9ce760f869') +sha256sums=('6fc88e8c9bb0ca7eb3e3c8f60af80f77bd6d8f23632bb03f4f5e6ac4e97ae354' + 'b3104190549b35206158b58c61b80b26f300efd9dd30f507361234d7d70fd10a') prepare() { - cd ${pkgname}-${pkgver}-src + cd ${pkgname}-release-${pkgver}-src patch -p1 -i ../directories.patch } build() { - cd ${pkgname}-${pkgver}-src + cd ${pkgname}-release-${pkgver}-src [[ -d build ]] && rm -rf build mkdir build && cd build @@ -39,14 +39,10 @@ build() { } package() { - cd ${pkgname}-${pkgver}-src/build + cd ${pkgname}-release-${pkgver}-src/build make DESTDIR="$pkgdir" install - # replace the music packet with unpacked music to allow adding music - rm "$pkgdir/usr/share/openclonk/Music.ocg" - install -Dm644 ../planet/Music.ocg/* -t "$pkgdir/usr/share/openclonk/Music.ocg" - # licenses install -dm755 "$pkgdir"/usr/share/licenses/$pkgname install -m644 ../licenses/*.txt "$pkgdir"/usr/share/licenses/$pkgname diff --git a/directories.patch b/directories.patch index 85af03ad00af..1f597966a986 100644 --- a/directories.patch +++ b/directories.patch @@ -1,16 +1,16 @@ -diff -aur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2016-01-15 21:56:57.000000000 +0100 -+++ b/CMakeLists.txt 2016-01-17 20:48:52.194153030 +0100 -@@ -100,7 +100,7 @@ - # Don't put this into CMAKE_CXX_FLAGS because otherwise it is cached, - # and when the path is changed both the old and new definition appears - # in the list of flags. +diff -ura a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2018-02-04 16:39:08.000000000 +0100 ++++ b/CMakeLists.txt 2018-02-05 00:38:51.365223943 +0100 +@@ -167,7 +167,7 @@ + endif() + + if(UNIX) - add_definitions("-DOC_SYSTEM_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/games/openclonk\"") + add_definitions("-DOC_SYSTEM_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/openclonk\"") endif() if(APPLE) -@@ -1461,7 +1461,7 @@ +@@ -1517,13 +1517,13 @@ DEPENDS "${native_c4group}" VERBATIM ) @@ -19,12 +19,19 @@ diff -aur a/CMakeLists.txt b/CMakeLists.txt endif() endforeach() -@@ -1475,7 +1475,7 @@ - install(CODE "execute_process(COMMAND update-desktop-database)") + if(NOT APPLE) + if(NOT HEADLESS_ONLY) +- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/planet/Music.ocg DESTINATION share/games/openclonk) ++ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/planet/Music.ocg DESTINATION share/openclonk) + endif() + # group files (game data) + add_custom_target(groups DEPENDS ${OC_C4GROUPS}) +@@ -1543,7 +1543,7 @@ + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.appdata.xml DESTINATION share/appdata) - # Install binaries -- install(TARGETS openclonk DESTINATION games) -+ install(TARGETS openclonk DESTINATION bin) - install(TARGETS c4group DESTINATION bin) - else() - install(TARGETS openclonk + # Install binaries +- install(TARGETS openclonk DESTINATION games) ++ install(TARGETS openclonk DESTINATION bin) + else() + install(TARGETS openclonk + BUNDLE DESTINATION . |