graphics/glaxnimate: Update to 0.5.3

- Flavorize to allow building against Qt5 or Qt6
- Application crashes when built with -O2 or greater, so downgrade
  to -O1 for release builds.

PR:		271777

5 files changed, 86 insertions, 40 deletions

diff --git a/graphics/glaxnimate/Makefile b/graphics/glaxnimate/Makefile
index 66b401fee93c..cc8c1bde07ee 100644
--- a/graphics/glaxnimate/Makefile
+++ b/graphics/glaxnimate/Makefile
@@ -1,39 +1,65 @@
 PORTNAME=	glaxnimate
-DISTVERSION=	0.5.1
-PORTREVISION=	2
+DISTVERSION=	0.5.3
 CATEGORIES=	graphics
+PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simple vector animation program
 WWW=		https://glaxnimate.mattbas.org/
 
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/LICENSES/GPL-3.0-or-later.txt
 
 BUILD_DEPENDS=	pip:devel/py-pip@${PY_FLAVOR}
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libpotrace.so:graphics/libpotrace
 
-USES=		cmake compiler:c++17-lang desktop-file-utils gl libarchive python qt:5
-USE_QT=		concurrent core gui network svg xml widgets buildtools:build linguisttools:build qmake:build uitools:build
+FLAVORS=		qt5 qt6
+FLAVOR?=		${FLAVORS:[1]}
+qt5_CONFLICTS_INSTALL=	glaxnimate glaxnimate-qt6
+qt6_CONFLICTS_INSTALL=	glaxnimate glaxnimate-qt5
+
+USES=		cmake compiler:c++17-lang desktop-file-utils gl libarchive \
+		python qt:${FLAVOR:S/qt//}
 USE_GL=		gl
+_USE_QT5=	concurrent core gui network svg xml widgets buildtools:build \
+		linguisttools:build qmake:build uitools:build
+_USE_QT6=	base svg tools
+USE_QT=		${_USE_QT${FLAVOR:S/qt//}}
+
+_CMAKE_ON_qt5=	WITH_QT5
+_CMAKE_ON_qt6=	WITH_QT6
+_CMAKE_OFF_qt5=	WITH_QT6
+_CMAKE_OFF_qt6=	WITH_QT5
+CMAKE_ON=	${_CMAKE_ON_${FLAVOR}}
+CMAKE_OFF=	${_CMAKE_OFF_${FLAVOR}}
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	mattbas
-GL_COMMIT=	91219dc52ca909118e4a756629ea779dde5577c3
+GL_COMMIT=	3090870e9172dfd587e89753c2d4d19e9c083f70
 
-GL_TUPLE=	mattbas:CMake-Lib:8af80b5668dbc6a0210e09a969a1b43fc99f39ba:mattbas_CMake_Lib/cmake \
-		mattbas:Qt-Color-Widgets:091c29463bbeec1a672598af4597055ba24842cd:mattbas_Qt_Color_Widgets/external/Qt-Color-Widgets \
+GL_TUPLE=	mattbas:CMake-Lib:3b445d91fd4620542162f35ccc6bf14533a76321:mattbas_CMake_Lib/cmake \
+		mattbas:Qt-Color-Widgets:621a1a3c336aedc451c1597e66449e239d0aed5e:mattbas_Qt_Color_Widgets/external/Qt-Color-Widgets \
 		mattbas:Qt-History-LineEdit:5b761f436e8b31491e06b26460d28a2eaef0babc:mattbas_Qt_History_LineEdit/external/Qt-History-LineEdit \
 		mattbas:python-lottie:9e742aadb5ca7d0e8c9b01b2553c0a81de238ae4:mattbas_python_lottie/data/lib/python-lottie
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	KDE:breeze-icons:1a13b09adc7ebe0c4b5be6cc1add3869f3de8a1a:KDE_breeze_icons/data/icons/breeze-icons \
-		mbasaglia:pybind11:7b30131fcbbbc227d2afcc969a8aab8c8b792b66:mbasaglia_pybind11/external/QtAppSetup/external/pybind11 \
+		pybind:pybind11:80dc998efced8ceb2be59756668a7e90e8bef917:pybind_pybind11/external/QtAppSetup/external/pybind11 \
 		rpavlik/cmake-modules:c97690cc0024a1842cd8de71334a2ee9c5f7e729:rpavlik_cmake_modules/external/cmake-modules
 
 CMAKE_ARGS=	-DPython3_EXECUTABLE=${PYTHON_CMD}
 
 ALL_TARGET=	all translations
 
+OPTIONS_DEFINE=	DEBUG
+
+DEBUG_VARS=	WITH_DEBUG=yes
+
+.include <bsd.port.options.mk>
+
+.if !${PORT_OPTIONS:MDEBUG}
+CXXFLAGS:=	${CXXFLAGS:C/-O([2-9]|[sz]|fast)/-O1/} -fstack-protector-strong -fno-strict-aliasing
+.endif
+
 .include <bsd.port.mk>
diff --git a/graphics/glaxnimate/distinfo b/graphics/glaxnimate/distinfo
index 2f3dccc99208..c11e1f0f492c 100644
--- a/graphics/glaxnimate/distinfo
+++ b/graphics/glaxnimate/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1665476418
+TIMESTAMP = 1685637754
 SHA256 (KDE-breeze-icons-1a13b09adc7ebe0c4b5be6cc1add3869f3de8a1a_GH0.tar.gz) = 5d7d4437bb0c87ac5573b9ae05328379bbaf6229818579456ee7b2ec1a827a37
 SIZE (KDE-breeze-icons-1a13b09adc7ebe0c4b5be6cc1add3869f3de8a1a_GH0.tar.gz) = 5573747
-SHA256 (mbasaglia-pybind11-7b30131fcbbbc227d2afcc969a8aab8c8b792b66_GH0.tar.gz) = b2568d046d2527a4d2bd22383f1d7853662492666994e20db16f70fcf578f87f
-SIZE (mbasaglia-pybind11-7b30131fcbbbc227d2afcc969a8aab8c8b792b66_GH0.tar.gz) = 702926
-SHA256 (mattbas-glaxnimate-91219dc52ca909118e4a756629ea779dde5577c3_GL0.tar.gz) = f23c67f64fe8be6f7d61a414ec72e0e57fa72cfb0aa160c7d86a29343fe84a83
-SIZE (mattbas-glaxnimate-91219dc52ca909118e4a756629ea779dde5577c3_GL0.tar.gz) = 4933409
-SHA256 (mattbas-CMake-Lib-8af80b5668dbc6a0210e09a969a1b43fc99f39ba_GL0.tar.gz) = ef7a6a963b6117f161a41b34d8c2488b030c953bc4de935d8d4c9fa28114ed57
-SIZE (mattbas-CMake-Lib-8af80b5668dbc6a0210e09a969a1b43fc99f39ba_GL0.tar.gz) = 9463
-SHA256 (mattbas-Qt-Color-Widgets-091c29463bbeec1a672598af4597055ba24842cd_GL0.tar.gz) = 6e2e36ebbdad9d7c89d7d5abb59bee4374b25cceeae1ec3353d3814b8a6b6ab9
-SIZE (mattbas-Qt-Color-Widgets-091c29463bbeec1a672598af4597055ba24842cd_GL0.tar.gz) = 207734
+SHA256 (pybind-pybind11-80dc998efced8ceb2be59756668a7e90e8bef917_GH0.tar.gz) = aa4d57f8c3c4fb47d75e1d676167966a8aa7cbb014e4d20813adabc93bd6670a
+SIZE (pybind-pybind11-80dc998efced8ceb2be59756668a7e90e8bef917_GH0.tar.gz) = 728381
+SHA256 (mattbas-glaxnimate-3090870e9172dfd587e89753c2d4d19e9c083f70_GL0.tar.gz) = 19e4bc10c2294711836cc8aabec8fad892b2305b9fb93080def8d1028b430c5d
+SIZE (mattbas-glaxnimate-3090870e9172dfd587e89753c2d4d19e9c083f70_GL0.tar.gz) = 8144306
+SHA256 (mattbas-CMake-Lib-3b445d91fd4620542162f35ccc6bf14533a76321_GL0.tar.gz) = 19adf91e1316bdd2a7400f71854264a5459adc695bbd56cfc832f13e4234f0ed
+SIZE (mattbas-CMake-Lib-3b445d91fd4620542162f35ccc6bf14533a76321_GL0.tar.gz) = 9483
+SHA256 (mattbas-Qt-Color-Widgets-621a1a3c336aedc451c1597e66449e239d0aed5e_GL0.tar.gz) = ef925058537557cc451b4406d6c63ff2c4034affa4a172b4d15685a5932e142c
+SIZE (mattbas-Qt-Color-Widgets-621a1a3c336aedc451c1597e66449e239d0aed5e_GL0.tar.gz) = 207779
 SHA256 (mattbas-Qt-History-LineEdit-5b761f436e8b31491e06b26460d28a2eaef0babc_GL0.tar.gz) = 00e63231f41f8f0c9274990c6d1fb394ffa7e7bc72c673defeb87479c2110ca9
 SIZE (mattbas-Qt-History-LineEdit-5b761f436e8b31491e06b26460d28a2eaef0babc_GL0.tar.gz) = 7856
 SHA256 (mattbas-python-lottie-9e742aadb5ca7d0e8c9b01b2553c0a81de238ae4_GL0.tar.gz) = 54de1e9507524d83d4035ac3a16bd29c40335c6f9eb0a8b6376c3a10267e1a56
diff --git a/graphics/glaxnimate/files/patch-CMakeLists.txt b/graphics/glaxnimate/files/patch-CMakeLists.txt
index 0bbccf693e68..7f955177a821 100644
--- a/graphics/glaxnimate/files/patch-CMakeLists.txt
+++ b/graphics/glaxnimate/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2022-09-11 09:38:36 UTC
+--- CMakeLists.txt.orig	2023-03-08 16:08:22 UTC
 +++ CMakeLists.txt
-@@ -29,7 +29,7 @@ set(PROJECT_MANINTAINER "${PROJECT_MANINTAINER_NAME} <
+@@ -30,7 +30,7 @@ include(misc)
  # CMake modules
  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/external/cmake-modules")
  include(misc)
@@ -9,7 +9,7 @@
  
  # C++
  set(CMAKE_CXX_STANDARD 17)
-@@ -39,14 +39,14 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+@@ -40,14 +40,14 @@ set(VERSION_SUFFIX "-git-" CACHE STRING "")
  set(VERSION_NAKED ${PROJECT_VERSION})
  set(VERSION_SUFFIX "-git-" CACHE STRING "")
  
@@ -27,3 +27,21 @@
      set(PROJECT_VERSION "${PROJECT_VERSION}+${VERSION_SUFFIX}")
  endif()
  
+@@ -90,8 +90,15 @@ endif()
+ 
+ # Qt
+ #find_package(Qt5Qml QUIET)
+-set(QT_VERSION_MAJOR 5)
+-find_package(QT NAMES Qt5 Qt6 COMPONENTS Core QUIET)
++option(WITH_QT5 "Build against Qt5" ON)
++option(WITH_QT6 "Build against Qt6" OFF)
++if ( WITH_QT5 )
++    set(QT_VERSION_MAJOR 5)
++endif()
++if ( WITH_QT6 )
++    set(QT_VERSION_MAJOR 6)
++endif()
++find_package(QT NAMES Qt${QT_VERSION_MAJOR} COMPONENTS Core QUIET)
+ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Widgets Xml UiTools Concurrent Network Svg REQUIRED)
+ message(STATUS "Using Qt ${QT_VERSION_MAJOR}")
+ 
diff --git a/graphics/glaxnimate/files/patch-src_gui_emoji_emoji__set__dialog.cpp b/graphics/glaxnimate/files/patch-src_gui_emoji_emoji__set__dialog.cpp
deleted file mode 100644
index dcfcd15353c9..000000000000
--- a/graphics/glaxnimate/files/patch-src_gui_emoji_emoji__set__dialog.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-- workaround for https://gitlab.com/mattbas/glaxnimate/-/issues/486
-
---- src/gui/emoji/emoji_set_dialog.cpp.orig	2022-04-19 03:42:34 UTC
-+++ src/gui/emoji/emoji_set_dialog.cpp
-@@ -16,6 +16,8 @@
- #include "glaxnimate_app.hpp"
- #include "emoji_dialog.hpp"
- 
-+#include <array>
-+
- class glaxnimate::emoji::EmojiSetDialog::Private
- {
- public:
diff --git a/graphics/glaxnimate/pkg-plist b/graphics/glaxnimate/pkg-plist
index 3f67f098fb63..808795339b12 100644
--- a/graphics/glaxnimate/pkg-plist
+++ b/graphics/glaxnimate/pkg-plist
@@ -1,5 +1,6 @@
 bin/glaxnimate
-share/applications/glaxnimate.desktop
+share/applications/org.mattbas.Glaxnimate.desktop
+%%DATADIR%%/glaxnimate/AUTHORS.md
 %%DATADIR%%/glaxnimate/emoji/sets.json
 %%DATADIR%%/glaxnimate/glaxnimate.desktop
 %%DATADIR%%/glaxnimate/icons/icons-dark/.gitignore
@@ -7509,7 +7510,7 @@ share/applications/glaxnimate.desktop
 %%DATADIR%%/glaxnimate/icons/icons-dark/preferences/32/preferences-log.svg
 %%DATADIR%%/glaxnimate/icons/icons-dark/preferences/32/preferences-other.svg
 %%DATADIR%%/glaxnimate/icons/icons-dark/preferences/32/preferences-plugin.svg
-%%DATADIR%%/glaxnimate/icons/icons-dark/preferences/32/preferences-%%CMAKE_BUILD_TYPE%%notes.svg
+%%DATADIR%%/glaxnimate/icons/icons-dark/preferences/32/preferences-releasenotes.svg
 %%DATADIR%%/glaxnimate/icons/icons-dark/preferences/32/preferences-security-apparmor.svg
 %%DATADIR%%/glaxnimate/icons/icons-dark/preferences/32/preferences-security-firewall.svg
 %%DATADIR%%/glaxnimate/icons/icons-dark/preferences/32/preferences-security-kerberos.svg
@@ -7621,7 +7622,7 @@ share/applications/glaxnimate.desktop
 %%DATADIR%%/glaxnimate/icons/icons-dark/preferences/32/yast-ntp-client.svg
 %%DATADIR%%/glaxnimate/icons/icons-dark/preferences/32/yast-printer.svg
 %%DATADIR%%/glaxnimate/icons/icons-dark/preferences/32/yast-proxy.svg
-%%DATADIR%%/glaxnimate/icons/icons-dark/preferences/32/yast-%%CMAKE_BUILD_TYPE%%-notes.svg
+%%DATADIR%%/glaxnimate/icons/icons-dark/preferences/32/yast-release-notes.svg
 %%DATADIR%%/glaxnimate/icons/icons-dark/preferences/32/yast-remote.svg
 %%DATADIR%%/glaxnimate/icons/icons-dark/preferences/32/yast-samba-client.svg
 %%DATADIR%%/glaxnimate/icons/icons-dark/preferences/32/yast-samba-server.svg
@@ -15582,7 +15583,7 @@ share/applications/glaxnimate.desktop
 %%DATADIR%%/glaxnimate/icons/icons/preferences/32/preferences-log.svg
 %%DATADIR%%/glaxnimate/icons/icons/preferences/32/preferences-other.svg
 %%DATADIR%%/glaxnimate/icons/icons/preferences/32/preferences-plugin.svg
-%%DATADIR%%/glaxnimate/icons/icons/preferences/32/preferences-%%CMAKE_BUILD_TYPE%%notes.svg
+%%DATADIR%%/glaxnimate/icons/icons/preferences/32/preferences-releasenotes.svg
 %%DATADIR%%/glaxnimate/icons/icons/preferences/32/preferences-security-apparmor.svg
 %%DATADIR%%/glaxnimate/icons/icons/preferences/32/preferences-security-firewall.svg
 %%DATADIR%%/glaxnimate/icons/icons/preferences/32/preferences-security-kerberos.svg
@@ -15694,7 +15695,7 @@ share/applications/glaxnimate.desktop
 %%DATADIR%%/glaxnimate/icons/icons/preferences/32/yast-ntp-client.svg
 %%DATADIR%%/glaxnimate/icons/icons/preferences/32/yast-printer.svg
 %%DATADIR%%/glaxnimate/icons/icons/preferences/32/yast-proxy.svg
-%%DATADIR%%/glaxnimate/icons/icons/preferences/32/yast-%%CMAKE_BUILD_TYPE%%-notes.svg
+%%DATADIR%%/glaxnimate/icons/icons/preferences/32/yast-release-notes.svg
 %%DATADIR%%/glaxnimate/icons/icons/preferences/32/yast-remote.svg
 %%DATADIR%%/glaxnimate/icons/icons/preferences/32/yast-samba-client.svg
 %%DATADIR%%/glaxnimate/icons/icons/preferences/32/yast-samba-server.svg
@@ -16129,16 +16130,20 @@ share/applications/glaxnimate.desktop
 %%DATADIR%%/glaxnimate/images/icons/keyframe-record.svg
 %%DATADIR%%/glaxnimate/images/icons/keyframe-remove.svg
 %%DATADIR%%/glaxnimate/images/icons/lottiefiles.svg
+%%DATADIR%%/glaxnimate/images/icons/paint-gradient-conical.svg
 %%DATADIR%%/glaxnimate/images/keyframe/custom.svg
 %%DATADIR%%/glaxnimate/images/keyframe/ease.svg
+%%DATADIR%%/glaxnimate/images/keyframe/fast.svg
 %%DATADIR%%/glaxnimate/images/keyframe/finish/custom.svg
 %%DATADIR%%/glaxnimate/images/keyframe/finish/ease.svg
+%%DATADIR%%/glaxnimate/images/keyframe/finish/fast.svg
 %%DATADIR%%/glaxnimate/images/keyframe/finish/hold.svg
 %%DATADIR%%/glaxnimate/images/keyframe/finish/linear.svg
 %%DATADIR%%/glaxnimate/images/keyframe/hold.svg
 %%DATADIR%%/glaxnimate/images/keyframe/linear.svg
 %%DATADIR%%/glaxnimate/images/keyframe/start/custom.svg
 %%DATADIR%%/glaxnimate/images/keyframe/start/ease.svg
+%%DATADIR%%/glaxnimate/images/keyframe/start/fast.svg
 %%DATADIR%%/glaxnimate/images/keyframe/start/hold.svg
 %%DATADIR%%/glaxnimate/images/keyframe/start/linear.svg
 %%DATADIR%%/glaxnimate/images/keyframe/status/key.svg
@@ -16258,5 +16263,15 @@ share/applications/glaxnimate.desktop
 %%DATADIR%%/glaxnimate/templates/Telegram_Sticker_60.rawr
 %%DATADIR%%/glaxnimate/themes/dark.ini
 %%DATADIR%%/glaxnimate/themes/light.ini
+%%DATADIR%%/glaxnimate/translations/glaxnimate_de.qm
+%%DATADIR%%/glaxnimate/translations/glaxnimate_en_GB.qm
+%%DATADIR%%/glaxnimate/translations/glaxnimate_en_US.qm
+%%DATADIR%%/glaxnimate/translations/glaxnimate_es.qm
+%%DATADIR%%/glaxnimate/translations/glaxnimate_fr.qm
+%%DATADIR%%/glaxnimate/translations/glaxnimate_it.qm
+%%DATADIR%%/glaxnimate/translations/glaxnimate_zh_CN.qm
 share/icons/hicolor/512x512/apps/glaxnimate.png
+share/icons/hicolor/512x512/apps/org.mattbas.Glaxnimate.png
 share/icons/hicolor/scalable/apps/glaxnimate.svg
+share/icons/hicolor/scalable/apps/org.mattbas.Glaxnimate.svg
+share/metainfo/org.mattbas.Glaxnimate.metainfo.xml