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

27 lines
1.1 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 09:26:19 -07:00
Index: qtbase-opensource-src-5.9.0/src/network/kernel/qdnslookup_unix.cpp
qt58: init at 5.8.0 Qt 5.8 is now the default version.
2017-02-28 07:37:57 -08: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 09:26:19 -07:00
--- qtbase-opensource-src-5.9.0.orig/src/network/kernel/qdnslookup_unix.cpp
+++ qtbase-opensource-src-5.9.0/src/network/kernel/qdnslookup_unix.cpp
@@ -92,7 +92,7 @@ static bool resolveLibraryInternal()
qt58: init at 5.8.0 Qt 5.8 is now the default version.
2017-02-28 07:37:57 -08:00
if (!lib.load())
#endif
{
- lib.setFileName(QLatin1String("resolv"));
qt58.qtbase: Fix path to libresolv
2017-04-15 09:33:47 -07:00
+ lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV));
qt58: init at 5.8.0 Qt 5.8 is now the default version.
2017-02-28 07:37:57 -08:00
if (!lib.load())
return false;
}
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 09:26:19 -07:00
Index: qtbase-opensource-src-5.9.0/src/network/kernel/qhostinfo_unix.cpp
qt58: init at 5.8.0 Qt 5.8 is now the default version.
2017-02-28 07:37:57 -08: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 09:26:19 -07:00
--- qtbase-opensource-src-5.9.0.orig/src/network/kernel/qhostinfo_unix.cpp
+++ qtbase-opensource-src-5.9.0/src/network/kernel/qhostinfo_unix.cpp
@@ -102,7 +102,7 @@ static bool resolveLibraryInternal()
qt58: init at 5.8.0 Qt 5.8 is now the default version.
2017-02-28 07:37:57 -08:00
if (!lib.load())
#endif
{
- lib.setFileName(QLatin1String("resolv"));
qt58.qtbase: Fix path to libresolv
2017-04-15 09:33:47 -07:00
+ lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV));
qt58: init at 5.8.0 Qt 5.8 is now the default version.
2017-02-28 07:37:57 -08:00
if (!lib.load())
return false;
}