[patch] megaglest-ebuild.patch

megaglest-ebuild.patch (text/plain), 1.57 KB, created by Andrei Slavoiu on 2017-03-23 23:32:22 UTC

--- /usr/portage/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild	2017-02-28 21:50:50.000000000 +0200
+++ /usr/portage/games-strategy/megaglest/megaglest-3.13.0.ebuild	2017-03-24 01:16:01.523335937 +0200
@@ -68,10 +68,6 @@
 		WX_GTK_VER="3.0"
 		need-wxwidgets unicode
 	fi
-
-	epatch "${FILESDIR}"/${P}-static-build.patch \
-		"${FILESDIR}"/${P}-cmake.patch \
-		"${FILESDIR}"/${P}-miniupnpc.patch
 }
 
 src_configure() {
@@ -92,10 +88,10 @@
 		$(cmake-utils_use_build model-viewer MEGAGLEST_MODEL_VIEWER)
 		$(cmake-utils_use_with videos VLC)
 		-DMAX_SSE_LEVEL_DESIRED="${SSE}"
-		-DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}"
-		-DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
+		-DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR#/usr/}"
+		-DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR#/usr/}/${PN}"
 		# icons are used at runtime, wrong default location share/pixmaps
-		-DMEGAGLEST_ICON_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
+		-DMEGAGLEST_ICON_INSTALL_PATH="${GAMES_DATADIR#/usr/}/${PN}"
 		-DUSE_FTGL=ON
 		$(cmake-utils_use_want static STATIC_LIBS)
 		$(cmake-utils_use_want streflop STREFLOP)
@@ -107,9 +103,6 @@
 		$(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "")
 	)
 
-	# support CMAKE_BUILD_TYPE=Gentoo
-	append-cppflags '-DCUSTOM_DATA_INSTALL_PATH=\\\"'${GAMES_DATADIR}/${PN}/'\\\"'
-
 	cmake-utils_src_configure
 }
 
@@ -128,7 +121,6 @@
 	emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" "$@" install/fast
 
 	dodoc docs/{AUTHORS.source_code,CHANGELOG,README}.txt
-	doicon -s 48 ${PN}.png
 
 	use editor &&
 		make_desktop_entry ${PN}_editor "MegaGlest Map Editor"