pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0008-qtbase-xcompose.patch

   1 From b7c1c103ba04e76ae498f87ca9ef2c4e09e36d7e Mon Sep 17 00:00:00 2001
   2 From: Thomas Tuegel <ttuegel@mailbox.org>
   3 Date: Tue, 17 Sep 2019 05:36:10 -0500
   4 Subject: [PATCH 08/12] qtbase-xcompose
   5
   6 ---
   7  .../compose/generator/qtablegenerator.cpp                    | 5 +----
   8  1 file changed, 1 insertion(+), 4 deletions(-)
   9
  10 diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
  11 index b5a0a5bbeb..6c20305f4d 100644
  12 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
  13 +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
  14 @@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations()
  15      m_possibleLocations.reserve(7);
  16      if (qEnvironmentVariableIsSet("QTCOMPOSE"))
  17          m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
  18 -    m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale"));
  19 -    m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale"));
  20 -    m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale"));
  21 -    m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));
  22      m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));
  23      m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));
  24 +    m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE));
  25  }
  26
  27  QString TableGenerator::findComposeFile()
  28 --
  29 2.23.GIT
  30