summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2019-09-27 12:20:54 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2019-09-27 12:20:54 -0700
commit7a408532446341b7e7c706b3396e511629a39839 (patch)
tree10dc4b02092a131d6476b06303111762690163ad
parentEnabled O3 (diff)
downloadcataclysm-dda-7a408532446341b7e7c706b3396e511629a39839.tar.xz
Add desktop file for cataclysm-tiles
Replace -O3 patch with sed.
-rw-r--r--O3-support.patch20
-rw-r--r--PKGBUILD9
-rw-r--r--cataclysm-dda-tiles.desktop8
3 files changed, 13 insertions, 24 deletions
diff --git a/O3-support.patch b/O3-support.patch
deleted file mode 100644
index ab802cf..0000000
--- a/O3-support.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -255,7 +261,7 @@
- OPTLEVEL = -O0
- else
- ifeq ($(shell $(CXX) -E -Os - < /dev/null > /dev/null 2>&1 && echo fos),fos)
-- OPTLEVEL = -Os
-+ OPTLEVEL = -O3
- else
- OPTLEVEL = -O3
- endif
-@@ -266,7 +272,7 @@
- ifeq ($(CXXMACHINE), x86_64-w64-mingw32.static)
- OPTLEVEL = -O3
- else
-- OPTLEVEL = -Os
-+ OPTLEVEL = -O3
- endif
- endif
- ifdef LTO
diff --git a/PKGBUILD b/PKGBUILD
index 8defaf2..030f5b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgbase=cataclysm-dda
pkgname=(cataclysm-dda cataclysm-dda-tiles)
pkgname=cataclysm-dda
pkgver=0.D
-pkgrel=1.2
+pkgrel=1.3
pkgdesc="A post-apocalyptic roguelike."
#url="http://cataclysmrl.blogspot.com/"
#url="http://www.cataclysm.glyphgryph.com/"
@@ -21,10 +21,10 @@ depends=('ncurses' 'lua' 'hicolor-icon-theme' 'gettext')
makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2' 'astyle')
source=("$pkgname-$pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/archive/$pkgver.tar.gz"
"cataclysm-dda.desktop"
- "O3-support.patch")
+ "cataclysm-dda-tiles.desktop")
sha256sums=('6cc97b3e1e466b8585e8433a6d6010931e9a073f6ec060113161b38052d82882'
'f101e659e61bf3c20d282852c3e35aaa7890be44f9ae0d805575b213c41e429f'
- '0720e142574b87b26b532448fca241aa3b3a39d75bd758e77b991066b8a4109b')
+ '046728df50228c42e1651619d165da95284fade39b876b94b565b19da00a9878')
# official docs say to use lua51
# but makefile supports lua52?
@@ -36,7 +36,7 @@ prepare() {
sed -i 's/ncursesw5-config/ncursesw6-config/' Makefile
#sed -i 's|"\(l.*h\)"|"lua5.1/\1"|' src/catalua.{h,cpp}
sed -i 's/shell git/shell false/' Makefile
- patch -p1 -i "${srcdir}/O3-support.patch"
+ sed -i 's/-Os/-O3/' Makefile
}
build() {
@@ -81,6 +81,7 @@ package_cataclysm-dda-tiles() {
# Icon
install -D 'data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/icons/hicolor/128x128/apps/cataclysm-dda.png"
install -D 'data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/pixmaps/$pkgname.png"
+ install -Dm644 "${srcdir}/${pkgname}-tiles.desktop" "${pkgdir}/usr/share/applications/${pkgname}-tiles.desktop"
install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/cataclysm-dda-tiles.desktop b/cataclysm-dda-tiles.desktop
new file mode 100644
index 0000000..62f53c3
--- /dev/null
+++ b/cataclysm-dda-tiles.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Cataclysm: Dark Days Ahead (Tiles)
+Comment=A turn-based survival game set in a post-apocalyptic world.
+Exec=cataclysm-tiles
+Icon=cataclysm-dda
+Terminal=false
+Type=Application
+Categories=Game;AdventureGame;RolePlaying;