[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
290/416: gnu: openboardview: Update to 9.95.0.
From: |
guix-commits |
Subject: |
290/416: gnu: openboardview: Update to 9.95.0. |
Date: |
Fri, 14 Apr 2023 15:26:06 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 49b5e7e93c0295f5edbac93ed5f5a904f9842ad6
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Mar 31 16:21:38 2023 -0400
gnu: openboardview: Update to 9.95.0.
* gnu/packages/electronics.scm (openboardview): Update to 9.95.0.
[source]: Apply patch.
[arguments]: Update fix-utf8-include-directive phase.
[inputs]: Add orangeduck-mpc.
* gnu/packages/patches/openboardview-use-system-mpc.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
gnu/local.mk | 1 +
gnu/packages/electronics.scm | 11 +++---
.../patches/openboardview-use-system-mpc.patch | 42 ++++++++++++++++++++++
3 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 3c188cf1f7..436b6b9e81 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1618,6 +1618,7 @@ dist_patch_DATA =
\
%D%/packages/patches/onnx-skip-model-downloads.patch \
%D%/packages/patches/openbios-aarch64-riscv64-support.patch \
%D%/packages/patches/openboardview-use-system-imgui.patch \
+ %D%/packages/patches/openboardview-use-system-mpc.patch \
%D%/packages/patches/openbox-python3.patch \
%D%/packages/patches/openfoam-4.1-cleanup.patch \
%D%/packages/patches/openjdk-10-idlj-reproducibility.patch \
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 4d7f4d2e05..5ab9662551 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -252,7 +252,7 @@ supported devices, as well as input/output file format
support.")
(define-public openboardview
(package
(name "openboardview")
- (version "9.0.3")
+ (version "9.95.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -270,10 +270,11 @@ supported devices, as well as input/output file format
support.")
(delete-file-recursively f)))
(scandir "." (negate (cut member <> keep))))))
(patches
- (search-patches "openboardview-use-system-imgui.patch"))
+ (search-patches "openboardview-use-system-imgui.patch"
+ "openboardview-use-system-mpc.patch"))
(sha256
(base32
- "0wmplzgi3rpkcajdrnkxvqhgxrn6qdxa6vwgd24bm10ryyhiqw54"))))
+ "1safjd729a7591rigkiy3c678bivrj5q1qwg1f18sijhlsfkf5b3"))))
(build-system cmake-build-system)
(arguments
(list
@@ -302,6 +303,7 @@ supported devices, as well as input/output file format
support.")
;; directly rather than "utf8/utf8.h".
(lambda _
(substitute* '("src/openboardview/FileFormats/BRDFile.cpp"
+ "src/openboardview/FileFormats/BRDFileBase.cpp"
"src/openboardview/BoardView.cpp")
(("utf8/utf8.h") "utf8.h"))))
(add-before 'configure 'dynamically-load-gtk-via-absolute-path
@@ -327,6 +329,7 @@ supported devices, as well as input/output file format
support.")
(list fontconfig
gtk+
imgui
+ orangeduck-mpc
sdl2
sqlite
zlib))
diff --git a/gnu/packages/patches/openboardview-use-system-mpc.patch
b/gnu/packages/patches/openboardview-use-system-mpc.patch
new file mode 100644
index 0000000000..7726c55fe8
--- /dev/null
+++ b/gnu/packages/patches/openboardview-use-system-mpc.patch
@@ -0,0 +1,42 @@
+Upstream status: https://github.com/OpenBoardView/OpenBoardView/pull/281
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 452dfa9..e30c3cf 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -206,13 +206,15 @@ endif()
+ add_definitions(-DSTBI_FAILURE_USERMSG)
+
+ ## mpc - Micro Parser Combinators ##
+-execute_process(
+- COMMAND git submodule update --init src/mpc
+- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+-)
+-
+-add_library(mpc STATIC "mpc/mpc.c")
+-
++pkg_check_modules(MPC QUIET mpc)
++if(NOT MPC_FOUND)
++ execute_process(
++ COMMAND git submodule update --init src/mpc
++ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
++ )
++ add_library(mpc STATIC "mpc/mpc.c")
++ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/mpc)
++endif()
+
+ ## OpenBoardView ##
+ add_subdirectory(openboardview)
+diff --git a/src/openboardview/FileFormats/GenCADFile.h
b/src/openboardview/FileFormats/GenCADFile.h
+index 1ccf8df..c57f7ff 100644
+--- a/src/openboardview/FileFormats/GenCADFile.h
++++ b/src/openboardview/FileFormats/GenCADFile.h
+@@ -5,7 +5,7 @@
+
+ #include "build-generated/GenCADFileGrammar.h"
+
+-#include "mpc/mpc.h"
++#include "mpc.h"
+
+ #include <map>
+ #include <string>
- 247/416: gnu: qtscript: Update to 5.15.8., (continued)
- 247/416: gnu: qtscript: Update to 5.15.8., guix-commits, 2023/04/14
- 255/416: gnu: qtdatavis3d: Update to 5.15.8., guix-commits, 2023/04/14
- 259/416: gnu: qtwebengine-5: Update to 5.15.8., guix-commits, 2023/04/14
- 261/416: gnu: kcodecs: Update to 5.104.0., guix-commits, 2023/04/14
- 267/416: gnu: ruby-pg: Update to 1.4.6., guix-commits, 2023/04/14
- 271/416: gnu: hdf5@1.12: Update to 1.12.2., guix-commits, 2023/04/14
- 274/416: gnu: go-1.17: Update to 1.17.13., guix-commits, 2023/04/14
- 277/416: gnu: sdl2: Update to 2.26.2., guix-commits, 2023/04/14
- 281/416: gnu: python-geventhttpclient: Update to 2.0.9., guix-commits, 2023/04/14
- 291/416: gnu: openboardview: Update home page., guix-commits, 2023/04/14
- 290/416: gnu: openboardview: Update to 9.95.0.,
guix-commits <=
- 306/416: gnu: gst-plugins-good: Skip the test_video_caps_late test., guix-commits, 2023/04/14
- 315/416: gnu: rust-pyo3-0.15: Fix build., guix-commits, 2023/04/14
- 318/416: gnu: Add rust-iana-time-zone-haiku-0.1., guix-commits, 2023/04/14
- 319/416: gnu: Add rust-iana-time-zone-0.1., guix-commits, 2023/04/14
- 196/416: gnu: rust-crates-io-0.33: Update to 0.33.1., guix-commits, 2023/04/14
- 197/416: gnu: rust-curl-0.4: Update to 0.4.43., guix-commits, 2023/04/14
- 200/416: gnu: rust-opener: Update to 0.5.0., guix-commits, 2023/04/14
- 219/416: gnu: webkitgtk: Update to 2.40.0., guix-commits, 2023/04/14
- 223/416: gnu: pjproject: Update to 2.13., guix-commits, 2023/04/14
- 224/416: gnu: jami: Update to 20230323.0., guix-commits, 2023/04/14