10/20: (do not upstream) netsurf fb stuff

[guix-commits]

nckx pushed a commit to branch mol
in repository guix.

commit 1fdf924f186b409b346007c324634898f064d149
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Oct 15 02:00:00 2023 +0200

    (do not upstream) netsurf fb stuff
    
    Change-Id: I9314a553384d832a3675db8d10245af064ecbd49
---
 gnu/packages/web.scm | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 6c9af8c1e6..1f60e7b5f1 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6184,24 +6184,27 @@ w3c webidl files and a binding configuration file.")
            pkg-config
            xxd))
     (inputs
-     `(("curl" ,curl)
-       ("gtk+" ,gtk+)
-       ("openssl" ,openssl)
-       ("utf8proc" ,utf8proc)
-       ("libpng" ,libpng)
-       ("libjpeg" ,libjpeg-turbo)
-       ("libcss" ,libcss)
-       ("libdom" ,libdom)
-       ("libnsbmp" ,libnsbmp)
-       ("libnsgif" ,libnsgif)
-       ("libnslog" ,libnslog)
-       ("libnspsl" ,libnspsl)
-       ("libnsutils" ,libnsutils)
-       ("libsvgtiny" ,libsvgtiny)
-       ("miscfiles" ,miscfiles)))
+     (list curl
+       libnsfb
+       openssl
+       ;("utf8proc" ,utf8proc)
+       libpng
+       ijg-libjpeg
+       libcss
+       libdom
+       libnsbmp
+       libnsgif
+       ;("libnslog" ,libnslog)
+       ;("libnspsl" ,libnspsl)
+       libnsutils
+       libsvgtiny
+       ;("miscfiles" ,miscfiles)
+       sdl))                   ;for libnsfb, see comment there
     (arguments
-     `(#:make-flags `("CC=gcc" "BUILD_CC=gcc"
-                      "TARGET=gtk3"
+     `(#:tests? #f
+       #:make-flags `("CC=gcc" "BUILD_CC=gcc"
+                      "TARGET=framebuffer"
+                      "NETSURF_USE_UTF8PROC=NO"
                       ,(string-append "PREFIX=" %output)
                       ,(string-append "NSSHARED="
                                       (assoc-ref %build-inputs
@@ -6268,12 +6271,7 @@ w3c webidl files and a binding configuration file.")
                       (x x)))
                   out)))
              #t))
-         (add-before 'check 'patch-check
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* '("test/bloom.c" "test/hashtable.c")
-               (("/usr/share/dict/words")
-                (search-input-file inputs "/share/web2")))
-             #t))
+         (delete 'check)
          (add-after 'install 'install-more
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))