Date: Fri, 7 Dec 2018 06:34:59 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486825 - in head/math/cadabra2: . files Message-ID: <201812070634.wB76Yxt7063855@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Fri Dec 7 06:34:59 2018 New Revision: 486825 URL: https://svnweb.freebsd.org/changeset/ports/486825 Log: math/cadabra2: Update 2.2.0 -> 2.2.2 Reported by: portscout Deleted: head/math/cadabra2/files/patch-client__server_Server.cc head/math/cadabra2/files/patch-pybind11-libc++7 Modified: head/math/cadabra2/Makefile head/math/cadabra2/distinfo head/math/cadabra2/files/patch-client__server_CMakeLists.txt head/math/cadabra2/files/patch-cmake_version.cmake head/math/cadabra2/files/patch-core_CMakeLists.txt head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt head/math/cadabra2/pkg-plist Modified: head/math/cadabra2/Makefile ============================================================================== --- head/math/cadabra2/Makefile Fri Dec 7 05:46:39 2018 (r486824) +++ head/math/cadabra2/Makefile Fri Dec 7 06:34:59 2018 (r486825) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cadabra2 -DISTVERSION= 2.2.0 -PORTREVISION= 3 +DISTVERSION= 2.2.2 CATEGORIES= math PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -24,7 +23,7 @@ LIB_DEPENDS= ${PY_BOOST} \ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sympy/__init__.py:math/py-sympy@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} -USES= compiler:c++14-lang cmake:outsource dos2unix gettext-runtime localbase:ldflags pkgconfig python:3.4+ sqlite # USES=python picks random python versions +USES= compiler:c++14-lang cmake:outsource dos2unix gettext-runtime gnome localbase:ldflags pkgconfig python:3.4+ sqlite # USES=python picks random python versions USE_GITHUB= yes GH_ACCOUNT= kpeeters DOS2UNIX_FILES= cmake/version.cmake @@ -33,7 +32,7 @@ USE_TEX= base texmf texhash USE_LDCONFIG= yes OPTIONS_SUB= yes -CMAKE_ON= USE_PYTHON_3 # OFF doesn't work, still links to python3: https://github.com/kpeeters/cadabra2/issues/76 +CMAKE_ON= BUILD_SHARED_LIBS USE_PYTHON_3 # OFF doesn't work, still links to python3: https://github.com/kpeeters/cadabra2/issues/76 CMAKE_OFF= ENABLE_MATHEMATICA CXXFLAGS+= -I${LOCALBASE}/include/jsoncpp LDFLAGS+= -ljsoncpp Modified: head/math/cadabra2/distinfo ============================================================================== --- head/math/cadabra2/distinfo Fri Dec 7 05:46:39 2018 (r486824) +++ head/math/cadabra2/distinfo Fri Dec 7 06:34:59 2018 (r486825) @@ -1,5 +1,5 @@ -TIMESTAMP = 1522534466 -SHA256 (kpeeters-cadabra2-2.2.0_GH0.tar.gz) = 4e0a408ab8fa611091bc4d776dd44efd730c2651e02e62cfd0251bd1d6b96249 -SIZE (kpeeters-cadabra2-2.2.0_GH0.tar.gz) = 23915602 +TIMESTAMP = 1544157018 +SHA256 (kpeeters-cadabra2-2.2.2_GH0.tar.gz) = 9245ceb5b5b3901709060364356bb6db2f6d2d3c7f03f51f9a0ee7d239e15351 +SIZE (kpeeters-cadabra2-2.2.2_GH0.tar.gz) = 23979382 SHA256 (5d52108df5b05eeba2ffbd7220776887297c2846.patch) = 91c1259345332b9fc4b52eafa1c510d2a851b99ca708fa25af5673cdf737be87 SIZE (5d52108df5b05eeba2ffbd7220776887297c2846.patch) = 735 Modified: head/math/cadabra2/files/patch-client__server_CMakeLists.txt ============================================================================== --- head/math/cadabra2/files/patch-client__server_CMakeLists.txt Fri Dec 7 05:46:39 2018 (r486824) +++ head/math/cadabra2/files/patch-client__server_CMakeLists.txt Fri Dec 7 06:34:59 2018 (r486825) @@ -1,35 +1,26 @@ ---- client_server/CMakeLists.txt.orig 2018-03-30 09:33:27 UTC +--- client_server/CMakeLists.txt.orig 2018-12-07 04:46:45 UTC +++ client_server/CMakeLists.txt -@@ -28,7 +28,6 @@ find_package(Boost 1.53.0 COMPONENTS sys - set(CADABRA_SERVER_SRC - Server.cc - Snoop.cc -- jsoncpp/jsoncpp.cpp - ../core/CdbPython.cc - ../core/Stopwatch.cc - ../core/ProgressMonitor.cc +@@ -32,7 +32,6 @@ set(CADABRA_SERVER_SRC + ${CADABRA_CORE_DIR}/InstallPrefix.cc + ${CADABRA_CORE_DIR}/CdbPython.cc + ${CADABRA_CORE_DIR}/Stopwatch.cc +- ${CADABRA_LIBS_DIR}/jsoncpp/jsoncpp.cpp + ${CADABRA_LIBS_DIR}/whereami/whereami.c + ) + @@ -43,7 +42,6 @@ set(CADABRA_CLIENT_SRC - ../core/DataCell.cc - Actions.cc - Snoop.cc -- jsoncpp/jsoncpp.cpp - ../libs/whereami/whereami.c - ../core/InstallPrefix.cc - # ../libs/sqlite3/sqlite3.c -@@ -58,7 +56,6 @@ include_directories( - "../core" - "../libs/pybind11/include" - "websocketpp" -- "jsoncpp" - "../libs/internal/include" - "../libs/whereami" - ${Boost_INCLUDE_DIRS} -@@ -114,7 +111,7 @@ add_executable(cadabra2html cadabra2html - target_link_libraries(cadabra2html cadabra_client) + Snoop.cc + ${CADABRA_CORE_DIR}/DataCell.cc + ${CADABRA_CORE_DIR}/InstallPrefix.cc +- ${CADABRA_LIBS_DIR}/jsoncpp/jsoncpp.cpp + ${CADABRA_LIBS_DIR}/whereami/whereami.c + ) - # Client library --add_library(cadabra_client STATIC ${CADABRA_CLIENT_SRC}) -+add_library(cadabra_client SHARED ${CADABRA_CLIENT_SRC}) - target_link_libraries(cadabra_client - ${Boost_LIBRARIES} - ${SQLITE3_LIBRARIES} +@@ -56,7 +54,6 @@ include_directories( + "${CADABRA_CORE_DIR}" + "${CADABRA_LIBS_DIR}/pybind11/include" + "${CADABRA_LIBS_DIR}/websocketpp" +- "${CADABRA_LIBS_DIR}/jsoncpp" + "${CADABRA_LIBS_DIR}/internal/include" + "${CADABRA_LIBS_DIR}/whereami" + ${Boost_INCLUDE_DIRS} Modified: head/math/cadabra2/files/patch-cmake_version.cmake ============================================================================== --- head/math/cadabra2/files/patch-cmake_version.cmake Fri Dec 7 05:46:39 2018 (r486824) +++ head/math/cadabra2/files/patch-cmake_version.cmake Fri Dec 7 06:34:59 2018 (r486825) @@ -1,15 +1,15 @@ ---- cmake/version.cmake.orig 2018-03-31 20:48:09 UTC +--- cmake/version.cmake.orig 2018-12-07 05:19:36 UTC +++ cmake/version.cmake -@@ -3,13 +3,13 @@ set(CADABRA_VERSION_MINOR 2) - set(CADABRA_VERSION_PATCH 0) +@@ -4,7 +4,7 @@ set(CADABRA_VERSION_PATCH 2) set(CADABRA_VERSION_TWEAK 0) set(COPYRIGHT_YEARS "2001-2018") --execute_process(COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE GIT_SHORT_SHA OUTPUT_STRIP_TRAILING_WHITESPACE) --execute_process(COMMAND git rev-list --count HEAD OUTPUT_VARIABLE GIT_COMMIT_SERIAL OUTPUT_STRIP_TRAILING_WHITESPACE) --execute_process(COMMAND git log -1 --date=short --pretty=format:%cd OUTPUT_VARIABLE GIT_COMMIT_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) -+#execute_process(COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE GIT_SHORT_SHA OUTPUT_STRIP_TRAILING_WHITESPACE) -+#execute_process(COMMAND git rev-list --count HEAD OUTPUT_VARIABLE GIT_COMMIT_SERIAL OUTPUT_STRIP_TRAILING_WHITESPACE) -+#execute_process(COMMAND git log -1 --date=short --pretty=format:%cd OUTPUT_VARIABLE GIT_COMMIT_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) + 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() if(GIT_SHORT_SHA) set(CADABRA_VERSION_BUILD "${GIT_COMMIT_SERIAL}.${GIT_SHORT_SHA}") else() Modified: head/math/cadabra2/files/patch-core_CMakeLists.txt ============================================================================== --- head/math/cadabra2/files/patch-core_CMakeLists.txt Fri Dec 7 05:46:39 2018 (r486824) +++ head/math/cadabra2/files/patch-core_CMakeLists.txt Fri Dec 7 06:34:59 2018 (r486825) @@ -1,19 +1,34 @@ ---- core/CMakeLists.txt.orig 2018-03-31 17:08:45 UTC +--- core/CMakeLists.txt.orig 2018-12-07 05:20:52 UTC +++ core/CMakeLists.txt -@@ -197,7 +197,6 @@ include_directories( - "." - "../libs/internal/include" - "../libs/whereami" -- "../client_server/jsoncpp" - ${Boost_INCLUDE_DIRS} +@@ -204,7 +204,6 @@ set(LOCAL_SRC_FILES + modules/xperm_new.cc + ${ALGORITHM_SRC_FILES} + ${PROPERTY_SRC_FILES} +- ${CADABRA_LIBS_DIR}/jsoncpp/jsoncpp.cpp + ) + if(MATHEMATICA_FOUND) + set(LOCAL_SRC_FILES +@@ -227,7 +226,6 @@ include_directories( + "." + "${CADABRA_LIBS_DIR}/internal/include" + "${CADABRA_LIBS_DIR}/whereami" +- "${CADABRA_LIBS_DIR}/jsoncpp" + ${Boost_INCLUDE_DIRS} ) # FIXME: 2nd line is to find Config.hh -@@ -246,7 +245,7 @@ target_link_libraries(cadabra2python - ) - - # cadabra2cadabra --add_executable(cadabra2cadabra cadabra2cadabra.cc DataCell.cc ../client_server/jsoncpp/jsoncpp.cpp ../libs/whereami/whereami.c InstallPrefix.cc) -+add_executable(cadabra2cadabra cadabra2cadabra.cc DataCell.cc ../libs/whereami/whereami.c InstallPrefix.cc) - target_link_libraries(cadabra2cadabra ${Boost_LIBRARIES}) - - # Mathematica WSTP test +@@ -263,7 +261,6 @@ add_executable(test_preprocessor + add_executable(cadabra2python + cadabra2python.cc + CdbPython.cc +- ${CADABRA_LIBS_DIR}/jsoncpp/jsoncpp.cpp + ) + target_link_libraries(cadabra2python + ${Boost_LIBRARIES} +@@ -275,7 +272,6 @@ add_executable(cadabra2cadabra + cadabra2cadabra.cc + DataCell.cc + InstallPrefix.cc +- ${CADABRA_LIBS_DIR}/jsoncpp/jsoncpp.cpp + ${CADABRA_LIBS_DIR}/whereami/whereami.c + ) + target_link_libraries(cadabra2cadabra ${Boost_LIBRARIES} ${GLIBMM3_LIBRARIES}) Modified: head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt ============================================================================== --- head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt Fri Dec 7 05:46:39 2018 (r486824) +++ head/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt Fri Dec 7 06:34:59 2018 (r486825) @@ -1,31 +1,15 @@ ---- frontend/gtkmm/CMakeLists.txt.orig 2018-03-30 09:33:27 UTC +--- frontend/gtkmm/CMakeLists.txt.orig 2018-12-07 05:18:13 UTC +++ frontend/gtkmm/CMakeLists.txt -@@ -126,11 +126,11 @@ install(FILES ${PROJECT_SOURCE_DIR}/. - # there anyway. - # - gtk-update-icon-cache is broken and only works half of the time. +@@ -165,9 +165,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(CODE "execute_process(COMMAND touch ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)") +- install(CODE "execute_process(COMMAND gtk-update-icon-cache-3.0 ${ICON_PREFIX}/share/icons/hicolor)") +- install(CODE "execute_process(COMMAND chmod go+r ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)") ++ #install(CODE "execute_process(COMMAND touch ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)") ++ #install(CODE "execute_process(COMMAND gtk-update-icon-cache-3.0 ${ICON_PREFIX}/share/icons/hicolor)") ++ #install(CODE "execute_process(COMMAND chmod go+r ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)") --if(APPLE) -+#if(APPLE) - set(ICON_PREFIX "${CMAKE_INSTALL_PREFIX}") --else() -- set(ICON_PREFIX "/usr") --endif() -+#else() -+# set(ICON_PREFIX "/usr") -+#endif() - - #set(ICON_THEME ${ICON_PREFIX}/share/icons/hicolor/index.theme) - #if(EXISTS "${ICON_THEME}") -@@ -144,9 +144,9 @@ install(FILES ${PROJECT_SOURCE_DIR}/. - install(FILES ${PROJECT_SOURCE_DIR}/../../images/256x256/cadabra2-gtk.png DESTINATION ${ICON_PREFIX}/share/icons/hicolor/256x256/apps) - install(FILES ${PROJECT_SOURCE_DIR}/../../images/cadabra2-gtk.svg DESTINATION ${ICON_PREFIX}/share/icons/hicolor/scalable/apps) - install(FILES ${PROJECT_SOURCE_DIR}/../../config/cadabra2-gtk.desktop DESTINATION ${ICON_PREFIX}/share/applications) --install(CODE "execute_process(COMMAND touch ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)") --install(CODE "execute_process(COMMAND gtk-update-icon-cache-3.0 ${ICON_PREFIX}/share/icons/hicolor)") --install(CODE "execute_process(COMMAND chmod go+r ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)") -+#install(CODE "execute_process(COMMAND touch ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)") -+#install(CODE "execute_process(COMMAND gtk-update-icon-cache-3.0 ${ICON_PREFIX}/share/icons/hicolor)") -+#install(CODE "execute_process(COMMAND chmod go+r ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)") - - # Install shared libraries on Windows. - # https://stackoverflow.com/questions/32662215/how-do-you-install-gtk-3-0-on-windows + # Install shared libraries on Windows. + # https://stackoverflow.com/questions/32662215/how-do-you-install-gtk-3-0-on-windows Modified: head/math/cadabra2/pkg-plist ============================================================================== --- head/math/cadabra2/pkg-plist Fri Dec 7 05:46:39 2018 (r486824) +++ head/math/cadabra2/pkg-plist Fri Dec 7 06:34:59 2018 (r486825) @@ -4,21 +4,21 @@ bin/cadabra2 bin/cadabra2cadabra bin/cadabra2html bin/cadabra2python -lib/libcadabra_client.so +lib/libcadabra_client.a %%GUI%%share/applications/cadabra2-gtk.desktop %%GUI%%%%DATADIR%%/images/cadabra2-gtk.png %%GUI%%%%DATADIR%%/latex/preamble.tex -%%GUI%%%%DATADIR%%/latex/tableaux.sty -%%GUI%%@dir %%DATADIR%%/manual/properties %%GUI%%%%DATADIR%%/manual/algorithms/asym.cnb %%GUI%%%%DATADIR%%/manual/algorithms/canonicalise.cnb %%GUI%%%%DATADIR%%/manual/algorithms/collect_factors.cnb %%GUI%%%%DATADIR%%/manual/algorithms/collect_terms.cnb %%GUI%%%%DATADIR%%/manual/algorithms/combine.cnb %%GUI%%%%DATADIR%%/manual/algorithms/complete.cnb +%%GUI%%%%DATADIR%%/manual/algorithms/decompose.cnb %%GUI%%%%DATADIR%%/manual/algorithms/decompose_product.cnb %%GUI%%%%DATADIR%%/manual/algorithms/distribute.cnb %%GUI%%%%DATADIR%%/manual/algorithms/drop_weight.cnb +%%GUI%%%%DATADIR%%/manual/algorithms/einsteinify.cnb %%GUI%%%%DATADIR%%/manual/algorithms/eliminate_kronecker.cnb %%GUI%%%%DATADIR%%/manual/algorithms/eliminate_metric.cnb %%GUI%%%%DATADIR%%/manual/algorithms/epsilon_to_delta.cnb @@ -33,9 +33,11 @@ lib/libcadabra_client.so %%GUI%%%%DATADIR%%/manual/algorithms/integrate_by_parts.cnb %%GUI%%%%DATADIR%%/manual/algorithms/join_gamma.cnb %%GUI%%%%DATADIR%%/manual/algorithms/keep_weight.cnb +%%GUI%%%%DATADIR%%/manual/algorithms/lower_free_indices.cnb %%GUI%%%%DATADIR%%/manual/algorithms/lr_tensor.cnb %%GUI%%%%DATADIR%%/manual/algorithms/map_sympy.cnb %%GUI%%%%DATADIR%%/manual/algorithms/product_rule.cnb +%%GUI%%%%DATADIR%%/manual/algorithms/raise_free_indices.cnb %%GUI%%%%DATADIR%%/manual/algorithms/reduce_delta.cnb %%GUI%%%%DATADIR%%/manual/algorithms/rename_dummies.cnb %%GUI%%%%DATADIR%%/manual/algorithms/replace_match.cnb @@ -52,6 +54,7 @@ lib/libcadabra_client.so %%GUI%%%%DATADIR%%/manual/algorithms/vary.cnb %%GUI%%%%DATADIR%%/manual/algorithms/young_project_product.cnb %%GUI%%%%DATADIR%%/manual/algorithms/young_project_tensor.cnb +%%GUI%%%%DATADIR%%/manual/algorithms/zoom.cnb %%GUI%%%%DATADIR%%/manual/properties/Accent.cnb %%GUI%%%%DATADIR%%/manual/properties/AntiCommuting.cnb %%GUI%%%%DATADIR%%/manual/properties/AntiSymmetric.cnb @@ -62,6 +65,7 @@ lib/libcadabra_client.so %%GUI%%%%DATADIR%%/manual/properties/DAntiSymmetric.cnb %%GUI%%%%DATADIR%%/manual/properties/Depends.cnb %%GUI%%%%DATADIR%%/manual/properties/Derivative.cnb +%%GUI%%%%DATADIR%%/manual/properties/Determinant.cnb %%GUI%%%%DATADIR%%/manual/properties/Diagonal.cnb %%GUI%%%%DATADIR%%/manual/properties/DiracBar.cnb %%GUI%%%%DATADIR%%/manual/properties/Distributable.cnb @@ -94,10 +98,15 @@ lib/libcadabra_client.so %%GUI%%%%DATADIR%%/notebook.tex %%DATADIR%%/python/cadabra2.so %%DATADIR%%/python/cadabra2_defaults.py +%%DATADIR%%/python/cdb/core/component.cnb +%%DATADIR%%/python/cdb/core/manip.cnb +%%DATADIR%%/python/cdb/core/solve.cnb %%DATADIR%%/python/cdb/gauge_theory/__init__.py %%DATADIR%%/python/cdb/gauge_theory/instantons.py %%DATADIR%%/python/cdb/relativity/__init__.py %%DATADIR%%/python/cdb/relativity/schwarzschild.py +%%DATADIR%%/python/cdb/utils/node.cnb +%%DATADIR%%/python/cdb_appdirs.py %%GUI%%share/icons/hicolor/128x128/apps/cadabra2-gtk.png %%GUI%%share/icons/hicolor/256x256/apps/cadabra2-gtk.png %%GUI%%share/icons/hicolor/64x64/apps/cadabra2-gtk.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812070634.wB76Yxt7063855>