git: 9f2b7df95721 - main - games/solarus-quest-editor: Update to 2.0.0

From: Danilo Egea Gondolfo <danilo_at_FreeBSD.org>
Date: Tue, 29 Apr 2025 22:09:41 UTC
The branch main has been updated by danilo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9f2b7df957211c642148ec8dbd5a66457f56cab1

commit 9f2b7df957211c642148ec8dbd5a66457f56cab1
Author:     Danilo Egea Gondolfo <danilo@FreeBSD.org>
AuthorDate: 2025-04-29 15:47:20 +0000
Commit:     Danilo Egea Gondolfo <danilo@FreeBSD.org>
CommitDate: 2025-04-29 22:09:28 +0000

    games/solarus-quest-editor: Update to 2.0.0
    
    - Move to QT6 as recommended by the upstream project
    - Reorder some variables to make portclippy happy
    
    Changelog:
    https://gitlab.com/solarus-games/solarus/-/blob/v2.0/editor/changelog.md
---
 games/solarus-quest-editor/Makefile                | 29 ++++++++++++++--------
 games/solarus-quest-editor/distinfo                |  6 ++---
 .../files/patch-src_widgets_map__view.cpp          | 10 --------
 .../files/patch-src_widgets_tileset__view.cpp      | 10 --------
 games/solarus-quest-editor/pkg-plist               | 25 +++++++++++--------
 5 files changed, 35 insertions(+), 45 deletions(-)

diff --git a/games/solarus-quest-editor/Makefile b/games/solarus-quest-editor/Makefile
index ec8a737c4cc4..51a7465df69d 100644
--- a/games/solarus-quest-editor/Makefile
+++ b/games/solarus-quest-editor/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	solarus-quest-editor
-PORTVERSION=	1.6.5
+PORTVERSION=	2.0.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
@@ -10,22 +10,32 @@ WWW=		https://www.solarus-games.org
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/license_gpl.txt
 
+BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm
 LIB_DEPENDS=	libphysfs.so:devel/physfs \
 		libmodplug.so:audio/libmodplug \
-		libvorbis.so:audio/libvorbis \
+		libvorbisfile.so:audio/libvorbis \
 		libogg.so:audio/libogg \
 		libsolarus.so:games/solarus \
+		libqlementine.so:devel/qlementine
 
-BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm
-
-USES=		cmake compiler:c++11-lib openal qt:5 sdl
+USES=		cmake compiler:c++11-lib gl localbase:ldflags openal qt:6 sdl
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	solarus-games
-GL_TAGNAME=	c8d0835c3a62a0e60cdb32d26be8b75485a23a96
+GL_PROJECT=	solarus
+GL_TAGNAME=	b5d6aefbda31e0f436d25606478c4129504f914f
 
+USE_GL=		opengl
+USE_QT=		base svg
 USE_SDL=	sdl2 ttf2 image2
-USE_QT=		buildtools:build concurrent core gui linguist qmake:build widgets
+
+CMAKE_ARGS+=	-DSOLARUS_FETCHCONTENT=OFF
+
+DESKTOP_ENTRIES=	"Solarus Quest Editor" "${COMMENT}" \
+			"${PREFIX}/share/pixmaps/org.solarus-games.solarus-editor.png" \
+			"solarus-editor" "Game;" false
+
+WRKSRC_SUBDIR=	editor
 
 OPTIONS_DEFINE=	LUAJIT
 OPTIONS_DEFAULT_amd64=	LUAJIT
@@ -34,12 +44,9 @@ OPTIONS_DEFAULT_powerpc=	LUAJIT
 OPTIONS_DEFAULT_powerpc64=	LUAJIT
 OPTIONS_DEFAULT_powerpc64le=	LUAJIT
 
-LUAJIT_CMAKE_BOOL=	SOLARUS_USE_LUAJIT
 LUAJIT_DESC=	Use LuaJIT instead of standard Lua
 LUAJIT_USES=	luajit
 LUAJIT_USES_OFF=	lua:51
-
-DESKTOP_ENTRIES=	"Solarus Quest Editor" "${COMMENT}" "${PORTNAME}" "${PORTNAME}"  \
-			"Game;" false
+LUAJIT_CMAKE_BOOL=	SOLARUS_USE_LUAJIT
 
 .include <bsd.port.mk>
diff --git a/games/solarus-quest-editor/distinfo b/games/solarus-quest-editor/distinfo
index b3a180ee5ce9..d14f759d328e 100644
--- a/games/solarus-quest-editor/distinfo
+++ b/games/solarus-quest-editor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1673303232
-SHA256 (solarus-games-solarus-quest-editor-c8d0835c3a62a0e60cdb32d26be8b75485a23a96_GL0.tar.gz) = 74d619f39d1181752eeab5f7ac12fd003eda74d1299dac57722165c980ffd372
-SIZE (solarus-games-solarus-quest-editor-c8d0835c3a62a0e60cdb32d26be8b75485a23a96_GL0.tar.gz) = 58067507
+TIMESTAMP = 1745915901
+SHA256 (solarus-games-solarus-b5d6aefbda31e0f436d25606478c4129504f914f_GL0.tar.gz) = d86397e94926d96a7f8ca343122cb40df0614c6fd24717423950055c2b5bd55c
+SIZE (solarus-games-solarus-b5d6aefbda31e0f436d25606478c4129504f914f_GL0.tar.gz) = 69945076
diff --git a/games/solarus-quest-editor/files/patch-src_widgets_map__view.cpp b/games/solarus-quest-editor/files/patch-src_widgets_map__view.cpp
deleted file mode 100644
index 0b314f4dbb3e..000000000000
--- a/games/solarus-quest-editor/files/patch-src_widgets_map__view.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/widgets/map_view.cpp.orig	2020-05-21 09:50:59 UTC
-+++ src/widgets/map_view.cpp
-@@ -40,6 +40,7 @@
- #include <QMouseEvent>
- #include <QScrollBar>
- #include <QtMath>
-+#include <QPainterPath>
- 
- namespace SolarusEditor {
- 
diff --git a/games/solarus-quest-editor/files/patch-src_widgets_tileset__view.cpp b/games/solarus-quest-editor/files/patch-src_widgets_tileset__view.cpp
deleted file mode 100644
index 18a931d99ff8..000000000000
--- a/games/solarus-quest-editor/files/patch-src_widgets_tileset__view.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/widgets/tileset_view.cpp.orig	2020-05-21 09:50:59 UTC
-+++ src/widgets/tileset_view.cpp
-@@ -34,6 +34,7 @@
- #include <QMimeData>
- #include <QMouseEvent>
- #include <QScrollBar>
-+#include <QPainterPath>
- 
- namespace SolarusEditor {
- 
diff --git a/games/solarus-quest-editor/pkg-plist b/games/solarus-quest-editor/pkg-plist
index ed274baabbc0..92323b001ee0 100644
--- a/games/solarus-quest-editor/pkg-plist
+++ b/games/solarus-quest-editor/pkg-plist
@@ -1,14 +1,14 @@
-bin/solarus-quest-editor
-share/applications/solarus-quest-editor.desktop
-share/icons/hicolor/16x16/apps/solarus-quest-editor.png
-share/icons/hicolor/20x20/apps/solarus-quest-editor.png
-share/icons/hicolor/24x24/apps/solarus-quest-editor.png
-share/icons/hicolor/32x32/apps/solarus-quest-editor.png
-share/icons/hicolor/40x40/apps/solarus-quest-editor.png
-share/icons/hicolor/48x48/apps/solarus-quest-editor.png
-share/icons/hicolor/scalable/apps/solarus-quest-editor.svg
-share/icons/hicolor/symbolic/apps/solarus-quest-editor-symbolic.svg
-share/pixmaps/solarus-quest-editor.png
+bin/solarus-editor
+share/applications/org.solarus-games.solarus-editor.desktop
+share/icons/hicolor/16x16/apps/org.solarus-games.solarus-editor.png
+share/icons/hicolor/20x20/apps/org.solarus-games.solarus-editor.png
+share/icons/hicolor/24x24/apps/org.solarus-games.solarus-editor.png
+share/icons/hicolor/32x32/apps/org.solarus-games.solarus-editor.png
+share/icons/hicolor/40x40/apps/org.solarus-games.solarus-editor.png
+share/icons/hicolor/48x48/apps/org.solarus-games.solarus-editor.png
+share/icons/hicolor/scalable/apps/org.solarus-games.solarus-editor.svg
+share/icons/hicolor/symbolic/apps/org.solarus-games.solarus-editor-symbolic.svg
+share/pixmaps/org.solarus-games.solarus-editor.png
 %%DATADIR%%/assets/initial_quest/data/enemies/chameleon.lua
 %%DATADIR%%/assets/initial_quest/data/enemies/explosion.lua
 %%DATADIR%%/assets/initial_quest/data/enemies/flame.lua
@@ -252,6 +252,7 @@ share/pixmaps/solarus-quest-editor.png
 %%DATADIR%%/assets/initial_quest/data/sprites/destructibles/stone_white.dat
 %%DATADIR%%/assets/initial_quest/data/sprites/destructibles/vase.dat
 %%DATADIR%%/assets/initial_quest/data/sprites/destructibles/vase.png
+%%DATADIR%%/assets/initial_quest/data/sprites/destructibles/vase_broken.png
 %%DATADIR%%/assets/initial_quest/data/sprites/doors/door.png
 %%DATADIR%%/assets/initial_quest/data/sprites/doors/door_big_key.dat
 %%DATADIR%%/assets/initial_quest/data/sprites/doors/door_boss_key.dat
@@ -519,3 +520,5 @@ share/pixmaps/solarus-quest-editor.png
 %%DATADIR%%/assets/initial_quest/data/tilesets/outside.tiles.png
 %%DATADIR%%/translations/solarus_editor_es.qm
 %%DATADIR%%/translations/solarus_editor_fr.qm
+%%DATADIR%%/translations/solarus_editor_zh_CN.qm
+%%DATADIR%%/translations/solarus_editor_zh_TW.qm