mgba: fix libzip detection

Remove non-existent patch from distinfo.

Bump PKGREVISION.

3 files changed, 31 insertions, 11 deletions

diff --git a/emulators/mgba/Makefile b/emulators/mgba/Makefile
index cfb76d60dce..5df679af11b 100644
--- a/emulators/mgba/Makefile
+++ b/emulators/mgba/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2020/06/22 09:57:18 nia Exp $
+# $NetBSD: Makefile,v 1.17 2020/06/22 19:04:58 wiz Exp $
 
 DISTNAME=	mgba-0.8.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mgba-emu/}
 
@@ -18,10 +18,9 @@ USE_LANGUAGES=	c c++
 GCC_REQD+=	5
 
 CMAKE_ARGS+=	-DUSE_DISCORD_RPC=OFF
-CMAKE_ARGS+=	-DUSE_LIBZIP=OFF # using minizip
 
 .include "options.mk"
-.include "../../archivers/minizip/buildlink3.mk"
+.include "../../archivers/libzip/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/libelf/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/emulators/mgba/distinfo b/emulators/mgba/distinfo
index 18f54f4a885..e264855f831 100644
--- a/emulators/mgba/distinfo
+++ b/emulators/mgba/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.7 2020/06/19 13:06:35 nia Exp $
+$NetBSD: distinfo,v 1.8 2020/06/22 19:04:58 wiz Exp $
 
 SHA1 (mgba-0.8.2.tar.gz) = 170597b9be302b942ec04e7cb2d8a24c8298c87f
 RMD160 (mgba-0.8.2.tar.gz) = 5c964dc3ef92e470c914f6a3939b343ee149c40a
 SHA512 (mgba-0.8.2.tar.gz) = 181abab9e94964e2027cb039ded6128af1364e1442c418b8703263c9e0c5befeb7aca4d925fb44f3e25e8711a2cc22b198ea00483c42aea3b1c7ba077223d426
 Size (mgba-0.8.2.tar.gz) = 12014352 bytes
-SHA1 (patch-CMakeLists.txt) = 025f67fa8cabfcbb7a2e1761e3352f23df5068f8
+SHA1 (patch-CMakeLists.txt) = d6dbf612caae3bf6686274a39672f13ef6f4064d
 SHA1 (patch-include_mgba-util_math.h) = 448ca1bb3bbe2812e7d9482917c488ddcf3b48f0
 SHA1 (patch-include_mgba-util_platform_posix_threading.h) = deabb02eda72a4682ad84f263982eb6f8db4699b
 SHA1 (patch-src_platform_qt_CMakeLists.txt) = e8adb538c1319d6a5c380aa091aa3b10e3ed29e7
-SHA1 (patch-src_platform_qt_Display.cpp) = 5cb9049b1d1dbf4652a579534bc6577908a552ca
 SHA1 (patch-version.cmake) = 7d6d44febe7bb0ff2231452f037def7cb3782e21
diff --git a/emulators/mgba/patches/patch-CMakeLists.txt b/emulators/mgba/patches/patch-CMakeLists.txt
index a6e06106a59..dbd9f10a6b5 100644
--- a/emulators/mgba/patches/patch-CMakeLists.txt
+++ b/emulators/mgba/patches/patch-CMakeLists.txt
@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2019/09/25 08:48:43 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2020/06/22 19:04:58 wiz Exp $
 
 Fix locale detection.
 
---- CMakeLists.txt.orig	2019-09-15 23:08:33.000000000 +0000
+--- CMakeLists.txt.orig	2020-06-15 02:50:34.000000000 +0000
 +++ CMakeLists.txt
-@@ -390,7 +390,9 @@ if(HAVE_LOCALTIME_R)
+@@ -360,7 +360,9 @@ if(HAVE_LOCALTIME_R)
  	list(APPEND FUNCTION_DEFINES HAVE_LOCALTIME_R)
  endif()
  
@@ -15,7 +15,29 @@ Fix locale detection.
  	list(APPEND FUNCTION_DEFINES HAVE_LOCALE)
  	if (HAVE_SNPRINTF_L)
  		list(APPEND FUNCTION_DEFINES HAVE_SNPRINTF_L)
-@@ -1037,9 +1039,6 @@ endif()
+@@ -609,19 +611,10 @@ if(WANT_SQLITE3 AND NOT USE_SQLITE3)
+ endif()
+ 
+ if(USE_LIBZIP)
+-	include_directories(AFTER ${LIBZIP_INCLUDE_DIRS})
+-	link_directories(${LIBZIP_LIBRARY_DIRS})
+-	list(APPEND DEPENDENCY_LIB ${LIBZIP_LIBRARIES})
+ 	list(APPEND FEATURES LIBZIP)
+ 	list(APPEND VFS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/vfs/vfs-zip.c)
+-	string(REGEX MATCH "^[0-9]+" LIBZIP_VERSION_MAJOR ${libzip_VERSION})
+-	if (LIBZIP_VERSION_MAJOR LESS 1)
+-		set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libzip2")
+-	elseif(LIBZIP_VERSION_MAJOR EQUAL 1)
+-		set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libzip4|libzip5")
+-	else()
+-		message(AUTHOR_WARNING Unknown version of libzip detected: ${libzip_VERSION})
+-	endif()
++	list(APPEND DEPENDENCY_LIB zip)
++	set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libzip4|libzip5")
+ elseif(USE_MINIZIP)
+ 	include_directories(AFTER ${MINIZIP_INCLUDE_DIRS})
+ 	link_directories(${MINIZIP_LIBRARY_DIRS})
+@@ -1025,9 +1018,6 @@ endif()
  
  file(GLOB READMES ${CMAKE_CURRENT_SOURCE_DIR}/README*.md)