* [bug#61865] [PATCH 1/8] gnu: xcb-util-wm: fix riscv64 cross-compile.
[not found] <cover.1677572540.git.873216071@qq.com>
@ 2023-02-28 8:33 ` Z572 via Guix-patches via
2023-02-28 8:33 ` [bug#61865] [PATCH 2/8] gnu: libxv: " Z572 via Guix-patches via
` (6 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Z572 via Guix-patches via @ 2023-02-28 8:33 UTC (permalink / raw)
To: 61865
* gnu/packages/xorg.scm (xcb-util-wm): fix riscv64 cross-compile.
[arguments]: add update-config-scripts phases when target is riscv64.
[native-inputs]: add CONFIG when target is riscv64.
---
gnu/packages/xorg.scm | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index a43809e3cb..32be732eef 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5792,11 +5792,27 @@ (define-public xcb-util-wm
"0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"))))
(build-system gnu-build-system)
(arguments
- '(#:configure-flags '("--disable-static")))
+ `(#:configure-flags '("--disable-static")
+ ,@(if (target-riscv64?)
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'update-config-scripts
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ ;; Replace outdated config.guess and config.sub.
+ (for-each (lambda (file)
+ (install-file
+ (search-input-file
+ (or native-inputs inputs)
+ (string-append "/bin/" file)) "."))
+ '("config.guess" "config.sub"))))))
+ '())))
(propagated-inputs
(list libxcb))
(native-inputs
- (list m4 pkg-config))
+ (append (if (target-riscv64?)
+ (list config)
+ '())
+ (list m4 pkg-config)))
(home-page "https://cgit.freedesktop.org/xcb/util-wm/")
(synopsis "Client and window-manager helpers for ICCCM and EWMH")
(description
--
2.39.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [bug#61865] [PATCH 2/8] gnu: libxv: fix riscv64 cross-compile.
[not found] <cover.1677572540.git.873216071@qq.com>
2023-02-28 8:33 ` [bug#61865] [PATCH 1/8] gnu: xcb-util-wm: fix riscv64 cross-compile Z572 via Guix-patches via
@ 2023-02-28 8:33 ` Z572 via Guix-patches via
2023-06-04 12:19 ` Efraim Flashner
2023-02-28 8:33 ` [bug#61865] [PATCH 3/8] gnu: libxtst: " Z572 via Guix-patches via
` (5 subsequent siblings)
7 siblings, 1 reply; 11+ messages in thread
From: Z572 via Guix-patches via @ 2023-02-28 8:33 UTC (permalink / raw)
To: 61865
* gnu/packages/xorg.scm(libxv): fix riscv64 cross-compile
[arguments]: when target is riscv64, add phase to update config.{guess,sub}
[native-inputs]: when target is riscv64, add config.
---
gnu/packages/xorg.scm | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 32be732eef..2b6f9fa369 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -4696,13 +4696,29 @@ (define-public libxv
"125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags '(,@(malloc0-flags) "--disable-static")))
+ `(#:configure-flags '(,@(malloc0-flags) "--disable-static")
+ ,@(if (target-riscv64?)
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'update-config-scripts
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ ;; Replace outdated config.guess and config.sub.
+ (for-each (lambda (file)
+ (install-file
+ (search-input-file
+ (or native-inputs inputs)
+ (string-append "/bin/" file)) "."))
+ '("config.guess" "config.sub"))))))
+ '())))
(propagated-inputs
(list xorgproto))
(inputs
(list libxext libx11))
(native-inputs
- (list pkg-config))
+ (append (if (target-riscv64?)
+ (list config)
+ '())
+ (list pkg-config)))
(home-page "https://www.x.org/wiki/")
(synopsis "Xorg XVideo Extension library")
(description "Library for the X Video Extension to the X11 protocol.")
--
2.39.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [bug#61865] [PATCH 3/8] gnu: libxtst: fix riscv64 cross-compile.
[not found] <cover.1677572540.git.873216071@qq.com>
2023-02-28 8:33 ` [bug#61865] [PATCH 1/8] gnu: xcb-util-wm: fix riscv64 cross-compile Z572 via Guix-patches via
2023-02-28 8:33 ` [bug#61865] [PATCH 2/8] gnu: libxv: " Z572 via Guix-patches via
@ 2023-02-28 8:33 ` Z572 via Guix-patches via
2023-02-28 8:33 ` [bug#61865] [PATCH 4/8] gnu: mtdev: " Z572 via Guix-patches via
` (4 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Z572 via Guix-patches via @ 2023-02-28 8:33 UTC (permalink / raw)
To: 61865
* gnu/packages/xorg.scm(libxtst): fix riscv64 cross-compile
[arguments]: when target is riscv64, add phase to update config.{guess,sub}
[native-inputs]: when target is riscv64, add config.
---
gnu/packages/xorg.scm | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 2b6f9fa369..2cc1523e3e 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -4658,13 +4658,28 @@ (define-public libxtst
"012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"))))
(build-system gnu-build-system)
(arguments
- '(#:configure-flags '("--disable-static")))
+ `(#:configure-flags '("--disable-static")
+ ,@(if (and (%current-target-system)
+ (target-riscv64?))
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'update-config
+ (lambda* (#:key native-inputs #:allow-other-keys)
+ (install-file
+ (search-input-file native-inputs "/bin/config.sub") ".")
+ (install-file
+ (search-input-file native-inputs "/bin/config.guess") ".")))))
+ '())))
(propagated-inputs
(list libxi xorgproto))
(inputs
(list libx11))
(native-inputs
- (list pkg-config))
+ `(,@(if (and (%current-target-system)
+ (target-riscv64?))
+ (list config)
+ '())
+ ,pkg-config))
(home-page "https://www.x.org/wiki/")
(synopsis "Xorg library for Xtest and Record extensions")
(description
--
2.39.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [bug#61865] [PATCH 4/8] gnu: mtdev: fix riscv64 cross-compile.
[not found] <cover.1677572540.git.873216071@qq.com>
` (2 preceding siblings ...)
2023-02-28 8:33 ` [bug#61865] [PATCH 3/8] gnu: libxtst: " Z572 via Guix-patches via
@ 2023-02-28 8:33 ` Z572 via Guix-patches via
2023-02-28 8:33 ` [bug#61865] [PATCH 5/8] gnu: gobject-introspection: " Z572 via Guix-patches via
` (3 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Z572 via Guix-patches via @ 2023-02-28 8:33 UTC (permalink / raw)
To: 61865
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 2406 bytes --]
* gnu/packages/xdisorg.scm(mtdev): fix riscv64 cross-compile
[arguments]: when target is riscv64, add phase to update config.{guess,sub}.
[native-inputs]: when target is riscv64, add config.
---
gnu/packages/xdisorg.scm | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 2ebeb4e013..21bc368538 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -41,7 +41,7 @@
;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
;;; Copyright © 2020 James Smith <jsubuntuxp@disroot.org>
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
-;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2020, 2021, 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
@@ -763,7 +763,23 @@ (define-public mtdev
(base32
"1q700h9dqcm3zl6c3gj0qxxjcx6ibw2c51wjijydhwdcm26v5mqm"))))
(build-system gnu-build-system)
- (arguments '(#:configure-flags '("--disable-static")))
+ (arguments `(#:configure-flags '("--disable-static")
+ ,@(if (target-riscv64?)
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'update-config-scripts
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ ;; Replace outdated config.guess and config.sub.
+ (for-each (lambda (file)
+ (install-file
+ (search-input-file
+ (or native-inputs inputs)
+ (string-append "/bin/" file)) "./config-aux"))
+ '("config.guess" "config.sub"))))))
+ '())))
+ (native-inputs (if (target-riscv64?)
+ (list config)
+ '()))
(home-page "http://bitmath.org/code/mtdev/")
(synopsis "Multitouch protocol translation library")
(description "Mtdev is a stand-alone library which transforms all
--
2.39.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [bug#61865] [PATCH 5/8] gnu: gobject-introspection: fix riscv64 cross-compile.
[not found] <cover.1677572540.git.873216071@qq.com>
` (3 preceding siblings ...)
2023-02-28 8:33 ` [bug#61865] [PATCH 4/8] gnu: mtdev: " Z572 via Guix-patches via
@ 2023-02-28 8:33 ` Z572 via Guix-patches via
2023-02-28 8:33 ` [bug#61865] [PATCH 6/8] gnu: gsettings-desktop-schemas: fix cross-compile Z572 via Guix-patches via
` (2 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Z572 via Guix-patches via @ 2023-02-28 8:33 UTC (permalink / raw)
To: 61865
* gnu/packages/glib.scm(gobject-introspection): fix riscv64 cross-compile
[native-inputs]: when (%current-target-system) is true, add python.
---
gnu/packages/glib.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index f85d5e3225..319a0ca2c1 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -573,7 +573,10 @@ (define gobject-introspection
"/_giscanner"))))
#~()))))
(native-inputs
- `(("glib" ,glib "bin")
+ `(,@(if (%current-target-system)
+ `(("python" ,python))
+ '())
+ ("glib" ,glib "bin")
("pkg-config" ,pkg-config)
("bison" ,bison)
("flex" ,flex)))
--
2.39.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [bug#61865] [PATCH 6/8] gnu: gsettings-desktop-schemas: fix cross-compile.
[not found] <cover.1677572540.git.873216071@qq.com>
` (4 preceding siblings ...)
2023-02-28 8:33 ` [bug#61865] [PATCH 5/8] gnu: gobject-introspection: " Z572 via Guix-patches via
@ 2023-02-28 8:33 ` Z572 via Guix-patches via
2023-02-28 8:33 ` [bug#61865] [PATCH 7/8] gnu: libotf: " Z572 via Guix-patches via
2023-02-28 8:33 ` [bug#61865] [PATCH 8/8] gnu: librsvg-2.40: " Z572 via Guix-patches via
7 siblings, 0 replies; 11+ messages in thread
From: Z572 via Guix-patches via @ 2023-02-28 8:33 UTC (permalink / raw)
To: 61865
* gnu/packages/gnome.scm(gsettings-desktop-schemas): fix cross-compile.
[inputs]: add gobject-introspection.
---
gnu/packages/gnome.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4698b883af..1c818b01b4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2755,7 +2755,7 @@ (define-public gsettings-desktop-schemas
"/share/backgrounds/gnome"))
;; Do not reference fonts, that may not exist.
(("'Source Code Pro 10'") "'Monospace 11'")))))))
- (inputs (list glib gnome-backgrounds))
+ (inputs (list glib gnome-backgrounds gobject-introspection))
(native-inputs (list gettext-minimal
`(,glib "bin") ;glib-compile-schemas, etc.
gobject-introspection
--
2.39.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [bug#61865] [PATCH 7/8] gnu: libotf: fix cross-compile.
[not found] <cover.1677572540.git.873216071@qq.com>
` (5 preceding siblings ...)
2023-02-28 8:33 ` [bug#61865] [PATCH 6/8] gnu: gsettings-desktop-schemas: fix cross-compile Z572 via Guix-patches via
@ 2023-02-28 8:33 ` Z572 via Guix-patches via
2023-06-04 12:19 ` Efraim Flashner
2023-02-28 8:33 ` [bug#61865] [PATCH 8/8] gnu: librsvg-2.40: " Z572 via Guix-patches via
7 siblings, 1 reply; 11+ messages in thread
From: Z572 via Guix-patches via @ 2023-02-28 8:33 UTC (permalink / raw)
To: 61865
* gnu/packages/fontutils.scm(libotf): fix cross-compile.
[native-inputs]:
add freetype, when cross-compile, add libtool, autoconf automake.
[arguments]: when cross-compile, add phase to fix rpl_malloc undefined reference
---
gnu/packages/fontutils.scm | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 72621cc006..d451f5e504 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -1392,7 +1392,22 @@ (define-public libotf
(base32 "0sq6g3xaxw388akws6qrllp3kp2sxgk2dv4j79k6mm52rnihrnv8"))))
(build-system gnu-build-system)
(native-inputs
- (list pkg-config))
+ (append (if (%current-target-system)
+ (list libtool
+ autoconf automake)
+ '())
+ (list pkg-config freetype)))
+ (arguments (if (%current-target-system)
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-rpl_malloc
+ (lambda _
+ (substitute* "configure.ac"
+ (("AC_FUNC_MALLOC")
+ ""))
+ (invoke "sh" "autogen.sh")))))
+ '()))
(propagated-inputs
(list freetype))
(home-page "https://www.nongnu.org/m17n/")
--
2.39.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [bug#61865] [PATCH 8/8] gnu: librsvg-2.40: fix cross-compile.
[not found] <cover.1677572540.git.873216071@qq.com>
` (6 preceding siblings ...)
2023-02-28 8:33 ` [bug#61865] [PATCH 7/8] gnu: libotf: " Z572 via Guix-patches via
@ 2023-02-28 8:33 ` Z572 via Guix-patches via
2023-06-04 12:20 ` Efraim Flashner
7 siblings, 1 reply; 11+ messages in thread
From: Z572 via Guix-patches via @ 2023-02-28 8:33 UTC (permalink / raw)
To: 61865
* gnu/packages/gnome.scm(librsvg-2.40): fix cross-compile.
[native-inputs]: add gdk-pixbuf.
[inputs]: add gobject-introspection.
---
gnu/packages/gnome.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 1c818b01b4..3705909742 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3793,11 +3793,12 @@ (define-public librsvg-2.40
"bugs/340047.svg"
"bugs/749415.svg"))))))))
(native-inputs
- (list pkg-config
+ (list gdk-pixbuf
+ pkg-config
`(,glib "bin") ; glib-mkenums, etc.
gobject-introspection)) ; g-ir-compiler, etc.
(inputs
- (list pango libcroco libxml2))
+ (list pango libcroco libxml2 gobject-introspection))
(propagated-inputs
;; librsvg-2.0.pc refers to all of that.
(list cairo gdk-pixbuf glib))
--
2.39.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [bug#61865] [PATCH 2/8] gnu: libxv: fix riscv64 cross-compile.
2023-02-28 8:33 ` [bug#61865] [PATCH 2/8] gnu: libxv: " Z572 via Guix-patches via
@ 2023-06-04 12:19 ` Efraim Flashner
0 siblings, 0 replies; 11+ messages in thread
From: Efraim Flashner @ 2023-06-04 12:19 UTC (permalink / raw)
To: Z572; +Cc: 61865
[-- Attachment #1: Type: text/plain, Size: 2390 bytes --]
This patch is no longer necessary after updating libxv to a newer
version.
On Tue, Feb 28, 2023 at 04:33:34PM +0800, Z572 via Guix-patches via wrote:
> * gnu/packages/xorg.scm(libxv): fix riscv64 cross-compile
> [arguments]: when target is riscv64, add phase to update config.{guess,sub}
> [native-inputs]: when target is riscv64, add config.
> ---
> gnu/packages/xorg.scm | 20 ++++++++++++++++++--
> 1 file changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
> index 32be732eef..2b6f9fa369 100644
> --- a/gnu/packages/xorg.scm
> +++ b/gnu/packages/xorg.scm
> @@ -4696,13 +4696,29 @@ (define-public libxv
> "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"))))
> (build-system gnu-build-system)
> (arguments
> - `(#:configure-flags '(,@(malloc0-flags) "--disable-static")))
> + `(#:configure-flags '(,@(malloc0-flags) "--disable-static")
> + ,@(if (target-riscv64?)
> + `(#:phases
> + (modify-phases %standard-phases
> + (add-after 'unpack 'update-config-scripts
> + (lambda* (#:key inputs native-inputs #:allow-other-keys)
> + ;; Replace outdated config.guess and config.sub.
> + (for-each (lambda (file)
> + (install-file
> + (search-input-file
> + (or native-inputs inputs)
> + (string-append "/bin/" file)) "."))
> + '("config.guess" "config.sub"))))))
> + '())))
> (propagated-inputs
> (list xorgproto))
> (inputs
> (list libxext libx11))
> (native-inputs
> - (list pkg-config))
> + (append (if (target-riscv64?)
> + (list config)
> + '())
> + (list pkg-config)))
> (home-page "https://www.x.org/wiki/")
> (synopsis "Xorg XVideo Extension library")
> (description "Library for the X Video Extension to the X11 protocol.")
> --
> 2.39.1
>
>
>
>
--
Efraim Flashner <efraim@flashner.co.il> רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* [bug#61865] [PATCH 7/8] gnu: libotf: fix cross-compile.
2023-02-28 8:33 ` [bug#61865] [PATCH 7/8] gnu: libotf: " Z572 via Guix-patches via
@ 2023-06-04 12:19 ` Efraim Flashner
0 siblings, 0 replies; 11+ messages in thread
From: Efraim Flashner @ 2023-06-04 12:19 UTC (permalink / raw)
To: Z572; +Cc: 61865
[-- Attachment #1: Type: text/plain, Size: 2349 bytes --]
This one I didn't apply. I don't believe adding freetype as a
native-input is correct but I could see adding it as an input. In the
end libotf links to freetype, and we don't want it to link to the one in
native-inputs.
I don't think the phase is the correct way to do this. I didn't see any
error related to it when I was building it before applying the patch,
and I made it pretty far after overriding the location of
freetype-config.
On Tue, Feb 28, 2023 at 04:33:39PM +0800, Z572 via Guix-patches via wrote:
> * gnu/packages/fontutils.scm(libotf): fix cross-compile.
> [native-inputs]:
> add freetype, when cross-compile, add libtool, autoconf automake.
> [arguments]: when cross-compile, add phase to fix rpl_malloc undefined reference
> ---
> gnu/packages/fontutils.scm | 17 ++++++++++++++++-
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
> index 72621cc006..d451f5e504 100644
> --- a/gnu/packages/fontutils.scm
> +++ b/gnu/packages/fontutils.scm
> @@ -1392,7 +1392,22 @@ (define-public libotf
> (base32 "0sq6g3xaxw388akws6qrllp3kp2sxgk2dv4j79k6mm52rnihrnv8"))))
> (build-system gnu-build-system)
> (native-inputs
> - (list pkg-config))
> + (append (if (%current-target-system)
> + (list libtool
> + autoconf automake)
> + '())
> + (list pkg-config freetype)))
> + (arguments (if (%current-target-system)
> + (list
> + #:phases
> + #~(modify-phases %standard-phases
> + (add-after 'unpack 'fix-rpl_malloc
> + (lambda _
> + (substitute* "configure.ac"
> + (("AC_FUNC_MALLOC")
> + ""))
> + (invoke "sh" "autogen.sh")))))
> + '()))
> (propagated-inputs
> (list freetype))
> (home-page "https://www.nongnu.org/m17n/")
> --
> 2.39.1
>
>
>
>
--
Efraim Flashner <efraim@flashner.co.il> רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* [bug#61865] [PATCH 8/8] gnu: librsvg-2.40: fix cross-compile.
2023-02-28 8:33 ` [bug#61865] [PATCH 8/8] gnu: librsvg-2.40: " Z572 via Guix-patches via
@ 2023-06-04 12:20 ` Efraim Flashner
0 siblings, 0 replies; 11+ messages in thread
From: Efraim Flashner @ 2023-06-04 12:20 UTC (permalink / raw)
To: Z572; +Cc: 61865
[-- Attachment #1: Type: text/plain, Size: 1495 bytes --]
I didn't apply this patch. I wasn't able to cross-compile some of the
packages which came before this package to see where it failed when
cross-compiling.
On Tue, Feb 28, 2023 at 04:33:40PM +0800, Z572 via Guix-patches via wrote:
> * gnu/packages/gnome.scm(librsvg-2.40): fix cross-compile.
> [native-inputs]: add gdk-pixbuf.
> [inputs]: add gobject-introspection.
> ---
> gnu/packages/gnome.scm | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 1c818b01b4..3705909742 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -3793,11 +3793,12 @@ (define-public librsvg-2.40
> "bugs/340047.svg"
> "bugs/749415.svg"))))))))
> (native-inputs
> - (list pkg-config
> + (list gdk-pixbuf
> + pkg-config
> `(,glib "bin") ; glib-mkenums, etc.
> gobject-introspection)) ; g-ir-compiler, etc.
> (inputs
> - (list pango libcroco libxml2))
> + (list pango libcroco libxml2 gobject-introspection))
> (propagated-inputs
> ;; librsvg-2.0.pc refers to all of that.
> (list cairo gdk-pixbuf glib))
> --
> 2.39.1
>
>
>
>
--
Efraim Flashner <efraim@flashner.co.il> רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-06-04 12:21 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <cover.1677572540.git.873216071@qq.com>
2023-02-28 8:33 ` [bug#61865] [PATCH 1/8] gnu: xcb-util-wm: fix riscv64 cross-compile Z572 via Guix-patches via
2023-02-28 8:33 ` [bug#61865] [PATCH 2/8] gnu: libxv: " Z572 via Guix-patches via
2023-06-04 12:19 ` Efraim Flashner
2023-02-28 8:33 ` [bug#61865] [PATCH 3/8] gnu: libxtst: " Z572 via Guix-patches via
2023-02-28 8:33 ` [bug#61865] [PATCH 4/8] gnu: mtdev: " Z572 via Guix-patches via
2023-02-28 8:33 ` [bug#61865] [PATCH 5/8] gnu: gobject-introspection: " Z572 via Guix-patches via
2023-02-28 8:33 ` [bug#61865] [PATCH 6/8] gnu: gsettings-desktop-schemas: fix cross-compile Z572 via Guix-patches via
2023-02-28 8:33 ` [bug#61865] [PATCH 7/8] gnu: libotf: " Z572 via Guix-patches via
2023-06-04 12:19 ` Efraim Flashner
2023-02-28 8:33 ` [bug#61865] [PATCH 8/8] gnu: librsvg-2.40: " Z572 via Guix-patches via
2023-06-04 12:20 ` Efraim Flashner
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).