"Anthony J. Bentley" writes:
> Hi,
>
> Here's an update to mgba-0.3.0.
>
> Removes a patch, adds manpages and a desktop file. Couple of relevant
> bugfixes too (fixes use-after-free when deleting breakpoints in the
> debugger, for example).
kirby@ pointed out that the desktop file didn't get installed properly.
This bug has now been fixed upstream, and I pulled in a patch.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/mgba/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile 19 Jul 2015 21:00:00 -0000 1.1.1.1
+++ Makefile 19 Aug 2015 08:47:05 -0000
@@ -3,7 +3,7 @@
COMMENT-main = Game Boy Advance emulator
COMMENT-qt = Game Boy Advance emulator with GUI
-V = 0.2.1
+V = 0.3.0
DISTNAME = mgba-$V
PKGNAME-main = mgba-$V
PKGNAME-qt = mgba-qt-$V
@@ -23,10 +23,11 @@ MAINTAINER = Anthony J. Bentley <anthon
# MPL 2.0
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB-main = GL GLU MagickCore MagickWand SDL avcodec avformat \
+cWANTLIB = GL GLU MagickCore MagickWand SDL avcodec avformat \
avresample avutil c edit m png pthread swscale \
termcap z zip
-WANTLIB-qt = ${WANTLIB-main} Qt5Core Qt5Gui Qt5Multimedia \
+WANTLIB-main = ${cWANTLIB} pixman-1 pthread-stubs
+WANTLIB-qt = ${cWANTLIB} Qt5Core Qt5Gui Qt5Multimedia \
Qt5Network Qt5OpenGL Qt5Widgets estdc++ mgba
GH_ACCOUNT = mgba-emu
@@ -44,6 +45,8 @@ LIB_DEPENDS-main = archivers/libzip \
LIB_DEPENDS-qt = ${LIB_DEPENDS-main} \
${MODQT_LIB_DEPENDS} \
emulators/mgba,-main
+RUN_DEPENDS-qt = devel/desktop-file-utils \
+ x11/gtk+3,-guic
.if ${BUILD_PACKAGES:M-qt}
MODULES += x11/qt5
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/mgba/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 19 Jul 2015 21:00:00 -0000 1.1.1.1
+++ distinfo 19 Aug 2015 08:47:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (mgba-0.2.1.tar.gz) = JK2rn//mCnmv0vgleHl7ImQmDUIr11exy+jt90qJCrM=
-SIZE (mgba-0.2.1.tar.gz) = 2243315
+SHA256 (mgba-0.3.0.tar.gz) = 1R1MSCekQ7ixQOIyv9S+4PKKNHCOqXbi6S5kztoy/ws=
+SIZE (mgba-0.3.0.tar.gz) = 2559946
Index: patches/patch-src_platform_qt_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_platform_qt_CMakeLists_txt
diff -N patches/patch-src_platform_qt_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_platform_qt_CMakeLists_txt 19 Aug 2015 08:47:05
-0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+Fix install path of XDG desktop file.
+
+From upstream 1f10613d1b7e96d362660c81c37ccf78c2276f7d
+--- src/platform/qt/CMakeLists.txt.orig Sun Aug 16 21:01:24 2015
++++ src/platform/qt/CMakeLists.txt Tue Aug 18 05:46:49 2015
+@@ -167,7 +167,7 @@ install(TARGETS ${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}/share/applications/\")")
++ 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/\")")
+ endif()
+ endif()
+ if(UNIX)
Index: patches/patch-src_platform_sdl_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_platform_sdl_CMakeLists_txt
diff -N patches/patch-src_platform_sdl_CMakeLists_txt
--- patches/patch-src_platform_sdl_CMakeLists_txt 19 Jul 2015 22:24:11
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_platform_sdl_CMakeLists_txt,v 1.2 2015/07/19 22:24:11
bentley Exp $
-Pixman code is busted, workaround suggested by upstream.
-Only an issue on SDL 1.2 platforms like OpenBSD.
---- src/platform/sdl/CMakeLists.txt.orig Tue Apr 7 01:54:02 2015
-+++ src/platform/sdl/CMakeLists.txt Tue Apr 7 01:54:02 2015
-@@ -17,7 +17,6 @@ if(SDL_VERSION EQUAL "1.2" OR NOT SDL2_FOUND)
- find_package(SDL 1.2)
- set(SDL_VERSION "1.2" PARENT_SCOPE)
- set(SDL_VERSION_DEBIAN "1.2debian")
-- set(USE_PIXMAN ON)
- endif()
-
- if (NOT SDL2_FOUND AND NOT SDL_FOUND)
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/emulators/mgba/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST-main
--- pkg/PLIST-main 19 Jul 2015 21:00:00 -0000 1.1.1.1
+++ pkg/PLIST-main 19 Aug 2015 08:47:05 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2015/07/19 21:00:00 bentley Exp $
@bin bin/mgba
@lib lib/libmgba.so.${LIBmgba_VERSION}
+@man man/man6/mgba.6
share/doc/mGBA/
share/doc/mGBA/CHANGES
share/doc/mGBA/README.md
Index: pkg/PLIST-qt
===================================================================
RCS file: /cvs/ports/emulators/mgba/pkg/PLIST-qt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST-qt
--- pkg/PLIST-qt 19 Jul 2015 21:00:00 -0000 1.1.1.1
+++ pkg/PLIST-qt 19 Aug 2015 08:47:05 -0000
@@ -1,2 +1,17 @@
@comment $OpenBSD: PLIST-qt,v 1.1.1.1 2015/07/19 21:00:00 bentley Exp $
@bin bin/mgba-qt
+@man man/man6/mgba-qt.6
+share/applications/mgba-qt.desktop
+share/icons/hicolor/128x128/apps/mgba.png
+share/icons/hicolor/16x16/apps/mgba.png
+share/icons/hicolor/24x24/apps/mgba.png
+share/icons/hicolor/256x256/apps/mgba.png
+share/icons/hicolor/32x32/apps/mgba.png
+share/icons/hicolor/48x48/apps/mgba.png
+share/icons/hicolor/512x512/apps/mgba.png
+share/icons/hicolor/64x64/apps/mgba.png
+share/icons/hicolor/96x96/apps/mgba.png
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
