<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/6d8718bad30743c66b4c6c0e2f49eb72b8b7d4c0">https://github.com/macports/macports-ports/commit/6d8718bad30743c66b4c6c0e2f49eb72b8b7d4c0</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 6d8718bad30 xournalpp: update to 1.2.3, fix build
</span>6d8718bad30 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6d8718bad30743c66b4c6c0e2f49eb72b8b7d4c0
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Jun 15 15:10:55 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> xournalpp: update to 1.2.3, fix build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62777
</span>---
x11/xournalpp/Portfile | 65 ++++++++++++----------
x11/xournalpp/files/patch-CMakeLists.diff | 89 +++++++++++++++++++++++++++++++
2 files changed, 125 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xournalpp/Portfile b/x11/xournalpp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ee17c37db5c..9959db4c6ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xournalpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xournalpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,15 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span> PortGroup cmake 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# filesystem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 18
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup xournalpp xournalpp 1.0.20-hotfix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup xournalpp xournalpp 1.2.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories x11 sysutils
</span> maintainers nomaintainer
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,42 +18,45 @@ description A hand note taking software
</span> long_description Xournal++ is a hand note taking software written in C++ \
with the target of flexibility, functionality and speed.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 58010bdc60112f2f6f693163a7d997c329814ed8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1f6a297665ba9200d35bef9e03c480c0fe69036e71502674134d0a59b404d671 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14896961
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 35245219f0a0e4095ffeb548b342fa0c6817a129 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8817abd1794760c2a3be3a35e56a5588a51e517bc591384fa321994d50e14e7c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 16708613
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk-mac-bundler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Do not break the build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-CMakeLists.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:help2man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkgconfig:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:adwaita-icon-theme \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtksourceview4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/librsvg-2.0.pc:librsvg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsndfile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libzip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lua \
</span> path:lib/pkgconfig/poppler.pc:poppler \
port:portaudio \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libzip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsndfile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:adwaita-icon-theme \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set appName Xournal++.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Do not clutter $HOME/.local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\$1/inst|${prefix}|g;s/make install/#make install/" ${worksrcpath}/mac-setup/build-app.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# xournalpp(76272) malloc: *** error for object 0x2ff8034: Non-aligned pointer being freed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.redirect_bins xournalpp xournalpp-thumbnailer
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|<main-binary>\${prefix}/bin/|<main-binary dest=\"\${bundle}/foobar\">${worksrcpath}/src/|;s|<launcher-script></launcher-script >|<!-- <launcher-script></launcher-script > -->|" ${worksrcpath}/mac-setup/xournalpp.bundle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "./mac-setup/build-app.sh ${prefix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s/export DYLD_LIBRARY_PATH/#export DYLD_LIBRARY_PATH/" ${worksrcpath}/mac-setup/${appName}/Contents/MacOS/xournalpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_REQUIRED_FIND_PACKAGE_X11=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_PLUGINS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_PROFILING=OFF
</span>
post-destroot {
set docdir ${prefix}/share/doc/${subport}
xinstall -d ${destroot}${docdir}
xinstall -m 0644 -W ${worksrcpath} AUTHORS LICENSE CHANGELOG.md README.md ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/mac-setup/${appName} ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xournal++ is intended to be used through ${appName}, binary in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # $prefix/bin won't work properly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/bin/xournalpp
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xournalpp/files/patch-CMakeLists.diff b/x11/xournalpp/files/patch-CMakeLists.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1301498e0d1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xournalpp/files/patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,89 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-06-15 12:16:29.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,9 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake_minimum_required(VERSION 3.12)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake_policy(VERSION ${CMAKE_VERSION})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-## The CMAKE_OSX_DEPLOYMENT_TARGET must be set before project(), so don't move the following line further down.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(NOT CMAKE_BUILD_TYPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT CMAKE_BUILD_TYPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # set default build type to RelWithDebInfo, we never supported multi config generators, therefore this is fine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,9 +48,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ core_find_git_rev(RELEASE_IDENTIFIER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string(TIMESTAMP PACKAGE_TIMESTAMP "%Y%m%d.%H%M" UTC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include(TargetArch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_architecture(PACKAGE_ARCH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_file(cmake/VERSION.in VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,7 +85,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(backtrace INTERFACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(backtrace INTERFACE ${Backtrace_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(backtrace INTERFACE ${Backtrace_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_link_options(backtrace INTERFACE $<$<AND:$<NOT:$<PLATFORM_ID:Windows>>,$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>>:-rdynamic>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(Backtrace::backtrace ALIAS backtrace)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif (Backtrace_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -128,14 +122,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string(REPLACE "-framework;" "-framework " libs "${libs}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # message(STATUS "PkgConfig::ExternalModules::INTERFACE_LINK_LIBRARIES fixed: ${libs}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(PkgConfig::ExternalModules PROPERTIES INTERFACE_LINK_LIBRARIES "${libs}")
</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;'>+- if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # fix broken framework flags from pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get_target_property(opts PkgConfig::ExternalModules INTERFACE_LINK_OPTIONS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- string(REPLACE "-framework;" "SHELL:-framework " opts "${opts}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_target_properties(PkgConfig::ExternalModules PROPERTIES INTERFACE_LINK_OPTIONS "${opts}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif ()
</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;'>+ find_package(ZLIB REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -201,9 +187,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $<$<TARGET_EXISTS:X11::X11>:X11_ENABLED>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_link_options(external_modules INTERFACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $<$<AND:$<NOT:$<PLATFORM_ID:Windows>>,$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>>:-rdynamic>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(xoj::external_modules ALIAS external_modules)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -402,32 +385,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CPACK_STRIP_FILES ON) # Debian packages must be stripped from debug messages, so lintian doesn't complain
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# .deb package options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(CPACK_DEBIAN_PACKAGE_RELEASE 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PROJECT_VERSION}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(CPACK_DEBIAN_PACKAGE_SECTION "graphics")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(CPACK_DEBIAN_PACKAGE_DEPENDS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "libglib2.0-0 (>= 2.32), libgtk-3-0 (>= 3.18), libpoppler-glib8 (>= 0.41.0), libxml2 (>= 2.0.0), libportaudiocpp0 (>= 12), libsndfile1 (>= 1.0.25), liblua5.3-0, libzip4 (>= 1.0.1) | libzip5, zlib1g, libc6")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(CPACK_DEBIAN_PACKAGE_SUGGESTS "texlive-base, texlive-latex-extra") # Latex tool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Use debian's arch scheme; we only care about x86/amd64 for now but feel free to add more
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (${PACKAGE_ARCH} STREQUAL "x86_64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
</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 (CPACK_GENERATOR MATCHES "DEB")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message("Preparing documentation for DEB package")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_custom_target(package_documentation ALL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #Compress changelog and save it as share/doc/xournalpp/changelog.Debian.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_custom_command(TARGET package_documentation PRE_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND gzip -c -9 -n "${PROJECT_SOURCE_DIR}/debian/changelog" > "changelog.Debian.gz" VERBATIM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/changelog.Debian.gz" DESTINATION "share/doc/xournalpp/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message("Install copyright for DEB package")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #Copy copyright to share/doc/xournalpp/copyright
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(FILES "${PROJECT_SOURCE_DIR}/debian/copyright" DESTINATION "share/doc/xournalpp/")
</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 (NOT DEFINED CPACK_GENERATOR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CPACK_GENERATOR "TGZ")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif ()
</span></pre><pre style='margin:0'>
</pre>