From: Tom via Guix-patches via <guix-patches@gnu.org>
To: 40791@debbugs.gnu.org, Marius Bakke <mbakke@fastmail.com>
Subject: [bug#40791] rebased patch
Date: Fri, 24 Apr 2020 21:09:13 +0200 [thread overview]
Message-ID: <2691858.b7GtGmxQoC@peach> (raw)
In-Reply-To: <87sggtg7th.fsf@devup.no>
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?
next prev parent reply other threads:[~2020-04-24 19:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-23 11:05 [bug#40791] Update Qt Tom via Guix-patches via
2020-04-23 18:51 ` [bug#40791] rebased patch Tom via Guix-patches via
2020-04-23 22:23 ` Marius Bakke
2020-04-24 19:09 ` Tom via Guix-patches via [this message]
2020-04-24 20:42 ` [bug#40791] todays patch Tom via Guix-patches via
2020-05-02 14:23 ` Marius Bakke
2020-05-17 23:37 ` bug#40791: " Marius Bakke
2020-04-24 22:31 ` [bug#40791] Append: KDE upgrade Tom via Guix-patches via
2020-05-02 14:28 ` Marius Bakke
2020-05-02 14:29 ` Marius Bakke
2020-05-02 20:02 ` Tom Zander via Guix-patches via
2020-05-17 23:26 ` Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2691858.b7GtGmxQoC@peach \
--to=guix-patches@gnu.org \
--cc=40791@debbugs.gnu.org \
--cc=mbakke@fastmail.com \
--cc=tomz@freedommail.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).