-
Notifications
You must be signed in to change notification settings - Fork 2.5k
New package: asymptote-3.05 #58789
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
sgn
wants to merge
2
commits into
void-linux:master
Choose a base branch
from
sgn:asymptote
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
New package: asymptote-3.05 #58789
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- a/doc/asymptote.texi | ||
| +++ b/doc/asymptote.texi | ||
| @@ -23,7 +23,7 @@ file LICENSE in the top-level source dir | ||
|
|
||
| @dircategory Languages | ||
| @direntry | ||
| -* asymptote: (asymptote/asymptote). Vector graphics language. | ||
| +* asymptote: (asymptote). Vector graphics language. | ||
| @end direntry | ||
|
|
||
| @titlepage |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| diff '--color=auto' -r -U3 asymptote-2.92.orig/settings.cc asymptote-2.92/settings.cc | ||
| --- a/settings.cc | ||
| +++ b/settings.cc | ||
| @@ -117,14 +117,14 @@ string defaultPSViewer="open"; | ||
| string defaultPDFViewer="open"; | ||
| string defaultHTMLViewer="open"; | ||
| #else | ||
| -string defaultPSViewer="evince"; | ||
| -string defaultPDFViewer="evince"; | ||
| -string defaultHTMLViewer="google-chrome"; | ||
| +string defaultPSViewer="xdg-open"; | ||
| +string defaultPDFViewer="xdg-open"; | ||
| +string defaultHTMLViewer="xdg-open"; | ||
| #endif | ||
| string defaultGhostscript="gs"; | ||
| string defaultGhostscriptLibrary=""; | ||
| -string defaultDisplay="display"; | ||
| -string defaultAnimate="magick"; | ||
| +string defaultDisplay="xdg-open"; | ||
| +string defaultAnimate="xdg-open"; | ||
| void queryRegistry() {} | ||
| const string dirsep="/"; | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff '--color=auto' -r -U3 asymptote-3.01.orig/gc/Makefile.in asymptote-3.01/gc/Makefile.in | ||
| --- a/gc/Makefile.in | ||
| +++ b/gc/Makefile.in | ||
| @@ -2536,7 +2536,7 @@ distcleancheck: distclean | ||
| exit 1; } >&2 | ||
| check-am: all-am | ||
| $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_LTLIBRARIES) | ||
| - $(MAKE) $(AM_MAKEFLAGS) check-TESTS | ||
| +# $(MAKE) $(AM_MAKEFLAGS) check-TESTS | ||
| check: check-recursive | ||
| all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA) $(HEADERS) | ||
| install-checkPROGRAMS: install-libLTLIBRARIES |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| commit a0541fdbeb08247b8c97f2f01e922452ffb4bc9e | ||
| Author: Erik Zeek <zeekec@gmail.com> | ||
| Date: Mon Jul 21 20:21:07 2025 -0600 | ||
|
|
||
| Use boost/process/v1 for newer boosts | ||
|
|
||
| Signed-off-by: Erik Zeek <zeekec@gmail.com> | ||
|
|
||
| --- a/LspCpp/examples/StdIOClientExample.cpp | ||
| +++ b/LspCpp/examples/StdIOClientExample.cpp | ||
| @@ -17,7 +17,17 @@ | ||
| #include "LibLsp/JsonRpc/TcpServer.h" | ||
| #include "LibLsp/lsp/textDocument/document_symbol.h" | ||
| #include "LibLsp/lsp/workspace/execute_command.h" | ||
| + | ||
| +#include <boost/version.hpp> | ||
| +#if BOOST_VERSION >= 108800 // v2 is now default | ||
| +#define BOOST_PROCESS_VERSION 1 | ||
| +#include <boost/process/v1/child.hpp> | ||
| +#include <boost/process/v1/io.hpp> | ||
| +#include <boost/process/v1/pipe.hpp> | ||
| +#else | ||
| #include <boost/process.hpp> | ||
| +#endif | ||
| + | ||
| #include <boost/filesystem.hpp> | ||
| #include <boost/asio.hpp> | ||
| #include <iostream> | ||
| --- a/LspCpp/examples/StdIOServerExample.cpp | ||
| +++ b/LspCpp/examples/StdIOServerExample.cpp | ||
| @@ -16,7 +16,17 @@ | ||
| #include "LibLsp/JsonRpc/TcpServer.h" | ||
| #include "LibLsp/lsp/textDocument/document_symbol.h" | ||
| #include "LibLsp/lsp/workspace/execute_command.h" | ||
| + | ||
| +#include <boost/version.hpp> | ||
| +#if BOOST_VERSION >= 108800 // v2 is now default | ||
| +#define BOOST_PROCESS_VERSION 1 | ||
| +#include <boost/process/v1/child.hpp> | ||
| +#include <boost/process/v1/io.hpp> | ||
| +#include <boost/process/v1/pipe.hpp> | ||
| +#else | ||
| #include <boost/process.hpp> | ||
| +#endif | ||
| + | ||
| #include <boost/filesystem.hpp> | ||
| #include <boost/asio.hpp> | ||
| #include <iostream> | ||
| --- a/LspCpp/src/lsp/ParentProcessWatcher.cpp | ||
| +++ b/LspCpp/src/lsp/ParentProcessWatcher.cpp | ||
| @@ -1,6 +1,17 @@ | ||
| #include "LibLsp/lsp/ParentProcessWatcher.h" | ||
| #include <algorithm> | ||
| + | ||
| +#include <boost/version.hpp> | ||
| +#if BOOST_VERSION >= 108800 // v2 is now default | ||
| +#define BOOST_PROCESS_VERSION 1 | ||
| +#include <boost/process/v1/child.hpp> | ||
| +#include <boost/process/v1/io.hpp> | ||
| +#include <boost/process/v1/pipe.hpp> | ||
| +#include <boost/process/v1/system.hpp> | ||
| +#else | ||
| #include <boost/process.hpp> | ||
| +#error "V1" | ||
| +#endif | ||
|
|
||
| #ifdef _WIN32 | ||
| #include <boost/process/v1/windows.hpp> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| --- a/LspCpp/include/LibLsp/lsp/SimpleTimer.h | ||
| +++ b/LspCpp/include/LibLsp/lsp/SimpleTimer.h | ||
| @@ -1,10 +1,18 @@ | ||
| #pragma once | ||
| #include <thread> | ||
| #include <atomic> | ||
| +#include <chrono> | ||
| #include <functional> | ||
| #include <boost/asio.hpp> | ||
| +#include <boost/version.hpp> | ||
|
|
||
| -template<typename Duration = boost::posix_time::milliseconds> | ||
| +template<typename Duration = | ||
| +#if BOOST_VERSION > 108900 | ||
| + std::chrono::milliseconds | ||
| +#else | ||
| + boost::posix_time::milliseconds | ||
| +#endif | ||
| + > | ||
| class SimpleTimer | ||
| { | ||
| public: | ||
| @@ -44,6 +52,10 @@ private: | ||
| std::atomic_bool is_running_; | ||
| std::function<void()> call_back; | ||
| boost::asio::io_context _ios; | ||
| +#if BOOST_VERSION > 108900 | ||
| + boost::asio::system_timer _deadline_timer; | ||
| +#else | ||
| boost::asio::deadline_timer _deadline_timer; | ||
| +#endif | ||
| std::thread _thread; | ||
| }; | ||
| --- a/LspCpp/src/lsp/ParentProcessWatcher.cpp | ||
| +++ b/LspCpp/src/lsp/ParentProcessWatcher.cpp | ||
| @@ -1,5 +1,6 @@ | ||
| #include "LibLsp/lsp/ParentProcessWatcher.h" | ||
| #include <algorithm> | ||
| +#include <chrono> | ||
|
|
||
| #include <boost/version.hpp> | ||
| #if BOOST_VERSION >= 108800 // v2 is now default | ||
| @@ -29,7 +30,12 @@ using namespace std; | ||
|
|
||
| struct ParentProcessWatcher::ParentProcessWatcherData : std::enable_shared_from_this<ParentProcessWatcherData> | ||
| { | ||
| - std::unique_ptr<SimpleTimer<boost::posix_time::seconds>> timer; | ||
| +#if BOOST_VERSION > 108900 | ||
| + using WatcherDuration = std::chrono::seconds; | ||
| +#else | ||
| + using WatcherDuration = boost::posix_time::seconds; | ||
| +#endif | ||
| + std::unique_ptr<SimpleTimer<WatcherDuration>> timer; | ||
| lsp::Log& _log; | ||
| std::function<void()> on_exit; | ||
| lsp::ProcessIoService asio_io; | ||
| @@ -94,7 +100,7 @@ struct ParentProcessWatcher::ParentProce | ||
| ); | ||
| } | ||
|
|
||
| - self->timer = std::make_unique<SimpleTimer<boost::posix_time::seconds>>( | ||
| + self->timer = std::make_unique<SimpleTimer<WatcherDuration>>( | ||
| self->_poll_delay_secs, [=]() { self->run(); } | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -8512,9 +8512,6 @@ then : | ||
|
|
||
| if test "x$enable_gc" != "xno"; then | ||
| LSP_CMAKE_OPTIONS=$LSP_CMAKE_OPTIONS"-DLSPCPP_SUPPORT_BOEHM_GC=ON " | ||
| - if test "x$with_vcpkg" = "xno"; then | ||
| - LSP_CMAKE_OPTIONS=$LSP_CMAKE_OPTIONS"-DLSPCPP_GC_DOWNLOADED_ROOT=../\$(GC) " | ||
| - fi | ||
| else | ||
| LSP_CMAKE_OPTIONS=$LSP_CMAKE_OPTIONS"-DLSPCPP_SUPPORT_BOEHM_GC=OFF " | ||
| fi | ||
| @@ -9164,8 +9161,8 @@ if test "x$enable_gc" != "xno" ; then | ||
|
|
||
| printf "%s\n" "#define USEGC 1" >>confdefs.h | ||
|
|
||
| - GCLIB="\$(GC)/.libs/libgc.a" | ||
| - INCL=$INCL" -I\$(GC)/include" | ||
| + GCLIB="-lgc" | ||
| + # INCL=$INCL" -I\$(GC)/include" | ||
| { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $GCNAME is enabled" >&5 | ||
| printf "%s\n" "$as_me: $GCNAME is enabled" >&6;} | ||
| fi | ||
| --- a/memory.h | ||
| +++ b/memory.h | ||
| @@ -27,7 +27,7 @@ | ||
|
|
||
| #ifdef GC_DEBUG | ||
| extern "C" { | ||
| -#include <gc_backptr.h> | ||
| +#include <gc/gc_backptr.h> | ||
| } | ||
| #endif | ||
|
|
||
| @@ -40,8 +40,8 @@ void* asy_malloc_atomic(size_t n); | ||
| #define GC_MALLOC(sz) asy_malloc(sz) | ||
| #define GC_MALLOC_ATOMIC(sz) asy_malloc_atomic(sz) | ||
|
|
||
| -#include <gc_allocator.h> | ||
| -#include <gc_cpp.h> | ||
| +#include <gc/gc_allocator.h> | ||
| +#include <gc/gc_cpp.h> | ||
|
|
||
| #define gc_allocator gc_allocator_ignore_off_page | ||
|
|
||
| --- a/Makefile.in | ||
| +++ b/Makefile.in | ||
| @@ -176,11 +176,6 @@ $(LSP_ROOT)/liblspcpp.a: | ||
|
|
||
| all: asy sty man faq asy-keywords.el | ||
|
|
||
| -$(GCLIB): | ||
| - cd $(GC) && ln -sf ../libatomic_ops . && \ | ||
| - ./configure CC="$(CC)" CXX="$(CXX)" $(GCOPTIONS) | ||
| - $(MAKE) -C $(GC) check | ||
| - | ||
| sty: doc/version.texi | ||
| cd doc && $(MAKE) asy-latex.pdf | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| # Template file for 'asymptote' | ||
| pkgname=asymptote | ||
| version=3.05 | ||
| revision=1 | ||
| build_style=gnu-configure | ||
| configure_args="--with-latex=/usr/share/texmf/tex/latex | ||
| --with-context=/usr/share/texmf/tex/context/third" | ||
| hostmakedepends="bison flex texlive texlive-dvi texinfo pkg-config cmake | ||
| python3-PyQt5-devel-tools" | ||
| makedepends="fftw-devel gc-devel gsl-devel zlib-devel libtirpc-devel | ||
| glm libfreeglut-devel libcurl-devel | ||
| boost-devel-minimal readline-devel ncurses-devel" | ||
| checkdepends="dvisvgm" | ||
| short_desc="C++ like vector graphic language" | ||
| maintainer="Colin Teng <tfcolin@163.com>" | ||
| license="GPL-3.0-or-later" | ||
| homepage="http://asymptote.sourceforge.net/" | ||
| distfiles="${SOURCEFORGE_SITE}/asymptote/asymptote-${version}.src.tgz" | ||
| checksum=35c16d0a3bdd869a56e4efff4638f81c3a88b2f6b664d196471015dbf4c69a87 | ||
|
|
||
| if [ "$CROSS_BUILD" ]; then | ||
| hostmakedepends+=" asymptote" | ||
| fi | ||
|
|
||
| do_build() { | ||
| make $makejobs | ||
| if [ "$CROSS_BUILD" ]; then | ||
| cp /usr/share/asymptote/asy-keywords.el . | ||
| touch asy-keywords.el | ||
| sed -i 's![.][.]/asy!asy!' doc/Makefile | ||
| fi | ||
| make $makejobs all | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # Template file for 'dvisvgm' | ||
| pkgname=dvisvgm | ||
| version=3.6 | ||
| revision=1 | ||
| build_style=gnu-configure | ||
| configure_args="--with-ttfautohint" | ||
| hostmakedepends="pkg-config ttfautohint asciidoc xmlto libxslt" | ||
| makedepends="texlive-devel ghostscript-devel freetype-devel potrace-devel | ||
| brotli-devel woff2-devel xxHash-devel ttfautohint zlib-devel harfbuzz-devel" | ||
| short_desc="Fast DVI, EPS, and PDF to SVG converter" | ||
| maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>" | ||
| license="GPL-3.0-or-later" | ||
| homepage="https://dvisvgm.de/" | ||
| distfiles="https://github.com/mgieseki/dvisvgm/releases/download/${version}/dvisvgm-${version}.tar.gz" | ||
| checksum=26446bb3b10739ff0925c9e416b76d2d222075c9d5dcfafe6e214609d072ed1a |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please accept as the maintainer? I'm not familiar with c++ and boost.