[bug#57931] September 2022 i686 big breakage

[bug#57931] September 2022 i686 big breakage

[Denis 'GNUtoo' Carikli]

[-- Attachment #1: Type: text/plain, Size: 254 bytes --]

Hi,

some crucial packages were made unavailable again for i686.

I'm not sure how to tackle that and I might not manage to fix it all
alone.

At least I can send the first patches I have, and then send more
patches to this bugreport.

Denis.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#57931] [PATCH v1 1/6] gnu: directfb: Build with librsvg-for-system.

[Denis 'GNUtoo' Carikli]

* gnu/packages/graphics.scm (directfb)[inputs]:
  Replace librsvg with librsvg-for-system.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 gnu/packages/graphics.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index fe38e7d03f..f968a3f558 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -32,6 +32,7 @@
 ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2022 Tobias Kortkamp <tobias.kortkamp@gmail.com>
 ;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
+;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -210,7 +211,7 @@ (define-public directfb
        ("opengl" ,mesa)
        ("png" ,libpng)
        ("sdl" ,sdl)
-       ("svg" ,librsvg)
+       ("svg" ,(librsvg-for-system))
        ("tiff" ,libtiff)
        ("tslib" ,tslib)
        ("vdpau" ,libvdpau)

base-commit: 25adb336bcb0188a92ecbe6b9c1d9d3e3a8b59e4
-- 
2.37.3

[bug#57931] [PATCH v1 2/6] gnu: gst-plugins-bad: Build with librsvg-for-system.

[Denis 'GNUtoo' Carikli]

* gnu/packages/gstreamer.scm (gst-plugins-bad)[inputs]:
  Replace librsvg with librsvg-for-system.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 gnu/packages/gstreamer.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index a1503602ad..70e3d6b764 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2020 Liliana Marie Prikler <liliana.prikler@gmail.com>
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -850,7 +851,7 @@ (define-public gst-plugins-bad
        ("libnice" ,libnice)
        ("libofa" ,libofa)
        ("libopenmpt" ,libopenmpt)
-       ("librsvg" ,librsvg)
+       ("librsvg" ,(librsvg-for-system))
        ("libsndfile" ,libsndfile)
        ("libsrtp" ,libsrtp)
        ("libssh2" ,libssh2)
-- 
2.37.3

[bug#57931] [PATCH v1 3/6] gnu: openexr: apply guix style.

[Denis 'GNUtoo' Carikli]

* gnu/packages/graphics.scm (openexr): apply guix style.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 gnu/packages/graphics.scm | 42 +++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index f968a3f558..54ee3994e8 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1119,29 +1119,29 @@ (define-public openexr
   (package
     (name "openexr")
     (version "3.1.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/AcademySoftwareFoundation/openexr")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0c9vla0kbsbbhkk42jlbf94nzfb1anqh7dy9b0b3nna1qr6v4bh6"))))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url
+                     "https://github.com/AcademySoftwareFoundation/openexr")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0c9vla0kbsbbhkk42jlbf94nzfb1anqh7dy9b0b3nna1qr6v4bh6"))))
     (build-system cmake-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         ;; /var/tmp does not exist in the Guix build environment
-         (add-after 'unpack 'patch-test-directory
-           (lambda _
-             (substitute* '("src/test/OpenEXRUtilTest/tmpDir.h"
-                            "src/test/OpenEXRFuzzTest/tmpDir.h"
-                            "src/test/OpenEXRTest/tmpDir.h"
-                            "src/test/OpenEXRCoreTest/main.cpp")
-               (("/var/tmp") "/tmp")))))))
-    (inputs
-     (list imath zlib))
+     '(#:phases (modify-phases %standard-phases
+                  ;; /var/tmp does not exist in the Guix build environment
+                  (add-after 'unpack 'patch-test-directory
+                    (lambda _
+                      (substitute* '("src/test/OpenEXRUtilTest/tmpDir.h"
+                                     "src/test/OpenEXRFuzzTest/tmpDir.h"
+                                     "src/test/OpenEXRTest/tmpDir.h"
+                                     "src/test/OpenEXRCoreTest/main.cpp")
+                        (("/var/tmp")
+                         "/tmp")))))))
+    (inputs (list imath zlib))
     (home-page "https://www.openexr.com/")
     (synopsis "High-dynamic-range file format library")
     (description
-- 
2.37.3

[bug#57931] [PATCH v1 4/6] gnu: openexr: Skip failing tests on i686.

[Denis 'GNUtoo' Carikli]

* gnu/packages/graphics.scm (openexr)[arguments]:
  Add phase to disable failing tests on i686.
---
 gnu/packages/graphics.scm | 45 ++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 54ee3994e8..4ac7440976 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1131,16 +1131,41 @@ (define-public openexr
                 "0c9vla0kbsbbhkk42jlbf94nzfb1anqh7dy9b0b3nna1qr6v4bh6"))))
     (build-system cmake-build-system)
     (arguments
-     '(#:phases (modify-phases %standard-phases
-                  ;; /var/tmp does not exist in the Guix build environment
-                  (add-after 'unpack 'patch-test-directory
-                    (lambda _
-                      (substitute* '("src/test/OpenEXRUtilTest/tmpDir.h"
-                                     "src/test/OpenEXRFuzzTest/tmpDir.h"
-                                     "src/test/OpenEXRTest/tmpDir.h"
-                                     "src/test/OpenEXRCoreTest/main.cpp")
-                        (("/var/tmp")
-                         "/tmp")))))))
+     (list #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'patch-test-directory
+                          (lambda _
+                            (substitute* (list
+                                          "src/test/OpenEXRUtilTest/tmpDir.h"
+                                          "src/test/OpenEXRFuzzTest/tmpDir.h"
+                                          "src/test/OpenEXRTest/tmpDir.h"
+                                          "src/test/OpenEXRCoreTest/main.cpp")
+                              (("/var/tmp")
+                               "/tmp"))))
+                        #$@(if (not (target-64bit?))
+                               (list #~(add-after 'patch-test-directory
+                                                  'disable-broken-tests
+                                                  (lambda _
+                                                    (substitute*
+						     (list
+						      "src/test/OpenEXRCoreTest/main.cpp"
+						      "src/test/OpenEXRTest/main.cpp")
+                                                      (("TEST \\(testCompression, \"basic\"\\);")
+                                                       "")
+                                                      (("TEST\\( testNoCompression, \"core_compression\" \\);")
+                                                       "")
+                                                      (("TEST\\( testRLECompression, \"core_compression\" \\);")
+                                                       "")
+                                                      (("TEST\\( testZIPCompression, \"core_compression\" \\);")
+                                                       "")
+                                                      (("TEST\\( testZIPSCompression, \"core_compression\" \\);")
+                                                       "")
+                                                      (("TEST\\( testB44Compression, \"core_compression\" \\);")
+                                                       "")
+                                                      (("TEST\\( testB44ACompression, \"core_compression\" \\);")
+                                                       "")
+                                                      (("TEST \\(testOptimizedInterleavePatterns, \"basic\"\\);")
+                                                       "")))))
+                               (list)))))
     (inputs (list imath zlib))
     (home-page "https://www.openexr.com/")
     (synopsis "High-dynamic-range file format library")
-- 
2.37.3

[bug#57931] [PATCH v1 5/6] gnu: gtk: Use librsvg-2.40 for non-x86_64.

[Denis 'GNUtoo' Carikli]

* gnu/packages/gtk.scm (gtk)[propagated-inputs]:
  Use librsvg-2.40 for non-x86_64.
---
 gnu/packages/gtk.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 4cdc8d090a..8c35696aaf 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -31,6 +31,7 @@
 ;;; Copyright © 2021 Wamm K. D. <jaft.r@outlook.com>
 ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
 ;;; Copyright © 2022 Benjamin Slade <slade@lambda-y.net>
+;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1340,7 +1341,9 @@ (define-public gtk
      ;; Following dependencies are referenced in .pc files.
      (list cairo
            fontconfig
-           librsvg-bootstrap
+           (if (target-x86-64?)
+             librsvg-bootstrap
+             librsvg-2.40)
            glib
            graphene
            libepoxy
-- 
2.37.3

[bug#57931] [PATCH v1 6/6] gnu: gst-plugins-bad: remove svt-hevc for i686.

[Denis 'GNUtoo' Carikli]

* gnu/packages/gstreamer.scm(gst-plugins-bad)[inputs]:
  remove svt-hevc to avoid compilation failure.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 gnu/packages/gstreamer.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 70e3d6b764..4e8ddd0b92 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -890,7 +890,7 @@ (define-public gst-plugins-bad
        ("soundtouch" ,soundtouch)
        ("spandsp" ,spandsp)
        ("srt" ,srt)
-       ,@(if (target-x86?)
+       ,@(if (target-x86-64?)
            `(("svthevcenc" ,svt-hevc))
            '())
        ("tinyalsa" ,tinyalsa)
-- 
2.37.3

[bug#57931] September 2022 i686 big breakage

[Denis 'GNUtoo' Carikli]

[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]

On Mon, 19 Sep 2022 12:49:16 +0200
Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> wrote:

> Hi,
> 
> some crucial packages were made unavailable again for i686.
> 
> I'm not sure how to tackle that and I might not manage to fix it all
> alone.
> 
> At least I can send the first patches I have, and then send more
> patches to this bugreport.

The gst-plugins-bad package also doesn't pass the tests on i686.
I've managed to find how to disable tests with the following diff:
> +         ,@(if (string-prefix? "i686" (or (%current-target-system)
> +                                          (%current-system)))
> +               ;; Disable test that fails on i686.
> +               `((add-after 'unpack 'disable-camerabin-test
> +                   (lambda _
> +                     (substitute* "tests/check/meson.build"
> +                       (("\\[\\['elements/camerabin\\.c'\\]\\],")
> +                        "")))))
> +               '())
This workarounds the fact that camerabin times out. After waiting 600
seconds it also timesout so something is not right here.

After that I still have 3 failures:
> 16/66 elements_mpegtsmux             FAIL
> 0.22s   killed by signal 13 SIGPIPE
> 40/66 libs_planaraudioadapter        FAIL
> 0.18s   killed by signal 13 SIGPIPE
> 57/66 elements_jifmux                FAIL
> 0.18s   killed by signal 13 SIGPIPE

PS: I also need to rest (I'm currently ill) else it's me that will
    probably get killed, so there might be some delays in my responses
    depending on my state. The fact that I depend on i686 doesn't make
    this easy for me.

Denis.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#57931] September 2022 i686 big breakage

[Denis 'GNUtoo' Carikli]

[-- Attachment #1: Type: text/plain, Size: 253 bytes --]

Hi again,

In addition to all the patches I sent before, If I also disable
tests in upower (the test_battery_energy_charge_mixed test fails
because of a python rounding error), I can guix system reconfigure my
previous system.scm again.

Denis.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#57931] i686 fixes patches duplication

[Denis 'GNUtoo' Carikli]

[-- Attachment #1: Type: text/plain, Size: 780 bytes --]

Hi Ludovic,

I'm adding you to this bug report because we happened to have made
similar patches that were implemented separately[1].

While it's really good that the fixes went in, it's not ideal to have
duplication of work, so in order to avoid further duplication of work
I'm adding you to this bug report.

The patch for upower is not needed anymore, and some of the librsvg
patches are already in thanks to your work.

However remains some of the patches like for GTK+ that are not in, and
some of them might not be 100% ready (like the ones were testing is
disabled in a not very granular way).

References:
-----------
[1]An example is the 3714c8bdcdf997c3c0cd448ba003d95913139c1d ("gnu:
   gst-plugins-bad: Use 'librsvg-for-system'.") commit.

Denis.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#57931: September 2022 i686 big breakage

[Ludovic Courtès]

Hi Denis,

Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> skribis:

> I'm adding you to this bug report because we happened to have made
> similar patches that were implemented separately[1].
>
> While it's really good that the fixes went in, it's not ideal to have
> duplication of work, so in order to avoid further duplication of work
> I'm adding you to this bug report.

Oops, my bad; I had completely overlooked this patch series of yours.
Apologies!

> The patch for upower is not needed anymore, and some of the librsvg
> patches are already in thanks to your work.
>
> However remains some of the patches like for GTK+ that are not in, and
> some of them might not be 100% ready (like the ones were testing is
> disabled in a not very granular way).

I’ve applied the openexr and gtk patches that are in this issue, and
with that I think we’re done.

Please let me know if you have more of these!

Thanks,
Ludo’.