02/11: gnu: openboardview: Update to 9.0.3.

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit c668d37276bf1331569821ad9b1284c7e2d5321e
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Nov 26 11:01:48 2022 +0100

    gnu: openboardview: Update to 9.0.3.
    
    * gnu/packages/electronics.scm (openboardview): Update to 9.0.3.
    [source](patches): Remove obsolete patch.
    * gnu/packages/patches/openboardview-use-system-utf8.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/electronics.scm                       |  7 ++--
 .../patches/openboardview-use-system-utf8.patch    | 48 ----------------------
 3 files changed, 3 insertions(+), 53 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index c2e4e2f357..bd8d391b05 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1602,7 +1602,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/onnx-shared-libraries.patch     \
   %D%/packages/patches/onnx-skip-model-downloads.patch         \
   %D%/packages/patches/openboardview-use-system-imgui.patch    \
-  %D%/packages/patches/openboardview-use-system-utf8.patch     \
   %D%/packages/patches/openbox-python3.patch                   \
   %D%/packages/patches/opencascade-oce-glibc-2.26.patch                \
   %D%/packages/patches/openfoam-4.1-cleanup.patch                      \
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 15e7318926..47885083c0 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -252,7 +252,7 @@ supported devices, as well as input/output file format 
support.")
 (define-public openboardview
   (package
     (name "openboardview")
-    (version "8.95.2")
+    (version "9.0.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -270,11 +270,10 @@ 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"
-                               "openboardview-use-system-utf8.patch"))
+               (search-patches "openboardview-use-system-imgui.patch"))
               (sha256
                (base32
-                "1n2yfi8wpky0y231kq2zdgwn7f7kff8m53m904hxi5ppmwhx1d6q"))))
+                "0wmplzgi3rpkcajdrnkxvqhgxrn6qdxa6vwgd24bm10ryyhiqw54"))))
     (build-system cmake-build-system)
     (arguments
      (list
diff --git a/gnu/packages/patches/openboardview-use-system-utf8.patch 
b/gnu/packages/patches/openboardview-use-system-utf8.patch
deleted file mode 100644
index 25b5952bda..0000000000
--- a/gnu/packages/patches/openboardview-use-system-utf8.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 251e23422f37c93a3f460fb660c5e5bfa8200d91 Mon Sep 17 00:00:00 2001
-From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
-Date: Sun, 2 Dec 2018 16:40:39 -0500
-Subject: [PATCH] build system: Allow using utf8.h from the system.
-
----
- src/CMakeLists.txt               | 12 ++++++++----
- src/openboardview/CMakeLists.txt |  1 +
- 2 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 90442ed..26d4a69 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -8,10 +8,14 @@ if(NOT WIN32 OR MINGW)
- endif()
- 
- ## utf8.h ##
--execute_process(
--      COMMAND git submodule update --init src/utf8
--      WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
--)
-+FIND_PATH(UTF8_INCLUDE_DIR utf8.h)
-+if(NOT UTF8_INCLUDE_DIR)
-+  execute_process(
-+    COMMAND git submodule update --init src/utf8
-+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-+    )
-+  set(UTF8_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/utf8)
-+endif()
- 
- ## zlib ##
- find_package(ZLIB)
-diff --git a/src/openboardview/CMakeLists.txt 
b/src/openboardview/CMakeLists.txt
-index b0bdbe3..6c4564c 100644
---- a/src/openboardview/CMakeLists.txt
-+++ b/src/openboardview/CMakeLists.txt
-@@ -44,6 +44,7 @@ include_directories(
-       ${CMAKE_CURRENT_SOURCE_DIR}
-       ${CMAKE_CURRENT_SOURCE_DIR}/..
-       ${IMGUI_INCLUDE_DIRS}
-+      ${UTF8_INCLUDE_DIR}
-       ${GLAD_INCLUDE_DIRS}
-       ${GTK_INCLUDE_DIRS}
-       ${OPENGL_INCLUDE_DIR}
--- 
-2.34.0
-