GNU bug report logs - #40791
Update Qt

Previous Next

Full log

Message #14 received at 40791 <at> debbugs.gnu.org (full text, mbox):

From: Tom <tomz <at> freedommail.ch>
To: 40791 <at> debbugs.gnu.org, Marius Bakke <mbakke <at> fastmail.com>
Subject: Re: [bug#40791] rebased patch
Date: Fri, 24 Apr 2020 21:09:13 +0200

On Friday, 24 April 2020 00:23:38 CEST Marius Bakke wrote:
> > @@ -570,14 +568,6 @@ developers using C++ or QML, a CSS & JavaScript like
> > language.") "src/network/kernel/qhostinfo_unix.cpp")
> > (("^\\s*(lib.setFileName\\(QLatin1String\\(\")(resolv\"\\)\\);)" _ a b)
> > (string-append a glibc "/lib/lib" b))))
> > -             ;; X11/locale (compose path)
> > -             (substitute*
> > "src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp"
> > -               ;; Don't search in /usr/…/X11/locale, …
> > -              
> > (("^\\s*m_possibleLocations.append\\(QStringLiteral\\(\"/usr/.*/X11/local
> > e\"\\)\\);" line) -                (string-append "// " line))
> > -               ;; … but use libx11's path
> > -              
> > (("^\\s*(m_possibleLocations.append\\(QStringLiteral\\()X11_PREFIX
> > \"(/.*/X11/locale\"\\)\\);)" _ a b) -                (string-append a
> > "\"" (assoc-ref inputs "libx11") b)))

> What happened here?  Did the Qt build system get smart enough to embed
> the libx11 file name by itself?

What happened is that the 'generator' directory is no longer there. I don't see any equivalent to what is being substituted. Hence the patch was removed.

I am not sure what the original was trying to accomplish, the current code doesn't seem to do anything with the libx11 file you talk about.

Any way to test if the functionality is what you expect after removal?

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.