From f3fcc41f1df6c8e8e824c76b19eceeceaf77100f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <j@v6e.pt>
Date: Thu, 28 Sep 2023 13:04:53 +0100
Subject: [PATCH] wireshark: Update package to 4.2 branch

Update the package to track the release-4.2 branch,
that will eventually become the 4.2.0 stable release.

Other changes:
- Add new opencore-amr dependency
- Remove patch that was committed upstream
- Add a comment about Lua 5.2 and make CMake option
explicit
- Add new test target dependencies
- Add command to build test-programs required for the test
target
- Install development headers so users can use this package
to develop wireshark plugins
---
 .../0001-cmake-enable-aarch64.patch           | 43 -------------------
 mingw-w64-wireshark/PKGBUILD                  | 24 +++++------
 2 files changed, 12 insertions(+), 55 deletions(-)
 delete mode 100644 mingw-w64-wireshark/0001-cmake-enable-aarch64.patch

diff --git a/mingw-w64-wireshark/0001-cmake-enable-aarch64.patch b/mingw-w64-wireshark/0001-cmake-enable-aarch64.patch
deleted file mode 100644
index dee421178a..0000000000
--- a/mingw-w64-wireshark/0001-cmake-enable-aarch64.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -148,6 +148,8 @@
- 	elseif(WIRESHARK_TARGET_PLATFORM MATCHES "win32")
- 		message(FATAL_ERROR "Deprecated target platform ${WIRESHARK_TARGET_PLATFORM}. See https://gitlab.com/wireshark/wireshark/-/issues/17779 for details.")
- 		set(WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE x86)
-+	elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64")
-+		set(WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE arm64)
- 	else()
- 		message(FATAL_ERROR "Invalid target platform: ${WIRESHARK_TARGET_PLATFORM}")
- 	endif()
---- a/wsutil/CMakeLists.txt
-+++ b/wsutil/CMakeLists.txt
-@@ -190,7 +190,7 @@
- if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
- 	set(COMPILER_CAN_HANDLE_SSE4_2 TRUE)
- 	set(SSE4_2_FLAG "")
--else()
-+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686|x86|x86_64|AMD64")
- 	check_c_compiler_flag(-msse4.2 COMPILER_CAN_HANDLE_SSE4_2)
- 	if(COMPILER_CAN_HANDLE_SSE4_2)
- 		set(SSE4_2_FLAG "-msse4.2")
-@@ -200,11 +200,15 @@
- 			set(SSE4_2_FLAG "-xarch=sse4_2")
- 		endif()
- 	endif()
--	if(SSE4_2_FLAG)
--		message(STATUS "SSE4.2 compiler flag: ${SSE4_2_FLAG}")
--	else()
--		message(STATUS "No SSE4.2 compiler flag enabled")
--	endif()
-+else()
-+	set(COMPILE_CAN_HANDLE_SSE4_2 FALSE)
-+	set(SSE4_2_FLAG "")
-+endif()
-+
-+if(SSE4_2_FLAG)
-+	message(STATUS "SSE4.2 compiler flag: ${SSE4_2_FLAG}")
-+else()
-+	message(STATUS "No SSE4.2 compiler flag enabled")
- endif()
- if(COMPILER_CAN_HANDLE_SSE4_2)
- 	#
diff --git a/mingw-w64-wireshark/PKGBUILD b/mingw-w64-wireshark/PKGBUILD
index 9e6a55a31c..c640cba0c6 100644
--- a/mingw-w64-wireshark/PKGBUILD
+++ b/mingw-w64-wireshark/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Wireshark Core Team <wireshark-dev@wireshark.org>
 
 _realname=wireshark
-_commit=e7d5c49fe1dadfd6393539ba1b4d535087d79abe
+_commit=1c32e4b2521c30f3c2d778d0a489933f7f7bcda1
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=4.1.0rc0.r1576.ge7d5c49fe1
-pkgrel=2
+pkgver=4.2.0rc0.r13.g1c32e4b252
+pkgrel=1
 pkgdesc="Network traffic and protocol analyzer/sniffer (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -27,6 +27,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-bcg729"
          "${MINGW_PACKAGE_PREFIX}-lz4"
          "${MINGW_PACKAGE_PREFIX}-minizip"
          "${MINGW_PACKAGE_PREFIX}-nghttp2"
+         "${MINGW_PACKAGE_PREFIX}-opencore-amr"
          "${MINGW_PACKAGE_PREFIX}-opus"
          "${MINGW_PACKAGE_PREFIX}-pcre2"
          "${MINGW_PACKAGE_PREFIX}-qt6-base"
@@ -44,10 +45,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-python"
              "${MINGW_PACKAGE_PREFIX}-qt6-tools"
              'git')
-source=("${_realname}"::"git+https://gitlab.com/wireshark/wireshark.git#commit=${_commit}"
-        0001-cmake-enable-aarch64.patch)
-sha256sums=('SKIP'
-            '2e8a66163fed0670d83419c16ad301b1e5747f6cfe0422ad9c8ea60347ce9090')
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest"
+              "${MINGW_PACKAGE_PREFIX}-python-pytest-xdist")
+source=("${_realname}"::"git+https://gitlab.com/wireshark/wireshark.git#commit=${_commit}")
+sha256sums=('SKIP')
 
 pkgver() {
   cd "${_realname}"
@@ -55,11 +56,6 @@ pkgver() {
   git describe --long "${_commit}" | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g'
 }
 
-prepare() {
-  cd ${_realname}
-  git apply "${srcdir}/0001-cmake-enable-aarch64.patch"
-}
-
 build() {
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
@@ -79,6 +75,8 @@ build() {
   extra_config+=("-DENABLE_AIRPCAP=OFF")
   # No self-updating, only through pacman.
   extra_config+=("-DENABLE_WINSPARKLE=OFF")
+  # Use Lua 5.1 in repository, don't download Lua 5.2 sources
+  extra_config+=("-DFETCH_lua=OFF")
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     "${MINGW_PREFIX}"/bin/cmake.exe \
@@ -93,6 +91,7 @@ build() {
 check() {
   cd "${srcdir}/build-${MSYSTEM}"
 
+  "${MINGW_PREFIX}"/bin/cmake.exe --build . --target test-programs
   "${MINGW_PREFIX}"/bin/cmake.exe --build . --target test
 }
 
@@ -100,6 +99,7 @@ package() {
   cd "${srcdir}/build-${MSYSTEM}"
 
   DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install .
+  DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install . --component Development
 
   install -Dm644 "${srcdir}/${_realname}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }