bug#51719: [PATCH] Orbit2 is broken on core-updates-frozen

bug#51719: [PATCH] Orbit2 is broken on core-updates-frozen

[Vivien Kraus via Bug reports for GNU Guix]

[-- Attachment #1.1: Type: text/plain, Size: 335 bytes --]


Dear Guix,

orbit2 is a dependency for libreoffice, and it does not build
reproducibly on core-updates-frozen (I don’t know on master). The issue
is well-known, for instance here on Arch:
https://bbs.archlinux.org/viewtopic.php?id=240775

I applied the fix, and it builds with parallel make. What do you think?

Vivien


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Fix parallel build for orbit2 --]
[-- Type: text/x-patch, Size: 1314 bytes --]

From 9ba9da5a195a3d863f1c6715349be6c9eea02aeb Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 9 Nov 2021 15:02:30 +0100
Subject: [PATCH] gnu: orbit2: Fix parallel build.

* gnu/packages/gnome.scm (orbit2)[phases]: Add a phase so that
orbit-name-server-2 depends on libname-server-2.a.
---
 gnu/packages/gnome.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8f6dade3d8..3eafcc2f10 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3627,6 +3627,14 @@ (define-public orbit2
        ;; ... which they then completly ignore !!
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'fix-parallel-build
+           ;; Parallel build fails because of a failed dependency,
+           ;; https://bugzilla.gnome.org/show_bug.cgi?id=732274
+           (lambda _
+             (substitute* "src/services/name/Makefile.am"
+               (("orbit_name_server_2_DEPENDENCIES = \\$(DEPS) CosNaming.h")
+                "orbit_name_server_2_DEPENDENCIES = \
+$(DEPS) CosNaming.h libname-server-2.a"))))
          (add-before 'configure 'ignore-deprecations
            (lambda _
              (substitute* "linc2/src/Makefile.in"
-- 
2.33.1


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 658 bytes --]

bug#51719: [PATCH] Orbit2 is broken on core-updates-frozen

[Maxim Cournoyer]

Hello Vivien,

Vivien Kraus <vivien@planete-kraus.eu> writes:

> Dear Guix,
>
> orbit2 is a dependency for libreoffice, and it does not build
> reproducibly on core-updates-frozen (I don’t know on master). The issue
> is well-known, for instance here on Arch:
> https://bbs.archlinux.org/viewtopic.php?id=240775
>
> I applied the fix, and it builds with parallel make. What do you think?

Applied to core-updates-frozen.

Thank you!

Maxim