From fd7c33efc0457bdcc6a28d2ffb7783a0e409af1c Mon Sep 17 00:00:00 2001 From: travankor Date: Fri, 29 Oct 2021 13:45:04 -0700 Subject: [PATCH] widelands: correct install paths Specify WL_INSTALL_BASEDIR. Remove redundant desktop file. --- srcpkgs/widelands/files/widelands.desktop | 22 ---------------------- srcpkgs/widelands/template | 9 +++------ 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 srcpkgs/widelands/files/widelands.desktop diff --git a/srcpkgs/widelands/files/widelands.desktop b/srcpkgs/widelands/files/widelands.desktop deleted file mode 100644 index 5eb5337e52c0..000000000000 --- a/srcpkgs/widelands/files/widelands.desktop +++ /dev/null @@ -1,22 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Type=Application -Name=Widelands -GenericName=Strategy Game -GenericName[af]=Strategie-spel -GenericName[ca]=Joc d'estrategia -GenericName[de]=Strategiespiel -GenericName[dk]=Strategi-spil -GenericName[eu]=Estrategiako jokoa -GenericName[fr]=Jeu de stratégie -GenericName[he]=משחק אסטרטגיה -GenericName[hu]=Stratégia -GenericName[ru]=Стратегическая игра -GenericName[sk]=Strategická hra -Comment=A a real-time build-up strategy game -Comment[de]=Echtzeitbasiertes Aufbau-Strategiespiel -Icon=/usr/share/widelands/pics/wl-ico-128.png -TryExec=/usr/bin/widelands -Exec=/usr/bin/widelands --datadir=/usr/share/widelands -Categories=Application;Game;StrategyGame; diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template index 97cb44097295..8d208f682992 100644 --- a/srcpkgs/widelands/template +++ b/srcpkgs/widelands/template @@ -4,10 +4,11 @@ pkgname=widelands reverts="21_5 21_4 21_3 21_2 21_1 20_4 20_3 20_2 20_1 19_10 19_9 19_8 19_7 19_6 19_5 19_4 19_3 19_2 19_1 18_5 18_4 18_3 18_2 18_1" version=1.0 -revision=1 +revision=2 build_style=cmake configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include - -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DWL_INSTALL_DATADIR=/usr/share/widelands" + -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DWL_INSTALL_BASEDIR=/usr/share/widelands + -DWL_INSTALL_DATADIR=/usr/share/widelands" hostmakedepends="python3 pkg-config gettext" makedepends="boost-devel icu-devel minizip-devel gettext-devel glu-devel glew-devel libcurl-devel SDL2-devel SDL2_gfx-devel SDL2_image-devel @@ -29,7 +30,3 @@ fi if [ "$CROSS_BUILD" ]; then configure_args+=" -DOPTION_BUILD_TESTS=OFF" fi - -post_install() { - vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications -}