git: 4e5c284cdd21 - main - math/cadabra2: update 2.4.5.7 → 2.5.2-20240616

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Mon, 17 Jun 2024 08:18:51 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4e5c284cdd21dfc2c299ae421ca07572ca52f74c

commit 4e5c284cdd21dfc2c299ae421ca07572ca52f74c
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-06-17 07:18:34 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-06-17 08:18:35 +0000

    math/cadabra2: update 2.4.5.7 → 2.5.2-20240616
---
 math/cadabra2/Makefile                             |  5 +-
 math/cadabra2/distinfo                             |  8 ++-
 math/cadabra2/files/patch-cmake_version.cmake      | 10 +--
 .../files/patch-frontend_gtkmm_CMakeLists.txt      |  8 +--
 math/cadabra2/pkg-plist                            | 80 +++++++++++++++++++++-
 5 files changed, 97 insertions(+), 14 deletions(-)

diff --git a/math/cadabra2/Makefile b/math/cadabra2/Makefile
index 925959bf623a..cadb547c5e24 100644
--- a/math/cadabra2/Makefile
+++ b/math/cadabra2/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cadabra2
-DISTVERSION=	2.4.5.7
+DISTVERSION=	2.5.2-20240616
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -14,6 +14,7 @@ BROKEN_FreeBSD_15=	compilation fails with clang-17, see https://github.com/kpeet
 BUILD_DEPENDS=	${LOCALBASE}/include/websocketpp/client.hpp:devel/websocketpp
 LIB_DEPENDS=	${PY_BOOST} \
 		libboost_system.so:devel/boost-libs \
+		libfontconfig.so:x11-fonts/fontconfig \
 		libharfbuzz.so:print/harfbuzz \
 		libpcrecpp.so:devel/pcre \
 		libjsoncpp.so:devel/jsoncpp \
@@ -28,6 +29,8 @@ USE_TEX=	base latex texhash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kpeeters
+GH_TAGNAME=	95ca296 # 2.5.2 + fixes for the microtex library
+GH_TUPLE=	kpeeters:MicroTeX:d68cf35:microtex/submodules/microtex
 
 DOS2UNIX_FILES=	cmake/version.cmake
 
diff --git a/math/cadabra2/distinfo b/math/cadabra2/distinfo
index a3be09a2d033..0dd51c49f678 100644
--- a/math/cadabra2/distinfo
+++ b/math/cadabra2/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1713844932
-SHA256 (kpeeters-cadabra2-2.4.5.7_GH0.tar.gz) = 279d14389d3c2e6e2914dc123907842cd4919f3252326257bbc4e2c4c148a14b
-SIZE (kpeeters-cadabra2-2.4.5.7_GH0.tar.gz) = 26833908
+TIMESTAMP = 1718562686
+SHA256 (kpeeters-cadabra2-2.5.2-20240616-95ca296_GH0.tar.gz) = 14e10284d82dbd98145baa9b33e2bec280dc71f0df4f70abb8d865ad908b562e
+SIZE (kpeeters-cadabra2-2.5.2-20240616-95ca296_GH0.tar.gz) = 32459069
+SHA256 (kpeeters-MicroTeX-d68cf35_GH0.tar.gz) = 6b2a54dd28544c7dd3d18f44a9fb5b837cebdb86d913c0e570191777bf50b24c
+SIZE (kpeeters-MicroTeX-d68cf35_GH0.tar.gz) = 5492579
diff --git a/math/cadabra2/files/patch-cmake_version.cmake b/math/cadabra2/files/patch-cmake_version.cmake
index cd5b2905da90..47e6f108fe97 100644
--- a/math/cadabra2/files/patch-cmake_version.cmake
+++ b/math/cadabra2/files/patch-cmake_version.cmake
@@ -1,15 +1,15 @@
---- cmake/version.cmake.orig	2019-12-25 01:28:15 UTC
+--- cmake/version.cmake.orig	2024-06-16 17:47:41 UTC
 +++ cmake/version.cmake
-@@ -4,7 +4,7 @@ set(CADABRA_VERSION_PATCH 8)
- set(CADABRA_VERSION_TWEAK 1)
- set(COPYRIGHT_YEARS "2001-2019")
+@@ -4,7 +4,7 @@ math(EXPR SYSTEM_BITS "${CMAKE_SIZEOF_VOID_P} * 8")
+ set(CADABRA_VERSION_TWEAK 2)
+ set(COPYRIGHT_YEARS "2001-2024")
  math(EXPR SYSTEM_BITS "${CMAKE_SIZEOF_VOID_P} * 8")
 -find_program(GIT git PATHS ${GIT_DIR})
 +#find_program(GIT git PATHS ${GIT_DIR})
  if(GIT)
    message("-- Git found: ${GIT}")
    execute_process(COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE GIT_SHORT_SHA     OUTPUT_STRIP_TRAILING_WHITESPACE)
-@@ -16,7 +16,7 @@ endif()
+@@ -16,7 +16,7 @@ else()
  if(GIT_SHORT_SHA)
    set(CADABRA_VERSION_BUILD "${GIT_COMMIT_SERIAL}.${GIT_SHORT_SHA}")
  else()
diff --git a/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt b/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt
index e2745305ba54..308c8ac79dd1 100644
--- a/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt
+++ b/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt
@@ -1,15 +1,15 @@
---- frontend/gtkmm/CMakeLists.txt.orig	2019-12-10 18:37:37 UTC
+--- frontend/gtkmm/CMakeLists.txt.orig	2024-06-16 17:04:35 UTC
 +++ frontend/gtkmm/CMakeLists.txt
-@@ -168,9 +168,9 @@ if (NOT INSTALL_TARGETS_ONLY)
+@@ -239,9 +239,9 @@ if (NOT INSTALL_TARGETS_ONLY)
  	install(FILES    ${CADABRA_IMAGES_DIR}/256x256/cadabra2-gtk.png   DESTINATION ${ICON_PREFIX}/share/icons/hicolor/256x256/apps)
  	install(FILES    ${CADABRA_IMAGES_DIR}/cadabra2-gtk.svg           DESTINATION ${ICON_PREFIX}/share/icons/hicolor/scalable/apps)
- 	install(FILES    ${CADABRA_ROOT_DIR}/config/cadabra2-gtk.desktop  DESTINATION ${ICON_PREFIX}/share/applications)
+ 	install(FILES    ${CADABRA_ROOT_DIR}/config/science.cadabra.cadabra2-gtk.desktop  DESTINATION ${ICON_PREFIX}/share/applications)
 -	install(CODE     "execute_process(COMMAND touch ${ICON_PREFIX_WITH_DESTDIR}/share/icons/hicolor/icon-theme.cache)")
 -	install(CODE     "execute_process(COMMAND gtk-update-icon-cache-3.0 {ICON_PREFIX_WITH_DESTDIR}/share/icons/hicolor)")
 -	install(CODE     "execute_process(COMMAND chmod go+r ${ICON_PREFIX_WITH_DESTDIR}/share/icons/hicolor/icon-theme.cache)")
 +	#install(CODE     "execute_process(COMMAND touch ${ICON_PREFIX_WITH_DESTDIR}/share/icons/hicolor/icon-theme.cache)")
 +	#install(CODE     "execute_process(COMMAND gtk-update-icon-cache-3.0 {ICON_PREFIX_WITH_DESTDIR}/share/icons/hicolor)")
 +	#install(CODE     "execute_process(COMMAND chmod go+r ${ICON_PREFIX_WITH_DESTDIR}/share/icons/hicolor/icon-theme.cache)")
+ 	install(DIRECTORY cdb-icons  DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cadabra2/)  
  
  	# Install shared libraries on Windows. 
- 	# https://stackoverflow.com/questions/32662215/how-do-you-install-gtk-3-0-on-windows
diff --git a/math/cadabra2/pkg-plist b/math/cadabra2/pkg-plist
index ffee60ed1463..0beffab43abe 100644
--- a/math/cadabra2/pkg-plist
+++ b/math/cadabra2/pkg-plist
@@ -36,7 +36,14 @@ bin/cdb-nbtool
 %%PYTHON_SITELIBDIR%%/cdb/utils/tableau.cnb
 %%PYTHON_SITELIBDIR%%/cdb_appdirs.py
 %%PYTHON_SITELIBDIR%%/notebook/static/components/codemirror/mode/cadabra/cadabra.js
-%%GUI%%share/applications/cadabra2-gtk.desktop
+%%GUI%%share/applications/science.cadabra.cadabra2-gtk.desktop
+%%GUI%%%%DATADIR%%/cdb-icons/cdb-cancel.svg
+%%GUI%%%%DATADIR%%/cdb-icons/cdb-copy-all.svg
+%%GUI%%%%DATADIR%%/cdb-icons/cdb-open.svg
+%%GUI%%%%DATADIR%%/cdb-icons/cdb-restart.svg
+%%GUI%%%%DATADIR%%/cdb-icons/cdb-run.svg
+%%GUI%%%%DATADIR%%/cdb-icons/cdb-save-as.svg
+%%GUI%%%%DATADIR%%/cdb-icons/cdb-save.svg
 %%GUI%%%%DATADIR%%/images/cadabra2-gtk.png
 %%GUI%%%%DATADIR%%/latex/preamble.tex
 %%GUI%%%%DATADIR%%/manual/algorithms/asym.cnb
@@ -136,6 +143,76 @@ bin/cdb-nbtool
 %%GUI%%%%DATADIR%%/manual/properties/Vielbein.cnb
 %%GUI%%%%DATADIR%%/manual/properties/Weight.cnb
 %%GUI%%%%DATADIR%%/manual/properties/WeightInherit.cnb
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbbx.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbbx.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbi.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbi.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbl.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbl.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbmo.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbmo.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbmr.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbmr.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbso.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbso.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbsr.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbsr.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbtl.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbtl.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbto.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbto.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbx.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbx.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbxo.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunbxo.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunci.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunci.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunit.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunit.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunobi.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunobi.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunobx.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunobx.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunorm.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunorm.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunoti.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunoti.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunrb.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunrb.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunrm.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunrm.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunsi.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunsi.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunsl.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunsl.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunso.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunso.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunss.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunss.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunssdc.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunssdc.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunst.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunst.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunsx.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunsx.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmuntb.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmuntb.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunti.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunti.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmuntt.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmuntt.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmuntx.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmuntx.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunui.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunui.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunvi.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunvi.otf
+%%GUI%%%%DATADIR%%/microtex/cm/cmunvt.clm1
+%%GUI%%%%DATADIR%%/microtex/cm/cmunvt.otf
+%%GUI%%%%GUI%%%%DATADIR%%/microtex/lm-math/README
+%%GUI%%%%DATADIR%%/microtex/lm-math/latinmodern-math.clm1
+%%GUI%%%%DATADIR%%/microtex/lm-math/latinmodern-math.clm2
+%%GUI%%%%DATADIR%%/microtex/lm-math/latinmodern-math.otf
 %%GUI%%%%DATADIR%%/notebook.html
 %%GUI%%%%DATADIR%%/notebook.tex
 %%GUI%%share/icons/hicolor/128x128/apps/cadabra2-gtk.png
@@ -154,3 +231,4 @@ share/man/man1/cadabra2html.1.gz
 share/man/man1/cadabra2ipynb.1.gz
 share/man/man1/cadabra2latex.1.gz
 share/man/man1/cadabra2python.1.gz
+share/metainfo/science.cadabra.cadabra2-gtk.appdata.xml