<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fb599b2561776a852727744e6ec6420f6e525476">https://github.com/macports/macports-ports/commit/fb599b2561776a852727744e6ec6420f6e525476</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new fb599b25617 wxMaxima: fix for old systems and powerpc
</span>fb599b25617 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fb599b2561776a852727744e6ec6420f6e525476
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Fri May 31 18:25:25 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> wxMaxima: fix for old systems and powerpc
</span>---
math/wxMaxima/Portfile | 47 ++++++++++++---
math/wxMaxima/files/patch-no-bundle.diff | 100 +++++++++++++++++++++++++++++++
2 files changed, 138 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/wxMaxima/Portfile b/math/wxMaxima/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aa1cb006cbe..172627522bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/wxMaxima/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/wxMaxima/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,6 +30,7 @@ universal_variant no
</span>
compiler.cxx_standard \
2014
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.openmp_version 3.0
</span>
# https://github.com/wxMaxima-developers/wxmaxima/issues/1784
compiler.blacklist-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,11 +39,37 @@ compiler.blacklist-append \
</span> {macports-clang-[4-9].0} \
{macports-clang-1[0-2]}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-wxWidgets.use wxWidgets-3.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} > 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxWidgets-3.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${os.platform} eq "darwin" && ${os.major} > 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxWidgets-3.0-cxx11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup legacysupport 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:${wxWidgets.port} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libomp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:maxima
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacysupport.redirect_bins wxmaxima
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxGTK-3.0-cxx11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We really do not want to build a MacOS-style app with GTK here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # It will build, but the app can only run when its binary is called from CLI.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Also, we need a malloc fix here, which does not really work with bundles.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no-bundle.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWXM_DISABLE_WEBVIEW=YES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:maxima \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/include/libomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
depends_run-append port:gnuplot
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,16 +78,18 @@ post-patch {
</span> reinplace -W ${worksrcpath} "s|OSX_MACPORTS_PREFER 0|OSX_MACPORTS_PREFER 1 // patched by MacPorts|" src/Dirstructure.h
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/include/libomp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args -DCMAKE_BUILD_TYPE=Release \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_BUILD_TYPE=Release \
</span> -DCCACHE_PROGRAM= \
-DUSE_CPPCHECK=YES \
-DwxWidgets_CONFIG_EXECUTABLE:FILEPATH=${wxWidgets.wxconfig}
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${build.dir}/src/wxmaxima.app ${destroot}${applications_dir}/wxMaxima.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} > 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${build.dir}/src/wxmaxima.app ${destroot}${applications_dir}/wxMaxima.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${build.dir}/src/wxmaxima ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
notes "
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/wxMaxima/files/patch-no-bundle.diff b/math/wxMaxima/files/patch-no-bundle.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..31e3363143e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/wxMaxima/files/patch-no-bundle.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,100 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt 2024-01-12 03:01:41.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-05-31 18:12:08.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,11 +18,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(GITVERSION ${VERSION})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_STANDARD 14)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(MACOSX_BUNDLE_COPYRIGHT "GPL2+")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(MACOSX_BUNDLE_BUNDLE_VERSION ${VERSION})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(MACOSX_BUNDLE_BUNDLE_NAME "wxMaxima")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(MACOSX_BUNDLE_LONG_VERSION_STRING "wxMaxima ${VERSION}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# set(MACOSX_BUNDLE_GUI_IDENTIFIER "wxMaxima")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CMakeLists.txt 2024-01-12 03:01:41.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CMakeLists.txt 2024-05-31 18:11:09.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -213,54 +213,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories(${CMAKE_SOURCE_DIR}/data/winrc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- file(GLOB RESOURCE_FILES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/data/io.github.wxmaxima_developers.wxMaxima.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/data/io.github.wxmaxima_developers.wxMaxima.svg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/art/wxmac.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/art/wxmac-doc.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/art/wxmac-doc-wxm.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/art/wxmac-doc-wxmx.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/info/*.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/info/*.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/data/PkgInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/data/fonts/*.ttf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/locales/wxwin/*.mo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/data/fonts/*.otf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/data/fonts/*.ttf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_BINARY_DIR}/locale/*.mo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(wxmaxima WIN32 ${SOURCE_FILES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.16")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(wxmaxima PROPERTIES VS_DPI_AWARE "PerMonitor")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(MACOSX_BUNDLE_NAME wxmaxima)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(MACOSX_BUNDLE_ICON_FILE wxmac.icns)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(MACOSX_BUNDLE TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND SOURCE_FILES ${RESOURCE_FILES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_executable(wxmaxima ${SOURCE_FILES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_target_properties(wxmaxima PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MACOSX_BUNDLE TRUE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RESOURCE "${RESOURCE_FILES}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # The bundle utilities need to be run in a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # separate step, meaning from within a string.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # they provide the fixup command that makes the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # .dylibs run from within the app bundle.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CODE "include(BundleUtilities)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # the separate step doesn't know about
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # the values our variables had in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # cmakefile so we need to set them again.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(BU_CHMOD_BUNDLE_ITEMS TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fixup_bundle(\"${CMAKE_BINARY_DIR}/src/wxmaxima.app\" \"\" \"\")"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMPONENT Runtime)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(wxmaxima ${SOURCE_FILES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -317,15 +274,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Version.h.cin ${CMAKE_BINARY_DIR}/Version.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(TARGETS wxmaxima
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BUNDLE DESTINATION .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RUNTIME DESTINATION bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMPONENT Runtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RESOURCE DESTINATION resource)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(TARGETS wxmaxima RUNTIME DESTINATION bin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(TARGETS wxmaxima RUNTIME DESTINATION bin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Build Packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -333,10 +282,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CPACK_NSIS_DEFINES "ManifestDPIAware true")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(InstallRequiredSystemLibraries)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION bin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # If we have generated an .apk bundle we can package this in a DMG image
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CPACK_GENERATOR "DragNDrop")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CPACK_BINARY_DragNDrop "ON")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CPACK_GENERATOR "DEB;TGZ;TBZ2")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build RPMs only if rpmbuild is installed
</span></pre><pre style='margin:0'>
</pre>