Thu Jun 13 19:12:44 2019 UTC ()
mgba: Install .desktop file without needing desktop-file-install(1).


(nia)
diff -r1.1 -r1.2 pkgsrc/emulators/mgba/Makefile
diff -r1.1 -r1.2 pkgsrc/emulators/mgba/distinfo
diff -r0 -r1.1 pkgsrc/emulators/mgba/patches/patch-src_platform_qt_CMakeLists.txt
cvs diff -r1.1 -r1.2 pkgsrc/emulators/mgba/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/mgba/Makefile 2019/06/08 22:46:03 1.1
+++ pkgsrc/emulators/mgba/Makefile 2019/06/13 19:12:44 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.1 2019/06/08 22:46:03 nia Exp $ 1# $NetBSD: Makefile,v 1.2 2019/06/13 19:12:44 nia Exp $
2 2
3DISTNAME= mgba-0.7.2 3DISTNAME= mgba-0.7.2
 4PKGREVISION= 1
4CATEGORIES= emulators 5CATEGORIES= emulators
5MASTER_SITES= ${MASTER_SITE_GITHUB:=mgba-emu/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=mgba-emu/}
6 7
7MAINTAINER= nia@NetBSD.org 8MAINTAINER= nia@NetBSD.org
8HOMEPAGE= https://mgba.io/ 9HOMEPAGE= https://mgba.io/
9COMMENT= Emulator for running Game Boy Advance games 10COMMENT= Emulator for running Game Boy Advance games
10LICENSE= mpl-2.0 11LICENSE= mpl-2.0
11 12
12EXTRACT_USING= bsdtar 13EXTRACT_USING= bsdtar
13USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
14USE_CMAKE= yes 15USE_CMAKE= yes
15USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
16 17
cvs diff -r1.1 -r1.2 pkgsrc/emulators/mgba/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/mgba/distinfo 2019/06/08 22:46:03 1.1
+++ pkgsrc/emulators/mgba/distinfo 2019/06/13 19:12:44 1.2
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.1 2019/06/08 22:46:03 nia Exp $ 1$NetBSD: distinfo,v 1.2 2019/06/13 19:12:44 nia Exp $
2 2
3SHA1 (mgba-0.7.2.tar.gz) = 342b40efa743f9966ad0e9d3448a8d3f4314c008 3SHA1 (mgba-0.7.2.tar.gz) = 342b40efa743f9966ad0e9d3448a8d3f4314c008
4RMD160 (mgba-0.7.2.tar.gz) = 0ad8a97d1307bad71b13d12ee0d8c7bbb2599117 4RMD160 (mgba-0.7.2.tar.gz) = 0ad8a97d1307bad71b13d12ee0d8c7bbb2599117
5SHA512 (mgba-0.7.2.tar.gz) = e63519299358ef73939d07012cd6880478d4e5b1e6161c42bcbe36e5207af3dcbe4c147fd1a94432ddbe5fbdf5d2c9755d90984ea800bf9d9860d7f806f996cd 5SHA512 (mgba-0.7.2.tar.gz) = e63519299358ef73939d07012cd6880478d4e5b1e6161c42bcbe36e5207af3dcbe4c147fd1a94432ddbe5fbdf5d2c9755d90984ea800bf9d9860d7f806f996cd
6Size (mgba-0.7.2.tar.gz) = 11255680 bytes 6Size (mgba-0.7.2.tar.gz) = 11255680 bytes
7SHA1 (patch-CMakeLists.txt) = f0b106e75cd2697fe81c7b962159cfa5ed4c6681 7SHA1 (patch-CMakeLists.txt) = f0b106e75cd2697fe81c7b962159cfa5ed4c6681
8SHA1 (patch-include_mgba-util_math.h) = 448ca1bb3bbe2812e7d9482917c488ddcf3b48f0 8SHA1 (patch-include_mgba-util_math.h) = 448ca1bb3bbe2812e7d9482917c488ddcf3b48f0
9SHA1 (patch-include_mgba-util_platform_posix_threading.h) = c5c737be68340e3571934d43bf0c6eab8bc34978 9SHA1 (patch-include_mgba-util_platform_posix_threading.h) = c5c737be68340e3571934d43bf0c6eab8bc34978
 10SHA1 (patch-src_platform_qt_CMakeLists.txt) = e8adb538c1319d6a5c380aa091aa3b10e3ed29e7
10SHA1 (patch-version.cmake) = 7d6d44febe7bb0ff2231452f037def7cb3782e21 11SHA1 (patch-version.cmake) = 7d6d44febe7bb0ff2231452f037def7cb3782e21
File Added: pkgsrc/emulators/mgba/patches/patch-src_platform_qt_CMakeLists.txt
$NetBSD: patch-src_platform_qt_CMakeLists.txt,v 1.1 2019/06/13 19:12:44 nia Exp $

Install .desktop file without needing desktop-file-install.

--- src/platform/qt/CMakeLists.txt.orig	2019-05-25 22:51:44.000000000 +0000
+++ src/platform/qt/CMakeLists.txt
@@ -298,10 +298,7 @@ install(TARGETS ${BINARY_NAME}-qt
 	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${BINARY_NAME}-qt
 	BUNDLE DESTINATION Applications COMPONENT ${BINARY_NAME}-qt)
 if(UNIX AND NOT APPLE)
-	find_program(DESKTOP_FILE_INSTALL desktop-file-install)
-	if(DESKTOP_FILE_INSTALL)
-		install(CODE "execute_process(COMMAND ${DESKTOP_FILE_INSTALL} \"${CMAKE_SOURCE_DIR}/res/mgba-qt.desktop\" --dir \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/applications/\")" COMPONENT ${BINARY_NAME}-qt)
-	endif()
+	install(FILES ${CMAKE_SOURCE_DIR}/res/mgba-qt.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications COMPONENT ${BINARY_NAME}-qt)
 endif()
 if(UNIX)
 	install(FILES ${CMAKE_SOURCE_DIR}/doc/mgba-qt.6 DESTINATION ${MANDIR}/man6 COMPONENT ${BINARY_NAME}-qt)