public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
nixpkgs/pkgs/development/libraries/qt-5/5.9/qtbase/compose-search-path.patch

19 lines
1.2 KiB
Diff
Raw Normal View History

qt5: 5.8.0 -> 5.9.0 Qt 5.8 is immediately removed because its support window is ended. The qtlocation module is built with `enableParallelBuilding = false` so that the clipper library will be built before the components which link to it. kjs now depends directly on pcre. The dependency was previously propagated from qtbase, which now depends on pcre2.
2017-06-17 11:26:19 -05:00
Index: qtbase-opensource-src-5.9.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
qt58: init at 5.8.0 Qt 5.8 is now the default version.
2017-02-28 09:37:57 -06:00
===================================================================
qt5: 5.8.0 -> 5.9.0 Qt 5.8 is immediately removed because its support window is ended. The qtlocation module is built with `enableParallelBuilding = false` so that the clipper library will be built before the components which link to it. kjs now depends directly on pcre. The dependency was previously propagated from qtbase, which now depends on pcre2.
2017-06-17 11:26:19 -05:00
--- qtbase-opensource-src-5.9.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ qtbase-opensource-src-5.9.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocatio
qt58.qtbase: Update patch offsets
2017-04-15 11:11:32 -05:00
m_possibleLocations.reserve(7);
qt58: init at 5.8.0 Qt 5.8 is now the default version.
2017-02-28 09:37:57 -06:00
if (qEnvironmentVariableIsSet("QTCOMPOSE"))
m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale"));
- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale"));
- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale"));
- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));
m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));
m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));
qt58.qtbase: use QLatin1String instead of QStringLiteral
2017-05-23 11:06:31 -05:00
+ m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE));
qt58: init at 5.8.0 Qt 5.8 is now the default version.
2017-02-28 09:37:57 -06:00
}
qt58.qtbase: Fix QTCOMPOSE search patch
2017-04-15 11:23:48 -05:00
QString TableGenerator::findComposeFile()
Reference in New Issue Copy Permalink