forked from mirrors/nixpkgs
parent
ac775ac6dd
commit
db2538fb0c
36
pkgs/development/libraries/qt-5/5.9/qtbase/darwin-cf.patch
Normal file
36
pkgs/development/libraries/qt-5/5.9/qtbase/darwin-cf.patch
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
|
||||||
|
index 341d3bc..3368234 100644
|
||||||
|
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
|
||||||
|
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
|
||||||
|
@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations()
|
||||||
|
QMacAutoReleasePool pool;
|
||||||
|
userProfiles.clear();
|
||||||
|
|
||||||
|
- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
|
||||||
|
+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
|
||||||
|
for (NSString *ifName in wifiInterfaces) {
|
||||||
|
|
||||||
|
CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName];
|
||||||
|
@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate()
|
||||||
|
|
||||||
|
QMacAutoReleasePool pool;
|
||||||
|
|
||||||
|
- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
|
||||||
|
+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
|
||||||
|
for (NSString *ifName in wifiInterfaces) {
|
||||||
|
scanThread->interfaceName = QString::fromNSString(ifName);
|
||||||
|
scanThread->start();
|
||||||
|
QString TableGenerator::findComposeFile()
|
||||||
|
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
|
||||||
|
index 59b7637..b91139d 100644
|
||||||
|
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
|
||||||
|
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
|
||||||
|
@@ -320,7 +320,7 @@ static void qt_closePopups()
|
||||||
|
+ (void)applicationActivationChanged:(NSNotification*)notification
|
||||||
|
{
|
||||||
|
const id sender = self;
|
||||||
|
- NSEnumerator<NSWindow*> *windowEnumerator = nullptr;
|
||||||
|
+ NSEnumerator *windowEnumerator = nullptr;
|
||||||
|
NSApplication *application = [NSApplication sharedApplication];
|
||||||
|
|
||||||
|
#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)
|
|
@ -62,7 +62,7 @@ stdenv.mkDerivation {
|
||||||
AGL AppKit ApplicationServices Carbon Cocoa
|
AGL AppKit ApplicationServices Carbon Cocoa
|
||||||
CoreAudio CoreBluetooth CoreLocation CoreServices
|
CoreAudio CoreBluetooth CoreLocation CoreServices
|
||||||
DiskArbitration Foundation OpenGL
|
DiskArbitration Foundation OpenGL
|
||||||
darwin.cf-private darwin.libobjc libiconv
|
darwin.libobjc libiconv
|
||||||
]);
|
]);
|
||||||
|
|
||||||
buildInputs = [ ]
|
buildInputs = [ ]
|
||||||
|
@ -79,7 +79,8 @@ stdenv.mkDerivation {
|
||||||
outputs = [ "out" "dev" "bin" ];
|
outputs = [ "out" "dev" "bin" ];
|
||||||
|
|
||||||
patches =
|
patches =
|
||||||
copyPathsToStore (lib.readPathsFromFile ./. ./series);
|
copyPathsToStore (lib.readPathsFromFile ./. ./series)
|
||||||
|
++ stdenv.lib.optional stdenv.isDarwin ./darwin-cf.patch;
|
||||||
|
|
||||||
postPatch =
|
postPatch =
|
||||||
''
|
''
|
||||||
|
@ -110,7 +111,7 @@ stdenv.mkDerivation {
|
||||||
-e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \
|
-e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \
|
||||||
./configure
|
./configure
|
||||||
sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf
|
sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf
|
||||||
sed -i '26,$d' ./mkspecs/features/mac/default_post.prf
|
sed -i '27,$d' ./mkspecs/features/mac/default_post.prf
|
||||||
sed -i '1,$d' ./mkspecs/features/mac/sdk.prf
|
sed -i '1,$d' ./mkspecs/features/mac/sdk.prf
|
||||||
sed -i 's/QMAKE_LFLAGS_RPATH = -Wl,-rpath,/QMAKE_LFLAGS_RPATH =/' ./mkspecs/common/mac.conf
|
sed -i 's/QMAKE_LFLAGS_RPATH = -Wl,-rpath,/QMAKE_LFLAGS_RPATH =/' ./mkspecs/common/mac.conf
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue