From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marius Bakke <mbakke@fastmail.com>
Subject: bug#38405: [PATCH] gnu: qtbase: Use absolute references in .prl files.
Date: Thu, 28 Nov 2019 00:18:13 +0100
Message-ID: <87o8ww7vt6.fsf@devup.no>
References: <87r21t6vos.fsf@devup.no>
 <20191127181128.19365-1-mbakke@fastmail.com>
Mime-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
Return-path: <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:470:142:3::10]:49441)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ia6aT-0006Ez-Jw
 for bug-guix@gnu.org; Wed, 27 Nov 2019 18:19:10 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ia6aQ-00005L-Sp
 for bug-guix@gnu.org; Wed, 27 Nov 2019 18:19:08 -0500
Received: from debbugs.gnu.org ([209.51.188.43]:50391)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1ia6aM-0008T1-1C
 for bug-guix@gnu.org; Wed, 27 Nov 2019 18:19:04 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ia6aL-0003lV-Tv
 for bug-guix@gnu.org; Wed, 27 Nov 2019 18:19:01 -0500
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-To: bug-guix@gnu.org
Resent-Message-ID: <handler.38405.D38405.157489670414426.done@debbugs.gnu.org>
In-Reply-To: <20191127181128.19365-1-mbakke@fastmail.com>
List-Id: Bug reports for GNU Guix <bug-guix.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-guix>,
 <mailto:bug-guix-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-guix>
List-Post: <mailto:bug-guix@gnu.org>
List-Help: <mailto:bug-guix-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-guix>,
 <mailto:bug-guix-request@gnu.org?subject=subscribe>
Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org
Sender: "bug-Guix" <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
To: 38405-done@debbugs.gnu.org

--=-=-=
Content-Type: text/plain

Marius Bakke <mbakke@fastmail.com> writes:

> This fixes <https://bugs.gnu.org/38405>.
>
> * gnu/packages/qt.scm (qtbase)[arguments]: Add phase 'patch-prl-files'.

[...]

> +         (add-after 'patch-mkspecs 'patch-prl-files
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let ((out (assoc-ref outputs "out")))
> +               ;; Insert absolute references to the qtbase libraries because
> +               ;; QT_INSTALL_LIBS does not always resolve correctly, depending
> +               ;; on context.  See <https://bugs.gnu.org/38405>
> +               (substitute* (find-files (string-append out "/lib") "\\.prl$")
> +                 (("\\$\\$\\[QT_INSTALL_LIBS\\]")
> +                  (string-append out "/lib")))
> +               #t)))

I pushed this hunk in a59e2dd8cd16655e379abb567baf978c94f3d48e, as I'm
fairly confident that this is the right thing to do.

Feedback still welcome however.  :-)

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl3fBDUACgkQoqBt8qM6
VPpp6Qf+MaND0nZgQPTHLFkiPCPKAXgZLatG7bYUCh4+j9x5JCESv6ZjoONbLbIY
mW0Cl/nGbMhOv9r1YdBj4vGmD8SUDYNPZTXRvWlLxazyaAZHTmdBg2B7qgKPsQfc
AhESVsLacLn00A+yzlJRA1kO3DrsIKBZs9J9lkPbrKxknAX6tO8YxL/47ZVYrWxR
yUAe+9zdoE41hvaBQPlNT+uJSjzdargflnxH/3wM8LgGwWBJ9lkPlWjP8lxwNAK6
2Bd3XFw6UIBKXO0sIxfpzUYPPmRYPiJzL6Hl3DHZD5LJIVZB0iS0zAntJgT9Mtki
SWbFCTVjmSxeQYrlUxM77udRgYHsoA==
=gP/6
-----END PGP SIGNATURE-----
--=-=-=--