From b12e2f3c9f5ccacec6eaf833e3c74c7b22d47de4 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sun, 2 Jun 2024 16:02:49 +0200
Subject: [PATCH] j4-dmenu-desktop: update to 3.0, adopt.

---
 .../j4-dmenu-desktop/patches/new-catch2.patch | 110 ------------------
 srcpkgs/j4-dmenu-desktop/template             |  28 ++---
 2 files changed, 12 insertions(+), 126 deletions(-)
 delete mode 100644 srcpkgs/j4-dmenu-desktop/patches/new-catch2.patch

diff --git a/srcpkgs/j4-dmenu-desktop/patches/new-catch2.patch b/srcpkgs/j4-dmenu-desktop/patches/new-catch2.patch
deleted file mode 100644
index 618a82fad977a0..00000000000000
--- a/srcpkgs/j4-dmenu-desktop/patches/new-catch2.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,18 +5,14 @@ project(j4-dmenu)
- option(WITH_TESTS "Build and run tests" ON)
- option(WITH_GIT_CATCH "Use a Git checkout of Catch to build the tests" ON)
- 
--if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7")
--  set(CXX_OPT "-std=c++0x")
--else()
--  set(CXX_OPT "-std=c++11")
--endif()
--
-+set(CMAKE_CXX_STANDARD 11)
- # _WITH_GETLINE for FreeBSD
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_OPT} -Wall -Wextra -pedantic -O2 -D_WITH_GETLINE")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
- 
- if(WITH_TESTS)
-   enable_testing(true)
-+  find_package(Catch2)
-   add_test(
-           NAME j4-dmenu-tests
-           COMMAND j4-dmenu-tests
-@@ -25,6 +21,8 @@ if(WITH_TESTS)
-           j4-dmenu-tests
-           src/Test.cc
-   )
-+  set_property(TARGET j4-dmenu-tests PROPERTY CXX_STANDARD 17)
-+  target_link_libraries(j4-dmenu-tests Catch2::Catch2WithMain)
-   add_definitions(-DTEST_FILES="${CMAKE_CURRENT_SOURCE_DIR}/test_files/")
- 
-   if(WITH_GIT_CATCH)
---- a/src/Test.cc
-+++ b/src/Test.cc
-@@ -1,8 +1,7 @@
- 
- //#include "Application.hh"
- 
--#define CATCH_CONFIG_MAIN
--#include "catch.hpp"
-+#include "catch2/catch_all.hpp"
- 
- static const std::string test_files = TEST_FILES;
- 
---- a/src/TestApplication.cc
-+++ b/src/TestApplication.cc
-@@ -5,7 +5,7 @@
- 
- #include "Application.hh"
- #include "LocaleSuffixes.hh"
--#include "catch.hpp"
-+#include "catch2/catch_all.hpp"
- 
- TEST_CASE("Application/invalid_file", "")
- {
---- a/src/TestApplicationRunner.cc
-+++ b/src/TestApplicationRunner.cc
-@@ -3,7 +3,7 @@
- #include "Application.hh"
- #include "ApplicationRunner.hh"
- #include "LocaleSuffixes.hh"
--#include "catch.hpp"
-+#include "catch2/catch_all.hpp"
- 
- TEST_CASE("ApplicationRunner/escape", "Regression test for issue #18, %c was not escaped")
- {
---- a/src/TestFileFinder.cc
-+++ b/src/TestFileFinder.cc
-@@ -3,7 +3,7 @@
- #include <vector>
- 
- #include "FileFinder.hh"
--#include "catch.hpp"
-+#include "catch2/catch_all.hpp"
- 
- std::vector<std::string> ff2l(FileFinder &ff)
- {
---- a/src/TestFormatters.cc
-+++ b/src/TestFormatters.cc
-@@ -3,7 +3,7 @@
- #include <stdlib.h>
- #include <string>
- 
--#include "catch.hpp"
-+#include "catch2/catch_all.hpp"
- 
- #include "Application.hh"
- #include "LocaleSuffixes.hh"
---- a/src/TestLocaleSuffixes.cc
-+++ b/src/TestLocaleSuffixes.cc
-@@ -1,7 +1,7 @@
- #include <string.h>
- 
- #include "LocaleSuffixes.hh"
--#include "catch.hpp"
-+#include "catch2/catch_all.hpp"
- 
- TEST_CASE("LocaleSuffixes/with_encoding", "")
- {
---- a/src/TestSearchPath.cc
-+++ b/src/TestSearchPath.cc
-@@ -5,7 +5,7 @@
- #include <vector>
- 
- #include "SearchPath.hh"
--#include "catch.hpp"
-+#include "catch2/catch_all.hpp"
- 
- TEST_CASE("SearchPath/XDG_DATA_HOME", "Check SearchPath honors XDG_DATA_HOME")
- {
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 38f842eb0f5f6b..4e663886fa8f21 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,23 +1,19 @@
 # Template file for 'j4-dmenu-desktop'
 pkgname=j4-dmenu-desktop
-version=2.18
-revision=3
-build_style=cmake
-configure_args="-DWITH_GIT_CATCH=OFF
- -DCATCH_INCLUDE_DIR=$XBPS_CROSS_BASE/usr/include/catch2"
-# The current version (2.18) needs to have /usr/share/applications dir
-# for tests, xterm creates and populates it with its .desktop files,
-# which fixes tests in case the dir does not exist.
-# https://github.com/enkore/j4-dmenu-desktop/pull/123
-makedepends="catch2"
-checkdepends="xterm"
+version=3.0
+revision=1
+build_style=meson
+configure_args="-Denable-tests=false"
+hostmakedepends="pkg-config"
+makedepends="spdlog fmt-devel"
+checkdepends="catch2"
 short_desc="Fast desktop menu"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="meator <meator.dev@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/enkore/j4-dmenu-desktop"
 distfiles="https://github.com/enkore/j4-dmenu-desktop/archive/r${version}.tar.gz"
-checksum=77c5605d0c1291bcf1e13b186ea3b32ddf4753de0d0e39127b4a7d2098393e25
+checksum=09f7ddd9736872871f1ed1c788880cd8da7387dd79cd271f7387a63e96bd2f92
 
-post_install() {
-	vman j4-dmenu-desktop.1
-}
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -Denable-tests=true"
+fi