guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#63765] [PATCH v3 0/8] gnu: python-lief: Update to 0.13.2.


From: Hilton Chain
Subject: [bug#63765] [PATCH v3 0/8] gnu: python-lief: Update to 0.13.2.
Date: Fri, 23 Jun 2023 14:24:04 +0800

v1/v2 -> v3:
* Update python-lief to 0.13.2
* Fix build for mkvtoolnix and warzone2100.

(Diff range from v2 to v3 attached at the end.)

Hilton Chain (8):
  gnu: Add ftest-for-utfcpp.
  gnu: utfcpp: Update to 3.2.3.
  gnu: mbedtls-apache: Rename package to mbedtls-apache-lts.
  gnu: mbedtls-apache-for-hiawatha: Use inherited source.
  gnu: mbedtls-apache-lts: Update to 2.28.3.
  gnu: Add mbedtls-apache, version 3.4.0.
  gnu: Add frozen.
  gnu: python-lief: Update to 0.13.2.

 gnu/packages/cpp.scm              | 23 ++++++++
 gnu/packages/emulators.scm        |  2 +-
 gnu/packages/game-development.scm |  2 +-
 gnu/packages/games.scm            |  2 +-
 gnu/packages/hardware.scm         |  4 +-
 gnu/packages/haxe.scm             |  6 +-
 gnu/packages/irc.scm              |  2 +-
 gnu/packages/julia-jll.scm        |  2 +-
 gnu/packages/julia.scm            |  2 +-
 gnu/packages/linphone.scm         |  2 +-
 gnu/packages/linux.scm            |  2 +-
 gnu/packages/networking.scm       |  2 +-
 gnu/packages/python-xyz.scm       | 96 ++++++++++++++++++++++++++-----
 gnu/packages/search.scm           |  2 +-
 gnu/packages/textutils.scm        | 34 ++++++-----
 gnu/packages/tls.scm              | 50 +++++++---------
 gnu/packages/video.scm            |  7 ++-
 17 files changed, 166 insertions(+), 74 deletions(-)


base-commit: f25529b08e356f89ca7cecc44295085531a8faba
--
2.40.1

Diff range from v2 to v3:
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 83704dd720..9dbf5a3739 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5510,7 +5510,7 @@ (define-public warzone2100
                  (lambda _
                    (substitute* "lib/framework/wzstring.cpp"
                      (("<utfcpp/source/utf8.h>")
-                      "<utf8.h>"))))
+                      "<utf8cpp/utf8.h>"))))
                (add-after 'unpack 'link-tests-with-qt
                  (lambda _
                    (substitute* "tests/Makefile.am"
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 901007bf4a..622867a499 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -33142,7 +33142,7 @@ (define-public python-misskey
 (define-public python-lief
   (package
     (name "python-lief")
-    (version "0.13.1")
+    (version "0.13.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -33179,7 +33179,7 @@ (define-public python-lief
                        \"-DLIEF_OPT_UTFCPP_EXTERNAL=ON\"]"))))
               (sha256
                (base32
-                "0ms6zsb6mm6jys8nbfl2nml4l2y1zcgy26639adznj4n7b8n7lxk"))))
+                "0y48x358ppig5xp97ahcphfipx7cg9chldj2q5zrmn610fmi4zll"))))
     (build-system cmake-build-system)
     (arguments
      (list #:modules
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 49c7907260..1fe11dcc8a 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1048,6 +1048,11 @@ (define-public mkvtoolnix
              "--enable-precompiled-headers=no")
         #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'fix-utfcpp-include
+           (lambda _
+             (substitute* "src/common/strings/utf8.cpp"
+               (("<utf8.h>")
+                "<utf8cpp/utf8.h>"))))
          (add-after 'unpack 'patch-relative-file-names
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))





reply via email to

[Prev in Thread] Current Thread [Next in Thread]