[bug#40791] rebased patch

[Tom via Guix-patches via <guix-patches@gnu.org>]

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?