From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:470:142:3::10]:50692)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jS3i9-00033J-2N
 for guix-patches@gnu.org; Fri, 24 Apr 2020 15:10:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jS3i7-0000fq-P5
 for guix-patches@gnu.org; Fri, 24 Apr 2020 15:10:04 -0400
Received: from debbugs.gnu.org ([209.51.188.43]:46404)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1jS3i6-0000f5-0k
 for guix-patches@gnu.org; Fri, 24 Apr 2020 15:10:03 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jS3i5-0002lc-RC
 for guix-patches@gnu.org; Fri, 24 Apr 2020 15:10:01 -0400
Subject: [bug#40791] rebased patch
Resent-Message-ID: <handler.40791.B40791.158775536710586@debbugs.gnu.org>
Date: Fri, 24 Apr 2020 21:09:13 +0200
Message-ID: <2691858.b7GtGmxQoC@peach>
In-Reply-To: <87sggtg7th.fsf@devup.no>
References: <2419210.ElGaqSPkdT@peach> <12618542.O9o76ZdvQC@peach>
 <87sggtg7th.fsf@devup.no>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="UTF-8"
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
Reply-to: Tom <tomz@freedommail.ch>, Tom via Guix-patches <guix-patches@gnu.org>
From: Tom via Guix-patches via <guix-patches@gnu.org>
To: 40791@debbugs.gnu.org, Marius Bakke <mbakke@fastmail.com>

On Friday, 24 April 2020 00:23:38 CEST Marius Bakke wrote:
> > @@ -570,14 +568,6 @@ developers using C++ or QML, a CSS & JavaScript li=
ke
> > 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.cp=
p"
> > -               ;; Don't search in /usr/=E2=80=A6/X11/locale, =E2=80=A6
> > -             =20
> > (("^\\s*m_possibleLocations.append\\(QStringLiteral\\(\"/usr/.*/X11/loc=
al
> > e\"\\)\\);" line) -                (string-append "// " line))
> > -               ;; =E2=80=A6 but use libx11's path
> > -             =20
> > (("^\\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 remov=
ed.

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?