Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / 
asymptote


Commits:
d20f25ac by Antonio Rojas at 2025-02-07T09:15:40+01:00
upgpkg: 2.96-2: boost 1.87 rebuild

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- + boost-1.87.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = asymptote
        pkgdesc = A vector graphics language (like metapost)
        pkgver = 2.96
-       pkgrel = 1
+       pkgrel = 2
        url = http://asymptote.sourceforge.net/
        arch = x86_64
        license = GPL-3.0-only
@@ -35,6 +35,8 @@ pkgbase = asymptote
        optdepends = python-cson: for the xasy GUI
        optdepends = ghostscript: PDF output
        source = git+https://github.com/vectorgraphics/asymptote#tag=2.96
+       source = boost-1.87.patch
        sha256sums = 
bb09317ac784d31c29d2e171981676bac0100fe686c6ea43ef1dfb80d2190ef7
+       sha256sums = 
7abb1190b06563365ab9a9191b0185d0cfcbcdd9c37e4e562ffa962022292112
 
 pkgname = asymptote


=====================================
PKGBUILD
=====================================
@@ -5,7 +5,7 @@
 
 pkgname=asymptote
 pkgver=2.96
-pkgrel=1
+pkgrel=2
 pkgdesc='A vector graphics language (like metapost)'
 arch=(x86_64)
 url='http://asymptote.sourceforge.net/'
@@ -39,12 +39,16 @@ makedepends=(boost
 optdepends=('python-pyqt5: for the xasy GUI'
             'python-cson: for the xasy GUI'
             'ghostscript: PDF output')
-source=(git+https://github.com/vectorgraphics/asymptote#tag=$pkgver)
-sha256sums=('bb09317ac784d31c29d2e171981676bac0100fe686c6ea43ef1dfb80d2190ef7')
+source=(git+https://github.com/vectorgraphics/asymptote#tag=$pkgver
+        boost-1.87.patch)
+sha256sums=('bb09317ac784d31c29d2e171981676bac0100fe686c6ea43ef1dfb80d2190ef7'
+            '7abb1190b06563365ab9a9191b0185d0cfcbcdd9c37e4e562ffa962022292112')
 
 prepare() {
   cd $pkgname
   ./autogen.sh
+
+  patch -p1 -i ../boost-1.87.patch # Fix build with boost 1.87
 }
 
 build() {


=====================================
boost-1.87.patch
=====================================
@@ -0,0 +1,64 @@
+diff --git a/LspCpp/include/LibLsp/lsp/ProcessIoService.h 
b/LspCpp/include/LibLsp/lsp/ProcessIoService.h
+index 0c4b89781..6f7e216a4 100644
+--- a/LspCpp/include/LibLsp/lsp/ProcessIoService.h
++++ b/LspCpp/include/LibLsp/lsp/ProcessIoService.h
+@@ -8,13 +8,13 @@ class ProcessIoService
+ {
+ public:
+     using IOService = boost::asio::io_context;
+-    using Work = boost::asio::io_context::work;
++    using Work = 
boost::asio::executor_work_guard<boost::asio::io_context::executor_type>;
+     using WorkPtr = std::unique_ptr<Work>;
+ 
+     ProcessIoService()
+     {
+ 
+-        work_ = std::unique_ptr<Work>(new Work(ioService_));
++        work_ = std::unique_ptr<Work>(new Work(ioService_.get_executor()));
+         auto temp_thread_ = new std::thread([this] { ioService_.run(); });
+         thread_ = std::unique_ptr<std::thread>(temp_thread_);
+     }
+diff --git a/LspCpp/src/jsonrpc/TcpServer.cpp 
b/LspCpp/src/jsonrpc/TcpServer.cpp
+index 6d2a09790..3fcea5f8a 100644
+--- a/LspCpp/src/jsonrpc/TcpServer.cpp
++++ b/LspCpp/src/jsonrpc/TcpServer.cpp
+@@ -190,7 +190,7 @@ struct TcpServer::Data
+     /// The io_context used to perform asynchronous operations.
+     boost::asio::io_context io_context_;
+ 
+-    std::shared_ptr<boost::asio::io_context::work> work;
++    
std::shared_ptr<boost::asio::executor_work_guard<boost::asio::io_context::executor_type>>
 work;
+ 
+     std::shared_ptr<tcp_connect_session> _connect_session;
+     /// Acceptor used to listen for incoming connections.
+@@ -213,7 +213,7 @@ TcpServer::TcpServer(
+ 
+ {
+ 
+-    d_ptr->work = 
std::make_shared<boost::asio::io_context::work>(d_ptr->io_context_);
++    d_ptr->work = 
std::make_shared<boost::asio::executor_work_guard<boost::asio::io_context::executor_type>>(d_ptr->io_context_.get_executor());
+ 
+     // Open the acceptor with the option to reuse the address (i.e. 
SO_REUSEADDR).
+     boost::asio::ip::tcp::resolver resolver(d_ptr->io_context_);
+diff --git a/LspCpp/src/jsonrpc/WebSocketServer.cpp 
b/LspCpp/src/jsonrpc/WebSocketServer.cpp
+index 4ea92d687..7c4baeee0 100644
+--- a/LspCpp/src/jsonrpc/WebSocketServer.cpp
++++ b/LspCpp/src/jsonrpc/WebSocketServer.cpp
+@@ -113,7 +113,7 @@ struct WebSocketServer::Data
+     /// The io_context used to perform asynchronous operations.
+     boost::asio::io_context io_context_;
+ 
+-    std::shared_ptr<boost::asio::io_context::work> work;
++    
std::shared_ptr<boost::asio::executor_work_guard<boost::asio::io_context::executor_type>>
 work;
+ 
+     /// Acceptor used to listen for incoming connections.
+     boost::asio::ip::tcp::acceptor acceptor_;
+@@ -217,7 +217,7 @@ WebSocketServer::WebSocketServer(
+ 
+ {
+ 
+-    d_ptr->work = 
std::make_shared<boost::asio::io_context::work>(d_ptr->io_context_);
++    d_ptr->work = 
std::make_shared<boost::asio::executor_work_guard<boost::asio::io_context::executor_type>>(d_ptr->io_context_.get_executor());
+ 
+     // Open the acceptor with the option to reuse the address (i.e. 
SO_REUSEADDR).
+     boost::asio::ip::tcp::resolver resolver(d_ptr->io_context_);



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/asymptote/-/commit/d20f25acab4c7485c650a5d00408d8f314d05c0f

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/asymptote/-/commit/d20f25acab4c7485c650a5d00408d8f314d05c0f
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to