alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-libXcursor.patch

18 lines
965 B
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 17:26:19 +01:00
Index: qtbase-opensource-src-5.9.0/src/plugins/platforms/xcb/qxcbcursor.cpp
qt58: init at 5.8.0 Qt 5.8 is now the default version.
2017-02-28 15:37:57 +00: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 17:26:19 +01:00
--- qtbase-opensource-src-5.9.0.orig/src/plugins/platforms/xcb/qxcbcursor.cpp
+++ qtbase-opensource-src-5.9.0/src/plugins/platforms/xcb/qxcbcursor.cpp
@@ -311,10 +311,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c
#if defined(XCB_USE_XLIB) && QT_CONFIG(library)
qt58: init at 5.8.0 Qt 5.8 is now the default version.
2017-02-28 15:37:57 +00:00
static bool function_ptrs_not_initialized = true;
if (function_ptrs_not_initialized) {
- QLibrary xcursorLib(QLatin1String("Xcursor"), 1);
qt58.qtbase: Fix path to libXcursor
2017-04-15 17:34:00 +01:00
+ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1);
qt58: init at 5.8.0 Qt 5.8 is now the default version.
2017-02-28 15:37:57 +00:00
bool xcursorFound = xcursorLib.load();
if (!xcursorFound) { // try without the version number
- xcursorLib.setFileName(QLatin1String("Xcursor"));
qt58.qtbase: Fix path to libXcursor
2017-04-15 17:34:00 +01:00
+ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR));
qt58: init at 5.8.0 Qt 5.8 is now the default version.
2017-02-28 15:37:57 +00:00
xcursorFound = xcursorLib.load();
}
if (xcursorFound) {
Copy permalink