From nobody Tue Oct 11 09:03:45 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MmqZn6w5Rz4fJFW; Tue, 11 Oct 2022 09:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MmqZn4v9Xz3M2N; Tue, 11 Oct 2022 09:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665479025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j1UnEb9Lv3uaGXIJb41EYx/cFNCKm72CMjmfOcEXg4I=; b=DBAm4Ew3O83ofXWZcbcKyccN3VBFHT1Z7bQoS7vvCIY8agyA/r7VnrBA0dzAm0HezB8GQO boefvCl0CckEmvtLpiqWsMbDBYXxnnIH6iy31oPVvaNDLT6XaVkbVcDlq4EfNHWoQerxCA 5/ASj8DruwdJcH0hKq+tu3sDxxJ1+RA23EZaNW6cx/eadp+kasHbnFCOkYne72bGOM2vhJ heztBDby3I6fEjMKeiVNNVrD4M8T8hVmQlbDlMzi9hTvwyxkPqI9Xu7BZAp0vZjpnpzcIo iLhPrt79oTSrLKifgXYPYTyqPaX2jKFsx0tcHKgisLN1EcO+d+Tu6S6TROIHMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MmqZn3shLzvPQ; Tue, 11 Oct 2022 09:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29B93js0041031; Tue, 11 Oct 2022 09:03:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29B93jSt041030; Tue, 11 Oct 2022 09:03:45 GMT (envelope-from git) Date: Tue, 11 Oct 2022 09:03:45 GMT Message-Id: <202210110903.29B93jSt041030@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 38121b7d37fc - main - graphics/glaxnimate: Update 0.5.0 -> 0.5.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38121b7d37fc78615f66635589f0afb4aa2c19fe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665479025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j1UnEb9Lv3uaGXIJb41EYx/cFNCKm72CMjmfOcEXg4I=; b=aXZt0zH7MkhRugunBSW9Syxhqt1J8jThLEDCZsuyGPyq7TRPnmPA0Ms+kEo3I5UaoMLqfn jbJAKkjExERbyr5xDTfAhynYlqIxBwgrcYiTfBn9E2dOUW6bacYKHnhl16D5lQB1E2O6Te wCGl/hNrkniUv3TbaTpyK5ejDBiDLrqYR0yoPUbE146GE6ezVIlK30fWTreGW3VvGotSet Rsu1qkoU28nRjWDg9KtORaMZn8VG4lutSkmuqzDaajQYkxLo3JtKVqoJzDkMMWrjL5K413 8S4gqUd3pJxHoueRX37TO/Sq9TAnUIT/FykaFN7dg4aknIpSdbLItiKfhzgCnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665479025; a=rsa-sha256; cv=none; b=eIsnUa5XIsxU+L6cJGjtrYvPKSXpoH4qfeWX1V8dRptVOlNJxCmAXP64WzR9mcU2nyO+mK EE2TjtYgbcZECNf9ub/oerjzEm7jqTdu2ULN7fK9ZsZxFg4U8GPYKMM5l/268Dv6oct5H1 Nnr4mrkn4fZVkmtKzq30uzH6O47ZofX2ue06AkdXynuYt8zoHIF/bwUae3Lx8Uo8Diuqqq 2QW230EgRxv8YXhu8CErGHJZfoLLiOWuhe3a43z1pdcqzBxt8GVkpOMY6Ha0E1WF7h6XyG azvTdVH4iYxZY+2Kp/ZTrGO9YRlkUMyJhi/x0HCnnqZ/xcmiAlp0XSLzrw41ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=38121b7d37fc78615f66635589f0afb4aa2c19fe commit 38121b7d37fc78615f66635589f0afb4aa2c19fe Author: Yuri Victorovich AuthorDate: 2022-10-11 09:03:12 +0000 Commit: Yuri Victorovich CommitDate: 2022-10-11 09:03:40 +0000 graphics/glaxnimate: Update 0.5.0 -> 0.5.1 --- graphics/glaxnimate/Makefile | 17 ++++++++--------- graphics/glaxnimate/distinfo | 18 +++++++++--------- graphics/glaxnimate/files/patch-CMakeLists.txt | 21 +++++++++++++++------ .../glaxnimate/files/patch-src_core_utils_gzip.cpp | 11 ----------- graphics/glaxnimate/pkg-plist | 10 ++++------ 5 files changed, 36 insertions(+), 41 deletions(-) diff --git a/graphics/glaxnimate/Makefile b/graphics/glaxnimate/Makefile index 86ed77b3f84c..8226705f113b 100644 --- a/graphics/glaxnimate/Makefile +++ b/graphics/glaxnimate/Makefile @@ -1,6 +1,5 @@ PORTNAME= glaxnimate -DISTVERSION= 0.5.0 -PORTREVISION= 1 +DISTVERSION= 0.5.1 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org @@ -14,23 +13,23 @@ BUILD_DEPENDS= pip:devel/py-pip@${PY_FLAVOR} LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libpotrace.so:graphics/libpotrace -USES= cmake compiler:c++17-lang gl libarchive python qt:5 +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 USE_GL= gl USE_GITLAB= yes GL_ACCOUNT= mattbas -GL_COMMIT= 7aaa27b346888d9aeae12815c3aa3e720adf985f +GL_COMMIT= 91219dc52ca909118e4a756629ea779dde5577c3 -GL_TUPLE= mattbas:CMake-Lib:2738b6bbc3d386fa7cafb2267d5ad597a1f455a8:mattbas_CMake_Lib/cmake \ - mattbas:Qt-Color-Widgets:8d0f56c0b855ae766183ffec2cc3e973a5d4bf8f:mattbas_Qt_Color_Widgets/external/Qt-Color-Widgets \ - mattbas:Qt-History-LineEdit:e6c254f5a893963dfece477bc99405495e471483:mattbas_Qt_History_LineEdit/external/Qt-History-LineEdit \ +GL_TUPLE= mattbas:CMake-Lib:8af80b5668dbc6a0210e09a969a1b43fc99f39ba:mattbas_CMake_Lib/cmake \ + mattbas:Qt-Color-Widgets:091c29463bbeec1a672598af4597055ba24842cd: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 \ - rpavlik/cmake-modules:c97690cc0024a1842cd8de71334a2ee9c5f7e729:rpavlik_cmake_modules/external/cmake-modules \ - mbasaglia:pybind11:7b30131fcbbbc227d2afcc969a8aab8c8b792b66:mbasaglia_pybind11/external/QtAppSetup/external/pybind11 + mbasaglia:pybind11:7b30131fcbbbc227d2afcc969a8aab8c8b792b66:mbasaglia_pybind11/external/QtAppSetup/external/pybind11 \ + rpavlik/cmake-modules:c97690cc0024a1842cd8de71334a2ee9c5f7e729:rpavlik_cmake_modules/external/cmake-modules CMAKE_ARGS= -DPython3_EXECUTABLE=${PYTHON_CMD} diff --git a/graphics/glaxnimate/distinfo b/graphics/glaxnimate/distinfo index f0b70a62b839..2f3dccc99208 100644 --- a/graphics/glaxnimate/distinfo +++ b/graphics/glaxnimate/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1643622529 +TIMESTAMP = 1665476418 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-7aaa27b346888d9aeae12815c3aa3e720adf985f_GL0.tar.gz) = 0882e269090dfd65e39689096b1c7ca8174dffa347535da209254da4e00f2528 -SIZE (mattbas-glaxnimate-7aaa27b346888d9aeae12815c3aa3e720adf985f_GL0.tar.gz) = 4746649 -SHA256 (mattbas-CMake-Lib-2738b6bbc3d386fa7cafb2267d5ad597a1f455a8_GL0.tar.gz) = f49748419723ea67dd9d0f57aaca83a9dad2a8a8510a2906802cadfb7cb0e91b -SIZE (mattbas-CMake-Lib-2738b6bbc3d386fa7cafb2267d5ad597a1f455a8_GL0.tar.gz) = 8662 -SHA256 (mattbas-Qt-Color-Widgets-8d0f56c0b855ae766183ffec2cc3e973a5d4bf8f_GL0.tar.gz) = bc2558c4bac07c51657d126d2cf34eb78882115484e6dd2a851c8b4b9d9a189d -SIZE (mattbas-Qt-Color-Widgets-8d0f56c0b855ae766183ffec2cc3e973a5d4bf8f_GL0.tar.gz) = 206927 -SHA256 (mattbas-Qt-History-LineEdit-e6c254f5a893963dfece477bc99405495e471483_GL0.tar.gz) = e77cf9382bbaf559eba9d5f59d6c9ef87577cbf85528b28fb0d891d9b78678d5 -SIZE (mattbas-Qt-History-LineEdit-e6c254f5a893963dfece477bc99405495e471483_GL0.tar.gz) = 7846 +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 (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 SIZE (mattbas-python-lottie-9e742aadb5ca7d0e8c9b01b2553c0a81de238ae4_GL0.tar.gz) = 284790 diff --git a/graphics/glaxnimate/files/patch-CMakeLists.txt b/graphics/glaxnimate/files/patch-CMakeLists.txt index d0fa06541034..0bbccf693e68 100644 --- a/graphics/glaxnimate/files/patch-CMakeLists.txt +++ b/graphics/glaxnimate/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2022-01-31 09:47:12 UTC +--- CMakeLists.txt.orig 2022-09-11 09:38:36 UTC +++ CMakeLists.txt @@ -29,7 +29,7 @@ set(PROJECT_MANINTAINER "${PROJECT_MANINTAINER_NAME} < # CMake modules @@ -9,12 +9,21 @@ # C++ set(CMAKE_CXX_STANDARD 17) -@@ -38,7 +38,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) - # Git +@@ -39,14 +39,14 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(VERSION_NAKED ${PROJECT_VERSION}) - set(VERSION_SUFFIX "" CACHE STRING "") --if (VERSION_SUFFIX STREQUAL "") -+if (FALSE AND VERSION_SUFFIX STREQUAL "") + set(VERSION_SUFFIX "-git-" CACHE STRING "") + +-if (VERSION_SUFFIX STREQUAL "-git-") ++if (FALSE AND VERSION_SUFFIX STREQUAL "-git-") git_describe(GIT_DESC --tags) if ( NOT ${GIT_DESC} MATCHES ".*NOTFOUND" ) set(PROJECT_VERSION ${GIT_DESC}) + endif() +-elseif(VERSION_SUFFIX MATCHES "^\\..*") ++elseif(FALSE AND VERSION_SUFFIX MATCHES "^\\..*") + set(PROJECT_VERSION "${PROJECT_VERSION}${VERSION_SUFFIX}") +-elseif(NOT VERSION_SUFFIX STREQUAL "") ++elseif(FALSE AND NOT VERSION_SUFFIX STREQUAL "") + set(PROJECT_VERSION "${PROJECT_VERSION}+${VERSION_SUFFIX}") + endif() + diff --git a/graphics/glaxnimate/files/patch-src_core_utils_gzip.cpp b/graphics/glaxnimate/files/patch-src_core_utils_gzip.cpp deleted file mode 100644 index 41dc96df495f..000000000000 --- a/graphics/glaxnimate/files/patch-src_core_utils_gzip.cpp +++ /dev/null @@ -1,11 +0,0 @@ -- workaround for https://gitlab.com/mattbas/glaxnimate/-/issues/486 - ---- src/core/utils/gzip.cpp.orig 2022-02-08 22:18:22 UTC -+++ src/core/utils/gzip.cpp -@@ -1,5 +1,6 @@ - #include "gzip.hpp" - -+#include - #include - - #include diff --git a/graphics/glaxnimate/pkg-plist b/graphics/glaxnimate/pkg-plist index d767b9bf6424..3f67f098fb63 100644 --- a/graphics/glaxnimate/pkg-plist +++ b/graphics/glaxnimate/pkg-plist @@ -16128,6 +16128,7 @@ share/applications/glaxnimate.desktop %%DATADIR%%/glaxnimate/images/icons/keyframe-add.svg %%DATADIR%%/glaxnimate/images/icons/keyframe-record.svg %%DATADIR%%/glaxnimate/images/icons/keyframe-remove.svg +%%DATADIR%%/glaxnimate/images/icons/lottiefiles.svg %%DATADIR%%/glaxnimate/images/keyframe/custom.svg %%DATADIR%%/glaxnimate/images/keyframe/ease.svg %%DATADIR%%/glaxnimate/images/keyframe/finish/custom.svg @@ -16145,6 +16146,9 @@ share/applications/glaxnimate.desktop %%DATADIR%%/glaxnimate/images/keyframe/status/not-animated.svg %%DATADIR%%/glaxnimate/images/keyframe/status/tween.svg %%DATADIR%%/glaxnimate/images/logo.svg +%%DATADIR%%/glaxnimate/images/trace/complex.jpg +%%DATADIR%%/glaxnimate/images/trace/flat.png +%%DATADIR%%/glaxnimate/images/trace/pixel.png %%DATADIR%%/glaxnimate/images/widgets/background.png %%DATADIR%%/glaxnimate/lib/lottie/__init__.py %%DATADIR%%/glaxnimate/lib/lottie/exporters/__init__.py @@ -16254,11 +16258,5 @@ 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_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/scalable/apps/glaxnimate.svg