* [bug#71306] [PATCH gnome-team] gnu: gtk: Fix build on i686-linux.
@ 2024-05-30 8:25 Liliana Marie Prikler
2024-06-01 15:04 ` Maxim Cournoyer
2024-07-06 10:59 ` bug#71306: Close Andreas Enge
0 siblings, 2 replies; 5+ messages in thread
From: Liliana Marie Prikler @ 2024-05-30 8:25 UTC (permalink / raw)
To: 71306; +Cc: liliana.prikler, maxim.cournoyer, rg, vivien
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1673 bytes --]
* gnu/packages/gtk.scm (gtk)[#:phases]<patch>: Add section dedicated to
failures on i686-linux.
---
gnu/packages/gtk.scm | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index d5777ae67b..1c78a969f6 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1235,7 +1235,20 @@ (define-public gtk
;; The inscription-markup.ui fails due to /etc/machine-id
;; related warnings (see:
;; https://gitlab.gnome.org/GNOME/gtk/-/issues/5169).
- (("[ \t]*'inscription-markup.ui',") ""))))
+ (("[ \t]*'inscription-markup.ui',") ""))
+ ;; XXX: These failures appear specific to i686 – investigate them.
+ #$@(if (target-x86-32?)
+ #~((substitute* "testsuite/gsk/meson.build"
+ (("'empty-(fill|stroke)\\.node',") "")
+ (("'fill2?\\.node',") "")
+ (("'stroke\\.node',") "")
+ (("'fill-fractional-([a-z-]*)-nogl',") "")
+ (("\\[ 'path-special-cases' \\],") "")
+ (("\\[ '(path|curve)-special-cases' \\],") "")
+ (("\\[ 'path-private' \\],") ""))
+ (substitute* "testsuite/a11y/meson.build"
+ (("\\{ 'name': 'text(view)?' \\},") "")))
+ #~())))
(add-before 'build 'set-cache
(lambda _
(setenv "XDG_CACHE_HOME" (getcwd))))
base-commit: 4b5b1fa8125c3055ddea36f37e0c5311489e1563
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [bug#71306] [PATCH gnome-team] gnu: gtk: Fix build on i686-linux.
2024-05-30 8:25 [bug#71306] [PATCH gnome-team] gnu: gtk: Fix build on i686-linux Liliana Marie Prikler
@ 2024-06-01 15:04 ` Maxim Cournoyer
2024-06-01 16:20 ` Liliana Marie Prikler
2024-07-06 10:59 ` bug#71306: Close Andreas Enge
1 sibling, 1 reply; 5+ messages in thread
From: Maxim Cournoyer @ 2024-06-01 15:04 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, vivien, 71306
Hi Liliana,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/gtk.scm (gtk)[#:phases]<patch>: Add section dedicated to
> failures on i686-linux.
> ---
> gnu/packages/gtk.scm | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> index d5777ae67b..1c78a969f6 100644
> --- a/gnu/packages/gtk.scm
> +++ b/gnu/packages/gtk.scm
> @@ -1235,7 +1235,20 @@ (define-public gtk
> ;; The inscription-markup.ui fails due to /etc/machine-id
> ;; related warnings (see:
> ;; https://gitlab.gnome.org/GNOME/gtk/-/issues/5169).
> - (("[ \t]*'inscription-markup.ui',") ""))))
> + (("[ \t]*'inscription-markup.ui',") ""))
> + ;; XXX: These failures appear specific to i686 – investigate them.
> + #$@(if (target-x86-32?)
> + #~((substitute* "testsuite/gsk/meson.build"
> + (("'empty-(fill|stroke)\\.node',") "")
> + (("'fill2?\\.node',") "")
> + (("'stroke\\.node',") "")
> + (("'fill-fractional-([a-z-]*)-nogl',") "")
> + (("\\[ 'path-special-cases' \\],") "")
> + (("\\[ '(path|curve)-special-cases' \\],") "")
> + (("\\[ 'path-private' \\],") ""))
> + (substitute* "testsuite/a11y/meson.build"
> + (("\\{ 'name': 'text(view)?' \\},") "")))
> + #~())))
Are you sure these are specific to i686 and not to 32 bit architectures
such as armhf also?
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 5+ messages in thread* [bug#71306] [PATCH gnome-team] gnu: gtk: Fix build on i686-linux.
2024-06-01 15:04 ` Maxim Cournoyer
@ 2024-06-01 16:20 ` Liliana Marie Prikler
2024-06-03 12:10 ` Maxim Cournoyer
0 siblings, 1 reply; 5+ messages in thread
From: Liliana Marie Prikler @ 2024-06-01 16:20 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: rg, vivien, 71306
Am Samstag, dem 01.06.2024 um 11:04 -0400 schrieb Maxim Cournoyer:
> Hi Liliana,
>
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>
> > * gnu/packages/gtk.scm (gtk)[#:phases]<patch>: Add section
> > dedicated to
> > failures on i686-linux.
> > ---
> > gnu/packages/gtk.scm | 15 ++++++++++++++-
> > 1 file changed, 14 insertions(+), 1 deletion(-)
> >
> > diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> > index d5777ae67b..1c78a969f6 100644
> > --- a/gnu/packages/gtk.scm
> > +++ b/gnu/packages/gtk.scm
> > @@ -1235,7 +1235,20 @@ (define-public gtk
> > ;; The inscription-markup.ui fails due to
> > /etc/machine-id
> > ;; related warnings (see:
> > ;;
> > https://gitlab.gnome.org/GNOME/gtk/-/issues/5169).
> > - (("[ \t]*'inscription-markup.ui',") ""))))
> > + (("[ \t]*'inscription-markup.ui',") ""))
> > + ;; XXX: These failures appear specific to i686 –
> > investigate them.
> > + #$@(if (target-x86-32?)
> > + #~((substitute* "testsuite/gsk/meson.build"
> > + (("'empty-(fill|stroke)\\.node',") "")
> > + (("'fill2?\\.node',") "")
> > + (("'stroke\\.node',") "")
> > + (("'fill-fractional-([a-z-]*)-nogl',")
> > "")
> > + (("\\[ 'path-special-cases' \\],") "")
> > + (("\\[ '(path|curve)-special-cases'
> > \\],") "")
> > + (("\\[ 'path-private' \\],") ""))
> > + (substitute* "testsuite/a11y/meson.build"
> > + (("\\{ 'name': 'text(view)?' \\},")
> > "")))
> > + #~())))
>
> Are you sure these are specific to i686 and not to 32 bit
> architectures such as armhf also?
Well, I only tested it on x86-32. If we see the same failures on
armhf, I can just update the predicate.
WDYT?
^ permalink raw reply [flat|nested] 5+ messages in thread* [bug#71306] [PATCH gnome-team] gnu: gtk: Fix build on i686-linux.
2024-06-01 16:20 ` Liliana Marie Prikler
@ 2024-06-03 12:10 ` Maxim Cournoyer
0 siblings, 0 replies; 5+ messages in thread
From: Maxim Cournoyer @ 2024-06-03 12:10 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, vivien, 71306
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Am Samstag, dem 01.06.2024 um 11:04 -0400 schrieb Maxim Cournoyer:
>> Hi Liliana,
>>
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>>
>> > * gnu/packages/gtk.scm (gtk)[#:phases]<patch>: Add section
>> > dedicated to
>> > failures on i686-linux.
OK, let's do this!
Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#71306: Close
2024-05-30 8:25 [bug#71306] [PATCH gnome-team] gnu: gtk: Fix build on i686-linux Liliana Marie Prikler
2024-06-01 15:04 ` Maxim Cournoyer
@ 2024-07-06 10:59 ` Andreas Enge
1 sibling, 0 replies; 5+ messages in thread
From: Andreas Enge @ 2024-07-06 10:59 UTC (permalink / raw)
To: 71306-done
This has been applied to master as commit ad7505d16f882e69926008a22f9c12c37b32f4ee .
Closing the bug.
Thanks,
Andreas
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-07-06 11:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-30 8:25 [bug#71306] [PATCH gnome-team] gnu: gtk: Fix build on i686-linux Liliana Marie Prikler
2024-06-01 15:04 ` Maxim Cournoyer
2024-06-01 16:20 ` Liliana Marie Prikler
2024-06-03 12:10 ` Maxim Cournoyer
2024-07-06 10:59 ` bug#71306: Close Andreas Enge
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).