nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix

qt5: drop 5.12, 5.14

K900 06624cd9 7d051646

+22 -5133
-1
pkgs/common-updater/scripts/mark-broken
··· 49 49 denyAttrList=( 50 50 python27Packages 51 51 python37Packages 52 - libsForQt512 53 52 linuxPackages_ 54 53 rubyPackages_ 55 54 )
-3
pkgs/development/libraries/appstream/default.nix
··· 28 28 stdenv.mkDerivation rec { 29 29 pname = "appstream"; 30 30 version = "0.15.5"; 31 - # When bumping this package, please also check whether 32 - # fix-build-for-qt-olderthan-514.patch still applies by 33 - # building libsForQt512.appstream-qt. 34 31 35 32 outputs = [ "out" "dev" "installedTests" ]; 36 33
-250
pkgs/development/libraries/qt-5/5.12/default.nix
··· 1 - /* 2 - 3 - # Updates 4 - 5 - Before a major version update, make a copy of this directory. (We like to 6 - keep the old version around for a short time after major updates.) Add a 7 - top-level attribute to `top-level/all-packages.nix`. 8 - 9 - 1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. 10 - 2. From the top of the Nixpkgs tree, run 11 - `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION`. 12 - 3. Check that the new packages build correctly. 13 - 4. Commit the changes and open a pull request. 14 - 15 - */ 16 - 17 - { newScope 18 - , lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper 19 - , bison, cups ? null, harfbuzz, libGL, perl, python2 20 - , gstreamer, gst-plugins-base, gtk3, dconf 21 - , darwin 22 - , buildPackages 23 - 24 - # options 25 - , developerBuild ? false 26 - , decryptSslTraffic ? false 27 - , debug ? false 28 - }: 29 - 30 - let 31 - 32 - qtCompatVersion = srcs.qtbase.version; 33 - 34 - mirror = "https://download.qt.io"; 35 - srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // { 36 - # Community port of the now unmaintained upstream qtwebkit. 37 - qtwebkit = rec { 38 - src = fetchFromGitHub { 39 - owner = "qtwebkit"; 40 - repo = "qtwebkit"; 41 - rev = "qtwebkit-${version}"; 42 - sha256 = "11lc5sk10d9cyg8jqkbgkqiap72b9rax7hy61nm90zw9749y2yfg"; 43 - }; 44 - version = "5.212.0-alpha4"; 45 - }; 46 - }; 47 - 48 - patches = { 49 - qtbase = [ 50 - ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch 51 - ./qtbase.patch.d/0002-qtbase-mac.patch 52 - ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch 53 - 54 - # Patch framework detection to support X.framework/X.tbd, 55 - # extending the current support for X.framework/X. 56 - ./qtbase.patch.d/0015-qtbase-tbd-frameworks.patch 57 - 58 - ./qtbase.patch.d/0003-qtbase-mkspecs.patch 59 - ./qtbase.patch.d/0004-qtbase-replace-libdir.patch 60 - ./qtbase.patch.d/0005-qtbase-cmake.patch 61 - ./qtbase.patch.d/0006-qtbase-gtk3.patch 62 - ./qtbase.patch.d/0007-qtbase-xcursor.patch 63 - ./qtbase.patch.d/0008-qtbase-xcompose.patch 64 - ./qtbase.patch.d/0009-qtbase-tzdir.patch 65 - ./qtbase.patch.d/0010-qtbase-qtpluginpath.patch 66 - ./qtbase.patch.d/0011-qtbase-assert.patch 67 - ./qtbase.patch.d/0012-fix-header_module.patch 68 - 69 - # Ensure -I${includedir} is added to Cflags in pkg-config files. 70 - # See https://github.com/NixOS/nixpkgs/issues/52457 71 - ./qtbase.patch.d/0014-qtbase-pkg-config.patch 72 - 73 - # Make Qt applications work on macOS Big Sur even if they're 74 - # built with an older version of the macOS SDK (<10.14). This 75 - # issue is fixed in 5.12.11, but it requires macOS SDK 10.13 to 76 - # build. See https://bugreports.qt.io/browse/QTBUG-87014 for 77 - # more info. 78 - (fetchpatch { 79 - name = "big_sur_layer_backed_views.patch"; 80 - url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=c5d904639dbd690a36306e2b455610029704d821"; 81 - sha256 = "0crkw3j1iwdc1pbf5dhar0b4q3h5gs2q1sika8m12y02yk3ns697"; 82 - }) 83 - ]; 84 - qtdeclarative = [ 85 - ./qtdeclarative.patch 86 - # prevent headaches from stale qmlcache data 87 - ./qtdeclarative-default-disable-qmlcache.patch 88 - ]; 89 - qtlocation = [ ./qtlocation-gcc-9.patch ]; 90 - qtscript = [ ./qtscript.patch ]; 91 - qtserialport = [ ./qtserialport.patch ]; 92 - qtwebengine = [ 93 - # glibc 2.34 compat 94 - (fetchpatch { 95 - url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch"; 96 - sha256 = "sha256-CJxN6sTvWdPVEwSkr0zpPrjyhUIi6tYSWb8ZyO0sY2o="; 97 - excludes = [ 98 - "src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc" 99 - ]; 100 - }) 101 - ./qtwebengine-no-build-skip.patch 102 - # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/707 103 - # https://bugreports.qt.io/browse/QTBUG-77037 104 - (fetchpatch { 105 - name = "fix-build-with-pulseaudio-13.0.patch"; 106 - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/fc77d6b3d5ec74e421b58f199efceb2593cbf951/trunk/qtbug-77037-workaround.patch"; 107 - sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am"; 108 - }) 109 - 110 - ./qtwebengine-darwin-no-platform-check.patch 111 - ./qtwebengine-darwin-fix-failed-static-assertion.patch 112 - ]; 113 - qtwebkit = [ 114 - (fetchpatch { 115 - name = "qtwebkit-bison-3.7-build.patch"; 116 - url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; 117 - sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; 118 - }) 119 - (fetchpatch { 120 - name = "qtwebkit-glib-2.68.patch"; 121 - url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; 122 - sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; 123 - }) 124 - (fetchpatch { 125 - name = "qtwebkit-darwin-handle.patch"; 126 - url = "https://github.com/qtwebkit/qtwebkit/commit/5c272a21e621a66862821d3ae680f27edcc64c19.patch"; 127 - sha256 = "9hjqLyABz372QDgoq7nXXXQ/3OXBGcYN1/92ekcC3WE="; 128 - }) 129 - ./qtwebkit.patch 130 - ./qtwebkit-icu68.patch 131 - 132 - ./qtwebkit-darwin-no-readline.patch 133 - ./qtwebkit-darwin-no-qos-classes.patch 134 - ]; 135 - qttools = [ ./qttools.patch ]; 136 - }; 137 - 138 - addPackages = self: with self; 139 - let 140 - qtModule = 141 - import ../qtModule.nix 142 - { 143 - inherit perl; 144 - inherit lib; 145 - # Use a variant of mkDerivation that does not include wrapQtApplications 146 - # to avoid cyclic dependencies between Qt modules. 147 - mkDerivation = 148 - import ../mkDerivation.nix 149 - { inherit lib; inherit debug; wrapQtAppsHook = null; } 150 - stdenv.mkDerivation; 151 - } 152 - { inherit self srcs patches; }; 153 - 154 - callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; 155 - in { 156 - 157 - inherit callPackage qtCompatVersion qtModule srcs; 158 - 159 - mkDerivationWith = 160 - import ../mkDerivation.nix 161 - { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; 162 - 163 - mkDerivation = mkDerivationWith stdenv.mkDerivation; 164 - 165 - qtbase = callPackage ../modules/qtbase.nix { 166 - inherit (srcs.qtbase) src version; 167 - patches = patches.qtbase; 168 - inherit bison cups harfbuzz libGL; 169 - withGtk3 = !stdenv.isDarwin; inherit dconf gtk3; 170 - inherit debug developerBuild decryptSslTraffic; 171 - inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth 172 - CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit; 173 - inherit (darwin) libobjc; 174 - }; 175 - 176 - qt3d = callPackage ../modules/qt3d.nix {}; 177 - qtcharts = callPackage ../modules/qtcharts.nix {}; 178 - qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; 179 - qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; 180 - qtdoc = callPackage ../modules/qtdoc.nix {}; 181 - qtgamepad = callPackage ../modules/qtgamepad.nix { 182 - inherit (darwin.apple_sdk.frameworks) GameController; 183 - }; 184 - qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; 185 - qtimageformats = callPackage ../modules/qtimageformats.nix {}; 186 - qtlocation = callPackage ../modules/qtlocation.nix {}; 187 - qtmacextras = callPackage ../modules/qtmacextras.nix {}; 188 - qtmultimedia = callPackage ../modules/qtmultimedia.nix { 189 - inherit gstreamer gst-plugins-base; 190 - }; 191 - qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; 192 - qtquick1 = null; 193 - qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; 194 - qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; 195 - qtscript = callPackage ../modules/qtscript.nix {}; 196 - qtsensors = callPackage ../modules/qtsensors.nix {}; 197 - qtserialbus = callPackage ../modules/qtserialbus.nix {}; 198 - qtserialport = callPackage ../modules/qtserialport.nix {}; 199 - qtspeech = callPackage ../modules/qtspeech.nix {}; 200 - qtsvg = callPackage ../modules/qtsvg.nix {}; 201 - qtscxml = callPackage ../modules/qtscxml.nix {}; 202 - qttools = callPackage ../modules/qttools.nix {}; 203 - qttranslations = callPackage ../modules/qttranslations.nix {}; 204 - qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; 205 - qtwayland = callPackage ../modules/qtwayland.nix {}; 206 - qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; 207 - qtwebengine = callPackage ../modules/qtwebengine.nix { 208 - python = python2; 209 - inherit (darwin) cctools libobjc libunwind xnu; 210 - inherit (darwin.apple_sdk.libs) sandbox; 211 - inherit (darwin.apple_sdk.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit 212 - ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication; 213 - }; 214 - qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; 215 - qtwebkit = callPackage ../modules/qtwebkit.nix { 216 - inherit (darwin) ICU; 217 - inherit (darwin.apple_sdk.frameworks) OpenGL; 218 - }; 219 - qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; 220 - qtwebview = callPackage ../modules/qtwebview.nix { 221 - inherit (darwin.apple_sdk.frameworks) CoreFoundation WebKit; 222 - }; 223 - qtx11extras = callPackage ../modules/qtx11extras.nix {}; 224 - qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; 225 - 226 - env = callPackage ../qt-env.nix {}; 227 - full = env "qt-full-${qtbase.version}" ([ 228 - qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad qtgraphicaleffects 229 - qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 230 - qtscript qtsensors qtserialport qtsvg qttools qttranslations 231 - qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets 232 - qtwebview qtx11extras qtxmlpatterns 233 - ] ++ lib.optional (!stdenv.isDarwin) qtwayland 234 - ++ lib.optional (stdenv.isDarwin) qtmacextras); 235 - 236 - qmake = makeSetupHook { 237 - deps = [ self.qtbase.dev ]; 238 - substitutions = { 239 - inherit debug; 240 - fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; 241 - }; 242 - } ../hooks/qmake-hook.sh; 243 - 244 - wrapQtAppsHook = makeSetupHook { 245 - deps = [ self.qtbase.dev buildPackages.makeWrapper ] 246 - ++ lib.optional stdenv.isLinux self.qtwayland.dev; 247 - } ../hooks/wrap-qt-apps-hook.sh; 248 - }; 249 - 250 - in lib.makeScope newScope addPackages
-2
pkgs/development/libraries/qt-5/5.12/fetch.sh
··· 1 - WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.10/submodules/ \ 2 - -A '*.tar.xz' )
-387
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
··· 1 - diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf 2 - index b77494ec..470c38e7 100644 3 - --- a/mkspecs/common/mac.conf 4 - +++ b/mkspecs/common/mac.conf 5 - @@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \ 6 - 7 - QMAKE_FIX_RPATH = install_name_tool -id 8 - 9 - -QMAKE_LFLAGS_RPATH = -Wl,-rpath, 10 - +QMAKE_LFLAGS_RPATH = 11 - QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip 12 - 13 - QMAKE_LFLAGS_REL_RPATH = 14 - diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf 15 - index d052808c..b80ec1e8 100644 16 - --- a/mkspecs/features/mac/default_post.prf 17 - +++ b/mkspecs/features/mac/default_post.prf 18 - @@ -68,208 +68,6 @@ qt { 19 - } 20 - } 21 - 22 - -# Add the same default rpaths as Xcode does for new projects. 23 - -# This is especially important for iOS/tvOS/watchOS where no other option is possible. 24 - -!no_default_rpath { 25 - - QMAKE_RPATHDIR += @executable_path/../Frameworks 26 - - equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks 27 - -} 28 - - 29 - -# Don't pass -headerpad_max_install_names when using Bitcode. 30 - -# In that case the linker emits a warning stating that the flag is ignored when 31 - -# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). 32 - -# Using this flag is also unnecessary in practice on UIKit platforms since they 33 - -# are sandboxed, and only UIKit platforms support bitcode to begin with. 34 - -!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD 35 - - 36 - -app_extension_api_only { 37 - - QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION 38 - - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION 39 - - QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION 40 - - QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION 41 - -} 42 - - 43 - -macx-xcode { 44 - - qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO 45 - - !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ 46 - - qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO 47 - - else: \ 48 - - qmake_pkginfo_typeinfo.value = "????" 49 - - QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo 50 - - 51 - - bundle_version = $$VERSION 52 - - isEmpty(bundle_version): bundle_version = 1.0.0 53 - - 54 - - l = $$split(bundle_version, '.') 0 0 # make sure there are at least three 55 - - VER_MAJ = $$member(l, 0, 0) 56 - - VER_MIN = $$member(l, 1, 1) 57 - - VER_PAT = $$member(l, 2, 2) 58 - - unset(l) 59 - - 60 - - qmake_full_version.name = QMAKE_FULL_VERSION 61 - - qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} 62 - - QMAKE_MAC_XCODE_SETTINGS += qmake_full_version 63 - - 64 - - qmake_short_version.name = QMAKE_SHORT_VERSION 65 - - qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} 66 - - QMAKE_MAC_XCODE_SETTINGS += qmake_short_version 67 - - 68 - - !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { 69 - - debug_information_format.name = DEBUG_INFORMATION_FORMAT 70 - - debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT 71 - - debug_information_format.build = debug 72 - - QMAKE_MAC_XCODE_SETTINGS += debug_information_format 73 - - } 74 - - 75 - - QMAKE_XCODE_ARCHS = 76 - - 77 - - arch_device.name = "ARCHS[sdk=$${device.sdk}*]" 78 - - arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS 79 - - QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS 80 - - QMAKE_MAC_XCODE_SETTINGS += arch_device 81 - - 82 - - simulator { 83 - - arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" 84 - - arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS 85 - - QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS 86 - - QMAKE_MAC_XCODE_SETTINGS += arch_simulator 87 - - } 88 - - 89 - - only_active_arch.name = ONLY_ACTIVE_ARCH 90 - - only_active_arch.value = YES 91 - - only_active_arch.build = debug 92 - - QMAKE_MAC_XCODE_SETTINGS += only_active_arch 93 - -} else { 94 - - device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS 95 - - simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS 96 - - VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS 97 - - 98 - - isEmpty(VALID_ARCHS): \ 99 - - error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") 100 - - 101 - - single_arch: VALID_ARCHS = $$first(VALID_ARCHS) 102 - - 103 - - ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) 104 - - ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) 105 - - 106 - - QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS 107 - - 108 - - arch_flags = $(EXPORT_ARCH_ARGS) 109 - - 110 - - QMAKE_CFLAGS += $$arch_flags 111 - - QMAKE_CXXFLAGS += $$arch_flags 112 - - QMAKE_LFLAGS += $$arch_flags 113 - - 114 - - QMAKE_PCH_ARCHS = $$VALID_ARCHS 115 - - 116 - - macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET 117 - - ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET 118 - - tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET 119 - - watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET 120 - - 121 - - # If we're doing a simulator and device build, device and simulator 122 - - # architectures use different paths and flags for the sysroot and 123 - - # deployment target switch, so we must multiplex them across multiple 124 - - # architectures using -Xarch. Otherwise we fall back to the simple path. 125 - - # This is not strictly necessary, but results in cleaner command lines 126 - - # and makes it easier for people to override EXPORT_VALID_ARCHS to limit 127 - - # individual rules to a different set of architecture(s) from the overall 128 - - # build (such as machtest in QtCore). 129 - - simulator:device { 130 - - QMAKE_XARCH_CFLAGS = 131 - - QMAKE_XARCH_LFLAGS = 132 - - QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS 133 - - 134 - - for (arch, VALID_ARCHS) { 135 - - contains(VALID_SIMULATOR_ARCHS, $$arch) { 136 - - sdk = $$simulator.sdk 137 - - version_identifier = $$simulator.deployment_identifier 138 - - } else { 139 - - sdk = $$device.sdk 140 - - version_identifier = $$device.deployment_identifier 141 - - } 142 - - 143 - - version_min_flags = \ 144 - - -Xarch_$${arch} \ 145 - - -m$${version_identifier}-version-min=$$deployment_target 146 - - QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ 147 - - -Xarch_$${arch} \ 148 - - -isysroot$$xcodeSDKInfo(Path, $$sdk) 149 - - QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ 150 - - -Xarch_$${arch} \ 151 - - -isysroot$$xcodeSDKInfo(Path, $$sdk) 152 - - 153 - - QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) 154 - - QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) 155 - - 156 - - QMAKE_EXTRA_VARIABLES += \ 157 - - QMAKE_XARCH_CFLAGS_$${arch} \ 158 - - QMAKE_XARCH_LFLAGS_$${arch} 159 - - } 160 - - 161 - - QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) 162 - - QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) 163 - - QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) 164 - - } else { 165 - - simulator: \ 166 - - version_identifier = $$simulator.deployment_identifier 167 - - else: \ 168 - - version_identifier = $$device.deployment_identifier 169 - - version_min_flag = -m$${version_identifier}-version-min=$$deployment_target 170 - - QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag 171 - - QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag 172 - - QMAKE_LFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag 173 - - } 174 - - 175 - - # Enable precompiled headers for multiple architectures 176 - - QMAKE_CFLAGS_USE_PRECOMPILE = 177 - - for (arch, VALID_ARCHS) { 178 - - icc_pch_style: \ 179 - - use_flag = "-pch-use " 180 - - else: \ 181 - - use_flag = -include 182 - - 183 - - # Only use Xarch with multi-arch, as the option confuses ccache 184 - - count(VALID_ARCHS, 1, greaterThan): \ 185 - - QMAKE_CFLAGS_USE_PRECOMPILE += \ 186 - - -Xarch_$${arch} 187 - - 188 - - QMAKE_CFLAGS_USE_PRECOMPILE += \ 189 - - $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} 190 - - } 191 - - icc_pch_style { 192 - - QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} 193 - - QMAKE_CFLAGS_USE_PRECOMPILE = 194 - - } else { 195 - - QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE 196 - - QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE 197 - - QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE 198 - - } 199 - - 200 - - QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} 201 - -} 202 - - 203 - -!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) { 204 - - # Explicit SDK version has been set, respect that 205 - - QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version 206 - -} 207 - - 208 - -cache(QMAKE_XCODE_DEVELOPER_PATH, stash) 209 - -!isEmpty(QMAKE_XCODE_VERSION): \ 210 - - cache(QMAKE_XCODE_VERSION, stash) 211 - - 212 - -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() 213 - - 214 - -xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER 215 - -xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX 216 - -isEmpty(xcode_product_bundle_identifier_setting.value): \ 217 - - xcode_product_bundle_identifier_setting.value = "com.yourcompany" 218 - -xcode_product_bundle_target = $$QMAKE_BUNDLE 219 - -isEmpty(xcode_product_bundle_target): \ 220 - - xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} 221 - -xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" 222 - -QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting 223 - - 224 - !macx-xcode { 225 - generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS 226 - generate_xcode_project.target = xcodeproj 227 - diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf 228 - index e3534561..3b01424e 100644 229 - --- a/mkspecs/features/mac/default_pre.prf 230 - +++ b/mkspecs/features/mac/default_pre.prf 231 - @@ -1,60 +1,2 @@ 232 - CONFIG = asset_catalogs rez $$CONFIG 233 - load(default_pre) 234 - - 235 - -isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { 236 - - # Get path of Xcode's Developer directory 237 - - QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") 238 - - isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ 239 - - error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") 240 - - 241 - - # Make sure Xcode path is valid 242 - - !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ 243 - - error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") 244 - -} 245 - - 246 - -isEmpty(QMAKE_XCODEBUILD_PATH): \ 247 - - QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") 248 - - 249 - -!isEmpty(QMAKE_XCODEBUILD_PATH) { 250 - - # Make sure Xcode is set up properly 251 - - !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ 252 - - error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") 253 - - 254 - - isEmpty(QMAKE_XCODE_VERSION) { 255 - - # Extract Xcode version using xcodebuild 256 - - xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") 257 - - QMAKE_XCODE_VERSION = $$member(xcode_version, 1) 258 - - isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") 259 - - unset(xcode_version) 260 - - } 261 - -} 262 - - 263 - -isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { 264 - - QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist 265 - - exists($$QMAKE_XCODE_PREFERENCES_FILE): \ 266 - - QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") 267 - - 268 - - !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ 269 - - cache(QMAKE_TARGET_BUNDLE_PREFIX) 270 - -} 271 - - 272 - -QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon 273 - - 274 - -# Make the default debug info format for static debug builds 275 - -# DWARF instead of DWARF with dSYM. This cuts down build times 276 - -# for application debug builds significantly, as Xcode doesn't 277 - -# have to pull out all the DWARF info from the Qt static libs 278 - -# and put it into a dSYM file. We don't need that dSYM file in 279 - -# the first place, since the information is available in the 280 - -# object files inside the archives (static libraries). 281 - -macx-xcode:qtConfig(static): \ 282 - - QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf 283 - - 284 - -# This variable is used by the xcode_dynamic_library_suffix 285 - -# feature, which allows Xcode to choose the Qt libraries to link to 286 - -# at build time, depending on the current Xcode SDK and configuration. 287 - -QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX 288 - - 289 - -xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP 290 - -xcode_copy_phase_strip_setting.value = NO 291 - -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting 292 - diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk 293 - index c40f58c9..e69de29b 100644 294 - --- a/mkspecs/features/mac/sdk.mk 295 - +++ b/mkspecs/features/mac/sdk.mk 296 - @@ -1,25 +0,0 @@ 297 - - 298 - -ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) 299 - - CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1 300 - - CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) 301 - - ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) 302 - - # We don't want to complain about out of date SDK unless the target needs to be remade. 303 - - # This covers use-cases such as running 'make check' after moving the build to a 304 - - # computer without Xcode or with a different Xcode version. 305 - - TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) 306 - - ifeq ($(TARGET_UP_TO_DATE),0) 307 - - ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) 308 - - $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) 309 - - else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) 310 - - $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) 311 - - else ifneq ($(CURRENT_MAC_SDK_VERSION),) 312 - - $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) 313 - - else 314 - - $(info Unknown error resolving current platform SDK version.) 315 - - endif 316 - - $(info This requires a fresh build. Please wipe the build directory completely,) 317 - - $(info including any .qmake.stash and .qmake.cache files generated by qmake.) 318 - - $(error ^) 319 - - endif 320 - - endif 321 - -endif 322 - diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf 323 - index 3a9c2778..e69de29b 100644 324 - --- a/mkspecs/features/mac/sdk.prf 325 - +++ b/mkspecs/features/mac/sdk.prf 326 - @@ -1,61 +0,0 @@ 327 - - 328 - -isEmpty(QMAKE_MAC_SDK): \ 329 - - error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") 330 - - 331 - -contains(QMAKE_MAC_SDK, .*/.*): \ 332 - - error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") 333 - - 334 - -defineReplace(xcodeSDKInfo) { 335 - - info = $$1 336 - - equals(info, "Path"): \ 337 - - infoarg = --show-sdk-path 338 - - equals(info, "PlatformPath"): \ 339 - - infoarg = --show-sdk-platform-path 340 - - equals(info, "SDKVersion"): \ 341 - - infoarg = --show-sdk-version 342 - - sdk = $$2 343 - - isEmpty(sdk): \ 344 - - sdk = $$QMAKE_MAC_SDK 345 - - 346 - - isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { 347 - - QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null") 348 - - # --show-sdk-platform-path won't work for Command Line Tools; this is fine 349 - - # only used by the XCTest backend to testlib 350 - - isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \ 351 - - error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg") 352 - - cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) 353 - - } 354 - - 355 - - return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) 356 - -} 357 - - 358 - -QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) 359 - -QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) 360 - -QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) 361 - - 362 - -isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) { 363 - - QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL 364 - - sysrootified = 365 - - for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val 366 - - QMAKE_INCDIR_OPENGL = $$sysrootified 367 - -} 368 - - 369 - -QMAKESPEC_NAME = $$basename(QMAKESPEC) 370 - - 371 - -# Resolve SDK version of various tools 372 - -for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) { 373 - - tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} 374 - - !isEmpty($$tool_variable) { 375 - - $$tool = $$eval($$tool_variable) 376 - - next() 377 - - } 378 - - 379 - - value = $$eval($$tool) 380 - - isEmpty(value): next() 381 - - 382 - - sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") 383 - - isEmpty(sysrooted): next() 384 - - 385 - - $$tool = $$sysrooted $$member(value, 1, -1) 386 - - cache($$tool_variable, set stash, $$tool) 387 - -}
-116
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch
··· 1 - From 203c9338dc92c2c36007cfe6633387348976637e Mon Sep 17 00:00:00 2001 2 - From: Thomas Tuegel <ttuegel@mailbox.org> 3 - Date: Tue, 17 Sep 2019 05:37:15 -0500 4 - Subject: [PATCH 02/12] qtbase-mac 5 - 6 - --- 7 - src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++-- 8 - src/testlib/qappletestlogger.cpp | 2 +- 9 - src/testlib/qappletestlogger_p.h | 2 +- 10 - src/testlib/qtestcase.cpp | 2 +- 11 - src/testlib/qtestlog.cpp | 2 +- 12 - src/testlib/qtestlog_p.h | 2 +- 13 - 6 files changed, 19 insertions(+), 7 deletions(-) 14 - 15 - diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h 16 - index f96e7358..650946b7 100644 17 - --- a/src/corelib/kernel/qcore_mac_p.h 18 - +++ b/src/corelib/kernel/qcore_mac_p.h 19 - @@ -212,7 +212,7 @@ private: 20 - 21 - // -------------------------------------------------------------------------- 22 - 23 - -#if !defined(QT_BOOTSTRAPPED) 24 - +#if 0 25 - 26 - QT_END_NAMESPACE 27 - #include <os/activity.h> 28 - @@ -290,7 +290,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); 29 - 30 - #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); 31 - 32 - -#endif // !defined(QT_BOOTSTRAPPED) 33 - +#else // !defined(QT_BOOTSTRAPPED) 34 - + 35 - +#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) 36 - +#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) 37 - +#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) 38 - + 39 - +#define QT_APPLE_LOG_ACTIVITY2(...) 40 - +#define QT_APPLE_LOG_ACTIVITY1(...) 41 - +#define QT_APPLE_LOG_ACTIVITY(...) 42 - + 43 - +#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) 44 - + 45 - +#endif 46 - 47 - // ------------------------------------------------------------------------- 48 - 49 - diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp 50 - index dfeadebd..2a74330c 100644 51 - --- a/src/testlib/qappletestlogger.cpp 52 - +++ b/src/testlib/qappletestlogger.cpp 53 - @@ -43,7 +43,7 @@ 54 - 55 - QT_BEGIN_NAMESPACE 56 - 57 - -#if defined(QT_USE_APPLE_UNIFIED_LOGGING) 58 - +#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 59 - 60 - using namespace QTestPrivate; 61 - 62 - diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h 63 - index 62c6d95c..f8e0a3b7 100644 64 - --- a/src/testlib/qappletestlogger_p.h 65 - +++ b/src/testlib/qappletestlogger_p.h 66 - @@ -57,7 +57,7 @@ 67 - 68 - QT_BEGIN_NAMESPACE 69 - 70 - -#if defined(QT_USE_APPLE_UNIFIED_LOGGING) 71 - +#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 72 - class QAppleTestLogger : public QAbstractTestLogger 73 - { 74 - public: 75 - diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp 76 - index 0c935a1f..22f2d75d 100644 77 - --- a/src/testlib/qtestcase.cpp 78 - +++ b/src/testlib/qtestcase.cpp 79 - @@ -850,7 +850,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml) 80 - 81 - bool addFallbackLogger = !explicitLoggerRequested; 82 - 83 - -#if defined(QT_USE_APPLE_UNIFIED_LOGGING) 84 - +#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 85 - // Any explicitly requested loggers will be added by now, so we can check if they use stdout 86 - const bool safeToAddAppleLogger = !AppleUnifiedLogger::willMirrorToStderr() || !QTestLog::loggerUsingStdout(); 87 - if (safeToAddAppleLogger && QAppleTestLogger::debugLoggingEnabled()) { 88 - diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp 89 - index 57bb7d95..33fb8162 100644 90 - --- a/src/testlib/qtestlog.cpp 91 - +++ b/src/testlib/qtestlog.cpp 92 - @@ -460,7 +460,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename) 93 - case QTestLog::TAP: 94 - logger = new QTapTestLogger(filename); 95 - break; 96 - -#if defined(QT_USE_APPLE_UNIFIED_LOGGING) 97 - +#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 98 - case QTestLog::Apple: 99 - logger = new QAppleTestLogger; 100 - break; 101 - diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h 102 - index e63e89a7..213b6945 100644 103 - --- a/src/testlib/qtestlog_p.h 104 - +++ b/src/testlib/qtestlog_p.h 105 - @@ -68,7 +68,7 @@ class Q_TESTLIB_EXPORT QTestLog 106 - public: 107 - enum LogMode { 108 - Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP 109 - -#if defined(QT_USE_APPLE_UNIFIED_LOGGING) 110 - +#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 111 - , Apple 112 - #endif 113 - #if defined(HAVE_XCTEST) 114 - -- 115 - 2.23.0 116 -
-491
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0003-qtbase-mkspecs.patch
··· 1 - From 9ffbcc5e362d17aea3e3d67e43cd3cd993e987eb Mon Sep 17 00:00:00 2001 2 - From: OPNA2608 <christoph.neidahl@gmail.com> 3 - Date: Mon, 12 Apr 2021 20:05:25 +0200 4 - Subject: [PATCH 03/12] qtbase-mkspecs 5 - 6 - --- 7 - mkspecs/features/create_cmake.prf | 53 ++++-------- 8 - .../data/cmake/Qt5BasicConfig.cmake.in | 80 +------------------ 9 - mkspecs/features/qml_module.prf | 2 +- 10 - mkspecs/features/qml_plugin.prf | 2 +- 11 - mkspecs/features/qt_app.prf | 2 +- 12 - mkspecs/features/qt_build_paths.prf | 4 +- 13 - mkspecs/features/qt_docs.prf | 10 +-- 14 - mkspecs/features/qt_example_installs.prf | 2 +- 15 - mkspecs/features/qt_functions.prf | 27 ++++--- 16 - mkspecs/features/qt_installs.prf | 22 ++--- 17 - mkspecs/features/qt_plugin.prf | 2 +- 18 - 11 files changed, 53 insertions(+), 153 deletions(-) 19 - 20 - diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf 21 - index 02e5775983..3782949d32 100644 22 - --- a/mkspecs/features/create_cmake.prf 23 - +++ b/mkspecs/features/create_cmake.prf 24 - @@ -21,7 +21,7 @@ load(cmake_functions) 25 - # at cmake time whether package has been found via a symlink, and correct 26 - # that to an absolute path. This is only done for installations to 27 - # the /usr or / prefix. 28 - -CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS]) 29 - +CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$NIX_OUTPUT_OUT/lib/) 30 - contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR 31 - 32 - CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake 33 - @@ -70,45 +70,20 @@ split_incpath { 34 - $$cmake_extra_source_includes.output 35 - } 36 - 37 - -CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX]) 38 - -contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { 39 - - CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ 40 - - CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True 41 - -} 42 - +CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/ 43 - +CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True 44 - 45 - -CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) 46 - -contains(CMAKE_LIB_DIR,"^\\.\\./.*") { 47 - - CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ 48 - - CMAKE_LIB_DIR_IS_ABSOLUTE = True 49 - -} else { 50 - - CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS]) 51 - - # We need to go up another two levels because the CMake files are 52 - - # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} 53 - - CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" 54 - -} 55 - +CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/ 56 - +CMAKE_BIN_DIR_IS_ABSOLUTE = True 57 - 58 - -CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) 59 - -contains(CMAKE_BIN_DIR, "^\\.\\./.*") { 60 - - CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ 61 - - CMAKE_BIN_DIR_IS_ABSOLUTE = True 62 - -} 63 - +CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ 64 - +CMAKE_LIB_DIR_IS_ABSOLUTE = True 65 - 66 - -CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]) 67 - -contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { 68 - - CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/ 69 - - CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True 70 - -} 71 - - 72 - -win32:!static:!staticlib { 73 - - CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) 74 - - contains(CMAKE_DLL_DIR, "^\\.\\./.*") { 75 - - CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ 76 - - CMAKE_DLL_DIR_IS_ABSOLUTE = True 77 - - } 78 - -} else { 79 - - CMAKE_DLL_DIR = $$CMAKE_LIB_DIR 80 - - CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE 81 - -} 82 - +CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/ 83 - +CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True 84 - + 85 - +CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ 86 - +CMAKE_DLL_DIR_IS_ABSOLUTE = True 87 - 88 - static|staticlib:CMAKE_STATIC_TYPE = true 89 - 90 - @@ -188,7 +163,7 @@ contains(CONFIG, plugin) { 91 - cmake_target_file 92 - 93 - cmake_qt5_plugin_file.files = $$cmake_target_file.output 94 - - cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} 95 - + cmake_qt5_plugin_file.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} 96 - INSTALLS += cmake_qt5_plugin_file 97 - 98 - return() 99 - @@ -334,7 +309,7 @@ exists($$cmake_macros_file.input) { 100 - cmake_qt5_module_files.files += $$cmake_macros_file.output 101 - } 102 - 103 - -cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} 104 - +cmake_qt5_module_files.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} 105 - 106 - # We are generating cmake files. Most developers of Qt are not aware of cmake, 107 - # so we require automatic tests to be available. The only module which should 108 - diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 109 - index c729892889..c60ef16e64 100644 110 - --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 111 - +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 112 - @@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) 113 - message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") 114 - endif() 115 - 116 - -!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) 117 - -!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 118 - -set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") 119 - -!!ELSE 120 - -get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) 121 - -# Use original install prefix when loaded through a 122 - -# cross-prefix symbolic link such as /lib -> /usr/lib. 123 - -get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) 124 - -get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) 125 - -if(_realCurr STREQUAL _realOrig) 126 - - get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) 127 - -else() 128 - - get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) 129 - -endif() 130 - -unset(_realOrig) 131 - -unset(_realCurr) 132 - -unset(_IMPORT_PREFIX) 133 - -!!ENDIF 134 - -!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 135 - -get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) 136 - -!!ELSE 137 - -set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") 138 - -!!ENDIF 139 - - 140 - !!IF !equals(TEMPLATE, aux) 141 - # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. 142 - set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") 143 - @@ -52,11 +28,7 @@ endmacro() 144 - macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) 145 - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) 146 - 147 - -!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) 148 - - set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") 149 - -!!ELSE 150 - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") 151 - -!!ENDIF 152 - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) 153 - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES 154 - \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" 155 - @@ -69,11 +41,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI 156 - ) 157 - 158 - !!IF !isEmpty(CMAKE_WINDOWS_BUILD) 159 - -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 160 - - set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") 161 - -!!ELSE 162 - set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") 163 - -!!ENDIF 164 - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) 165 - if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") 166 - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES 167 - @@ -89,24 +57,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) 168 - !!IF !no_module_headers 169 - !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) 170 - set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS 171 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" 172 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" 173 - + \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" 174 - + \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" 175 - ) 176 - !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) 177 - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS 178 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" 179 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" 180 - - ) 181 - -!!ELSE 182 - - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") 183 - -!!ENDIF 184 - -!!ELSE 185 - -!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) 186 - - set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") 187 - -!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) 188 - - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS 189 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" 190 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" 191 - + \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" 192 - + \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" 193 - ) 194 - !!ELSE 195 - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") 196 - @@ -122,7 +79,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) 197 - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") 198 - !!ENDIF 199 - !!ENDIF 200 - -!!ENDIF 201 - !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) 202 - include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) 203 - !!ENDIF 204 - @@ -272,25 +228,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) 205 - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) 206 - !!IF isEmpty(CMAKE_DEBUG_TYPE) 207 - !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) 208 - -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 209 - - if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) 210 - -!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE 211 - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) 212 - -!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE 213 - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) 214 - !!ELSE // CMAKE_STATIC_WINDOWS_BUILD 215 - if (EXISTS 216 - -!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) 217 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" 218 - -!!ELSE 219 - \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" 220 - -!!ENDIF 221 - AND EXISTS 222 - -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 223 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) 224 - -!!ELSE 225 - \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) 226 - -!!ENDIF 227 - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) 228 - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD 229 - endif() 230 - @@ -309,25 +253,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) 231 - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) 232 - !!IF isEmpty(CMAKE_RELEASE_TYPE) 233 - !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) 234 - -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 235 - - if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) 236 - -!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE 237 - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) 238 - -!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE 239 - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) 240 - !!ELSE // CMAKE_STATIC_WINDOWS_BUILD 241 - if (EXISTS 242 - -!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) 243 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" 244 - -!!ELSE 245 - \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" 246 - -!!ENDIF 247 - AND EXISTS 248 - -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 249 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) 250 - -!!ELSE 251 - \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) 252 - -!!ENDIF 253 - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) 254 - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD 255 - endif() 256 - @@ -346,11 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) 257 - macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) 258 - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) 259 - 260 - -!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) 261 - - set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") 262 - -!!ELSE 263 - set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") 264 - -!!ENDIF 265 - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) 266 - set_target_properties(Qt5::${Plugin} PROPERTIES 267 - \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} 268 - diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf 269 - index 57cfec78b3..5cbd7c52ef 100644 270 - --- a/mkspecs/features/qml_module.prf 271 - +++ b/mkspecs/features/qml_module.prf 272 - @@ -51,7 +51,7 @@ builtin_resources { 273 - # Install rules 274 - qmldir.base = $$qmldir_path 275 - qmldir.files = $$qmldir_file 276 - -qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH 277 - +qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH 278 - INSTALLS += qmldir 279 - 280 - qmlfiles.base = $$_PRO_FILE_PWD_ 281 - diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf 282 - index ad8ecdf5f1..804634b22e 100644 283 - --- a/mkspecs/features/qml_plugin.prf 284 - +++ b/mkspecs/features/qml_plugin.prf 285 - @@ -50,7 +50,7 @@ load(qt_build_paths) 286 - 287 - DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH 288 - 289 - -target.path = $$[QT_INSTALL_QML]/$$TARGETPATH 290 - +target.path = $$NIX_OUTPUT_QML/$$TARGETPATH 291 - INSTALLS += target 292 - 293 - # Some final setup 294 - diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf 295 - index 8354f30eea..62028fef8e 100644 296 - --- a/mkspecs/features/qt_app.prf 297 - +++ b/mkspecs/features/qt_app.prf 298 - @@ -30,7 +30,7 @@ host_build:force_bootstrap { 299 - target.path = $$[QT_HOST_BINS] 300 - } else { 301 - !build_pass:qtConfig(debug_and_release): CONFIG += release 302 - - target.path = $$[QT_INSTALL_BINS] 303 - + target.path = $$NIX_OUTPUT_BIN/bin 304 - CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable 305 - } 306 - INSTALLS += target 307 - diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf 308 - index 3bb3823a8e..655b7b7db8 100644 309 - --- a/mkspecs/features/qt_build_paths.prf 310 - +++ b/mkspecs/features/qt_build_paths.prf 311 - @@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \ 312 - !force_independent { 313 - # If the module is not built independently, everything ends up in qtbase. 314 - # This is the case in non-prefix builds, except for selected modules. 315 - - MODULE_BASE_OUTDIR = $$[QT_HOST_PREFIX] 316 - - MODULE_QMAKE_OUTDIR = $$[QT_HOST_PREFIX] 317 - + MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT 318 - + MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT 319 - } 320 - diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf 321 - index 3b74cd4dd5..6bfbbe6e2d 100644 322 - --- a/mkspecs/features/qt_docs.prf 323 - +++ b/mkspecs/features/qt_docs.prf 324 - @@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR 325 - 326 - QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) 327 - !build_online_docs: \ 328 - - QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS]) 329 - + QDOC += -installdir $$shell_quote($$NIX_OUTPUT_DOC) 330 - PREP_DOC_INDEXES = 331 - DOC_INDEXES = 332 - !isEmpty(QTREPOS) { 333 - @@ -64,8 +64,8 @@ DOC_INDEXES = 334 - DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) 335 - } else { 336 - prepare_docs: \ 337 - - PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) 338 - - DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) 339 - + PREP_DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) 340 - + DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) 341 - } 342 - 343 - qtattributionsscanner.target = qtattributionsscanner 344 - @@ -88,12 +88,12 @@ prepare_docs { 345 - qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) 346 - 347 - inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR 348 - - inst_html_docs.path = $$[QT_INSTALL_DOCS] 349 - + inst_html_docs.path = $$NIX_OUTPUT_DOC 350 - inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build 351 - INSTALLS += inst_html_docs 352 - 353 - inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch 354 - - inst_qch_docs.path = $$[QT_INSTALL_DOCS] 355 - + inst_qch_docs.path = $$NIX_OUTPUT_DOC 356 - inst_qch_docs.CONFIG += no_check_exist no_default_install no_build 357 - INSTALLS += inst_qch_docs 358 - 359 - diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf 360 - index 43b58817fe..e635b8f67a 100644 361 - --- a/mkspecs/features/qt_example_installs.prf 362 - +++ b/mkspecs/features/qt_example_installs.prf 363 - @@ -88,7 +88,7 @@ sourcefiles += \ 364 - $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ 365 - $$DBUS_ADAPTORS $$DBUS_INTERFACES 366 - addInstallFiles(sources.files, $$sourcefiles) 367 - -sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase 368 - +sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase 369 - INSTALLS += sources 370 - 371 - check_examples { 372 - diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 373 - index 1903e509c8..1dc117a388 100644 374 - --- a/mkspecs/features/qt_functions.prf 375 - +++ b/mkspecs/features/qt_functions.prf 376 - @@ -69,19 +69,22 @@ defineTest(qtHaveModule) { 377 - defineTest(qtPrepareTool) { 378 - cmd = $$eval(QT_TOOL.$${2}.binary) 379 - isEmpty(cmd) { 380 - - cmd = $$[QT_HOST_BINS]/$$2 381 - - exists($${cmd}.pl) { 382 - - $${1}_EXE = $${cmd}.pl 383 - - cmd = perl -w $$system_path($${cmd}.pl) 384 - - } else: contains(QMAKE_HOST.os, Windows) { 385 - - $${1}_EXE = $${cmd}.exe 386 - - cmd = $$system_path($${cmd}.exe) 387 - - } else:contains(QMAKE_HOST.os, Darwin) { 388 - - BUNDLENAME = $${cmd}.app/Contents/MacOS/$$2 389 - - exists($$BUNDLENAME) { 390 - - cmd = $$BUNDLENAME 391 - + cmd = $$system("command -v $${2}") 392 - + isEmpty(cmd) { 393 - + cmd = $$system("command -v $${2}.pl") 394 - + !isEmpty(cmd) { 395 - + $${1}_EXE = $$cmd 396 - + cmd = perl -w $$system_path($${cmd}) 397 - + } else: contains(QMAKE_HOST.os, Windows) { 398 - + cmd = $$system("command -v $${2}.exe") 399 - + $${1}_EXE = $$cmd 400 - + } else: contains(QMAKE_HOST.os, Darwin) { 401 - + cmd = $$system("command -v $${2}.app") 402 - + !isEmpty(cmd) { 403 - + cmd = $${cmd}/Contents/MacOS/$${2} 404 - + $${1}_EXE = $$cmd 405 - + } 406 - } 407 - - $${1}_EXE = $$cmd 408 - } else { 409 - $${1}_EXE = $$cmd 410 - } 411 - diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf 412 - index 1ebca17366..b784441da0 100644 413 - --- a/mkspecs/features/qt_installs.prf 414 - +++ b/mkspecs/features/qt_installs.prf 415 - @@ -12,16 +12,10 @@ 416 - #library 417 - !qt_no_install_library { 418 - win32 { 419 - - host_build: \ 420 - - dlltarget.path = $$[QT_HOST_BINS] 421 - - else: \ 422 - - dlltarget.path = $$[QT_INSTALL_BINS] 423 - + dlltarget.path = $$NIX_OUTPUT_BIN/bin 424 - INSTALLS += dlltarget 425 - } 426 - - host_build: \ 427 - - target.path = $$[QT_HOST_LIBS] 428 - - else: \ 429 - - target.path = $$[QT_INSTALL_LIBS] 430 - + target.path = $$NIX_OUTPUT_OUT/lib 431 - !static: target.CONFIG = no_dll 432 - INSTALLS += target 433 - } 434 - @@ -29,35 +23,35 @@ 435 - #headers 436 - qt_install_headers { 437 - gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES 438 - - gen_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME 439 - + gen_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME 440 - INSTALLS += gen_headers 441 - 442 - targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES 443 - - targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME 444 - + targ_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME 445 - INSTALLS += targ_headers 446 - 447 - private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES 448 - - private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private 449 - + private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private 450 - generated_privates: \ 451 - private_headers.CONFIG += no_check_exist 452 - INSTALLS += private_headers 453 - 454 - qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES 455 - - qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa 456 - + qpa_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa 457 - INSTALLS += qpa_headers 458 - } 459 - 460 - #module 461 - qt_install_module { 462 - !isEmpty(MODULE_PRI) { 463 - - pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules 464 - + pritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules 465 - pritarget.files = $$MODULE_PRI 466 - INSTALLS += pritarget 467 - } else: isEmpty(MODULE_PRIVATE_PRI) { 468 - warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.") 469 - } 470 - !isEmpty(MODULE_PRIVATE_PRI) { 471 - - privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules 472 - + privpritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules 473 - privpritarget.files = $$MODULE_PRIVATE_PRI 474 - INSTALLS += privpritarget 475 - } 476 - diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf 477 - index 40528a65e2..903f795284 100644 478 - --- a/mkspecs/features/qt_plugin.prf 479 - +++ b/mkspecs/features/qt_plugin.prf 480 - @@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { 481 - } 482 - } 483 - 484 - -target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE 485 - +target.path = $$NIX_OUTPUT_PLUGIN/$$PLUGIN_TYPE 486 - INSTALLS += target 487 - 488 - TARGET = $$qt5LibraryTarget($$TARGET) 489 - -- 490 - 2.29.3 491 -
-68
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0004-qtbase-replace-libdir.patch
··· 1 - From 492f6555bb09f207c83387441f0f23ba4602dfff Mon Sep 17 00:00:00 2001 2 - From: Thomas Tuegel <ttuegel@mailbox.org> 3 - Date: Wed, 18 Sep 2019 05:39:50 -0500 4 - Subject: [PATCH 04/12] qtbase-replace-libdir 5 - 6 - --- 7 - mkspecs/features/qt_common.prf | 20 ++------------------ 8 - mkspecs/features/qt_module.prf | 5 +---- 9 - 2 files changed, 3 insertions(+), 22 deletions(-) 10 - 11 - diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf 12 - index caecb68a84..d3aa3ba570 100644 13 - --- a/mkspecs/features/qt_common.prf 14 - +++ b/mkspecs/features/qt_common.prf 15 - @@ -30,32 +30,16 @@ contains(TEMPLATE, .*lib) { 16 - rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* 17 - else: \ 18 - rplbase = $$MODULE_BASE_OUTDIR 19 - - host_build { 20 - - qqt_libdir = \$\$\$\$[QT_HOST_LIBS] 21 - - qt_libdir = $$[QT_HOST_LIBS] 22 - - } else { 23 - - qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] 24 - - qt_libdir = $$[QT_INSTALL_LIBS] 25 - - } 26 - + qt_libdir = $$NIX_OUTPUT_OUT/lib 27 - contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { 28 - - lib_replace0.match = $$rplbase/lib/ 29 - - lib_replace0.replace = $$qqt_libdir/ 30 - - lib_replace0.CONFIG = path 31 - - QMAKE_PRL_INSTALL_REPLACE += lib_replace0 32 - lib_replace.match = "[^ ']*$$rplbase/lib" 33 - lib_replace.replace = 34 - } else { 35 - lib_replace.match = $$rplbase/lib 36 - - lib_replace.replace = $$qqt_libdir 37 - + lib_replace.replace = $$qt_libdir 38 - } 39 - lib_replace.CONFIG = path 40 - QMAKE_PRL_INSTALL_REPLACE += lib_replace 41 - - !equals(qt_libdir, $$rplbase/lib) { 42 - - qtlibdir_replace.match = $$qt_libdir 43 - - qtlibdir_replace.replace = $$qqt_libdir 44 - - qtlibdir_replace.CONFIG = path 45 - - QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace 46 - - } 47 - } 48 - 49 - # The remainder of this file must not apply to host tools/libraries, 50 - diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf 51 - index ee7de22059..9015b30d73 100644 52 - --- a/mkspecs/features/qt_module.prf 53 - +++ b/mkspecs/features/qt_module.prf 54 - @@ -303,10 +303,7 @@ load(qt_targets) 55 - } 56 - !lib_bundle:unix { 57 - CONFIG += create_libtool 58 - - host_build: \ 59 - - QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS] 60 - - else: \ 61 - - QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]" 62 - + QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib 63 - !isEmpty(lib_replace0.match) { 64 - ltlib_replace0.match = $$lib_replace0.match 65 - ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/ 66 - -- 67 - 2.23.GIT 68 -
-194
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0005-qtbase-cmake.patch
··· 1 - From 6f53835deae80b28ec5c1c9a5c0294bbcc87f91b Mon Sep 17 00:00:00 2001 2 - From: Thomas Tuegel <ttuegel@mailbox.org> 3 - Date: Tue, 17 Sep 2019 05:34:28 -0500 4 - Subject: [PATCH 05/12] qtbase-cmake 5 - 6 - --- 7 - mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +- 8 - mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in | 4 ++-- 9 - src/corelib/Qt5CoreConfigExtras.cmake.in | 10 +++++----- 10 - src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in | 2 +- 11 - .../Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in | 2 +- 12 - src/dbus/Qt5DBusConfigExtras.cmake.in | 12 ++---------- 13 - src/gui/Qt5GuiConfigExtras.cmake.in | 6 +++--- 14 - src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- 15 - 8 files changed, 16 insertions(+), 24 deletions(-) 16 - 17 - diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 18 - index c60ef16e64..e354ab9156 100644 19 - --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 20 - +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 21 - @@ -278,7 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) 22 - macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) 23 - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) 24 - 25 - - set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") 26 - + set(imported_location \"${PLUGIN_LOCATION}\") 27 - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) 28 - set_target_properties(Qt5::${Plugin} PROPERTIES 29 - \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} 30 - diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in 31 - index 5baf0fdb10..3583745aea 100644 32 - --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in 33 - +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in 34 - @@ -2,10 +2,10 @@ 35 - add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED) 36 - 37 - !!IF !isEmpty(CMAKE_RELEASE_TYPE) 38 - -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") 39 - +_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\") 40 - !!ENDIF 41 - !!IF !isEmpty(CMAKE_DEBUG_TYPE) 42 - -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") 43 - +_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\") 44 - !!ENDIF 45 - 46 - list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) 47 - diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in 48 - index e0652fdcf9..450b2a2d28 100644 49 - --- a/src/corelib/Qt5CoreConfigExtras.cmake.in 50 - +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in 51 - @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) 52 - add_executable(Qt5::qmake IMPORTED) 53 - 54 - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 55 - - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") 56 - + set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") 57 - !!ELSE 58 - set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") 59 - !!ENDIF 60 - @@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) 61 - add_executable(Qt5::moc IMPORTED) 62 - 63 - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 64 - - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") 65 - + set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") 66 - !!ELSE 67 - set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") 68 - !!ENDIF 69 - @@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) 70 - add_executable(Qt5::rcc IMPORTED) 71 - 72 - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 73 - - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") 74 - + set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") 75 - !!ELSE 76 - set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") 77 - !!ENDIF 78 - @@ -116,7 +116,7 @@ if (NOT TARGET Qt5::WinMain) 79 - !!IF !isEmpty(CMAKE_RELEASE_TYPE) 80 - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) 81 - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 82 - - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") 83 - + set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") 84 - !!ELSE 85 - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") 86 - !!ENDIF 87 - @@ -130,7 +130,7 @@ if (NOT TARGET Qt5::WinMain) 88 - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) 89 - 90 - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 91 - - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") 92 - + set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") 93 - !!ELSE 94 - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") 95 - !!ENDIF 96 - diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 97 - index c357237d0e..6f0c75de3c 100644 98 - --- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 99 - +++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 100 - @@ -1,6 +1,6 @@ 101 - 102 - !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) 103 - -set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") 104 - +set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") 105 - !!ELSE 106 - set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") 107 - !!ENDIF 108 - diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 109 - index 706304cf34..546420f6ad 100644 110 - --- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 111 - +++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 112 - @@ -1,6 +1,6 @@ 113 - 114 - !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) 115 - -set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") 116 - +set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") 117 - !!ELSE 118 - set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") 119 - !!ENDIF 120 - diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in 121 - index 1d947159e2..b36865fc48 100644 122 - --- a/src/dbus/Qt5DBusConfigExtras.cmake.in 123 - +++ b/src/dbus/Qt5DBusConfigExtras.cmake.in 124 - @@ -2,11 +2,7 @@ 125 - if (NOT TARGET Qt5::qdbuscpp2xml) 126 - add_executable(Qt5::qdbuscpp2xml IMPORTED) 127 - 128 - -!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 129 - - set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") 130 - -!!ELSE 131 - - set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") 132 - -!!ENDIF 133 - + set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") 134 - _qt5_DBus_check_file_exists(${imported_location}) 135 - 136 - set_target_properties(Qt5::qdbuscpp2xml PROPERTIES 137 - @@ -17,11 +13,7 @@ endif() 138 - if (NOT TARGET Qt5::qdbusxml2cpp) 139 - add_executable(Qt5::qdbusxml2cpp IMPORTED) 140 - 141 - -!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 142 - - set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") 143 - -!!ELSE 144 - - set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") 145 - -!!ENDIF 146 - + set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") 147 - _qt5_DBus_check_file_exists(${imported_location}) 148 - 149 - set_target_properties(Qt5::qdbusxml2cpp PROPERTIES 150 - diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in 151 - index 84dbbfebd4..8ad0720c5c 100644 152 - --- a/src/gui/Qt5GuiConfigExtras.cmake.in 153 - +++ b/src/gui/Qt5GuiConfigExtras.cmake.in 154 - @@ -2,7 +2,7 @@ 155 - !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) 156 - 157 - !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) 158 - -set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") 159 - +set(Qt5Gui_EGL_INCLUDE_DIRS \"$$NIX_OUTPUT_DEV/$$CMAKE_INCLUDE_DIR/QtANGLE\") 160 - !!ELSE 161 - set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") 162 - !!ENDIF 163 - @@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO 164 - set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) 165 - 166 - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) 167 - - set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") 168 - + set(imported_location \"$$NIX_OUTPUT_OUT/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") 169 - !!ELSE 170 - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") 171 - !!ENDIF 172 - 173 - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 174 - - set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") 175 - + set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") 176 - !!ELSE 177 - set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") 178 - !!ENDIF 179 - diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 180 - index 99d87e2e46..a4eab2aa72 100644 181 - --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in 182 - +++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 183 - @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) 184 - add_executable(Qt5::uic IMPORTED) 185 - 186 - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 187 - - set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") 188 - + set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") 189 - !!ELSE 190 - set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") 191 - !!ENDIF 192 - -- 193 - 2.23.GIT 194 -
-48
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0006-qtbase-gtk3.patch
··· 1 - From 5bf1785809baf6be7fb5904ce6cefdb761f2c278 Mon Sep 17 00:00:00 2001 2 - From: Thomas Tuegel <ttuegel@mailbox.org> 3 - Date: Tue, 17 Sep 2019 05:35:33 -0500 4 - Subject: [PATCH 06/12] qtbase-gtk3 5 - 6 - --- 7 - src/plugins/platformthemes/gtk3/main.cpp | 17 ++++++++++++++++- 8 - 1 file changed, 16 insertions(+), 1 deletion(-) 9 - 10 - diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp 11 - index fb1c425d8e..bb8bab9795 100644 12 - --- a/src/plugins/platformthemes/gtk3/main.cpp 13 - +++ b/src/plugins/platformthemes/gtk3/main.cpp 14 - @@ -39,6 +39,7 @@ 15 - 16 - #include <qpa/qplatformthemeplugin.h> 17 - #include "qgtk3theme.h" 18 - +#include <QFile> 19 - 20 - QT_BEGIN_NAMESPACE 21 - 22 - @@ -54,8 +55,22 @@ public: 23 - QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList &params) 24 - { 25 - Q_UNUSED(params); 26 - - if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) 27 - + if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) { 28 - + 29 - +#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS 30 - + QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':'); 31 - + XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS); 32 - + qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':'))); 33 - +#endif 34 - + 35 - +#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES 36 - + QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':'); 37 - + GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES); 38 - + qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':'))); 39 - +#endif 40 - + 41 - return new QGtk3Theme; 42 - + } 43 - 44 - return 0; 45 - } 46 - -- 47 - 2.23.GIT 48 -
-29
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0007-qtbase-xcursor.patch
··· 1 - From 35e80f303ae6a6c4c53ba8eb3d84574cc03d68d8 Mon Sep 17 00:00:00 2001 2 - From: Thomas Tuegel <ttuegel@mailbox.org> 3 - Date: Tue, 17 Sep 2019 05:35:58 -0500 4 - Subject: [PATCH 07/12] qtbase-xcursor 5 - 6 - --- 7 - src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- 8 - 1 file changed, 2 insertions(+), 2 deletions(-) 9 - 10 - diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp 11 - index fbadab4d50..c83ce0af5b 100644 12 - --- a/src/plugins/platforms/xcb/qxcbcursor.cpp 13 - +++ b/src/plugins/platforms/xcb/qxcbcursor.cpp 14 - @@ -317,10 +317,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) 15 - #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) 16 - static bool function_ptrs_not_initialized = true; 17 - if (function_ptrs_not_initialized) { 18 - - QLibrary xcursorLib(QLatin1String("Xcursor"), 1); 19 - + QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1); 20 - bool xcursorFound = xcursorLib.load(); 21 - if (!xcursorFound) { // try without the version number 22 - - xcursorLib.setFileName(QLatin1String("Xcursor")); 23 - + xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR)); 24 - xcursorFound = xcursorLib.load(); 25 - } 26 - if (xcursorFound) { 27 - -- 28 - 2.23.GIT 29 -
-30
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 -
-51
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0009-qtbase-tzdir.patch
··· 1 - From db9686362ae34e02538e449e0edfe3d61065b2e9 Mon Sep 17 00:00:00 2001 2 - From: Thomas Tuegel <ttuegel@mailbox.org> 3 - Date: Tue, 17 Sep 2019 05:36:25 -0500 4 - Subject: [PATCH 09/12] qtbase-tzdir 5 - 6 - --- 7 - src/corelib/tools/qtimezoneprivate_tz.cpp | 20 ++++++++++++++------ 8 - 1 file changed, 14 insertions(+), 6 deletions(-) 9 - 10 - diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp 11 - index 57bc000af5..d7d8119682 100644 12 - --- a/src/corelib/tools/qtimezoneprivate_tz.cpp 13 - +++ b/src/corelib/tools/qtimezoneprivate_tz.cpp 14 - @@ -77,7 +77,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash; 15 - // Parse zone.tab table, assume lists all installed zones, if not will need to read directories 16 - static QTzTimeZoneHash loadTzTimeZones() 17 - { 18 - - QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); 19 - + // Try TZDIR first, in case we're running on NixOS. 20 - + QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); 21 - + // Fallback to traditional paths in case we are not on NixOS. 22 - + if (!QFile::exists(path)) 23 - + path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); 24 - if (!QFile::exists(path)) 25 - path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); 26 - 27 - @@ -656,12 +660,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) 28 - if (!tzif.open(QIODevice::ReadOnly)) 29 - return; 30 - } else { 31 - - // Open named tz, try modern path first, if fails try legacy path 32 - - tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); 33 - + // Try TZDIR first, in case we're running on NixOS 34 - + tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); 35 - if (!tzif.open(QIODevice::ReadOnly)) { 36 - - tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); 37 - - if (!tzif.open(QIODevice::ReadOnly)) 38 - - return; 39 - + // Open named tz, try modern path first, if fails try legacy path 40 - + tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); 41 - + if (!tzif.open(QIODevice::ReadOnly)) { 42 - + tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); 43 - + if (!tzif.open(QIODevice::ReadOnly)) 44 - + return; 45 - + } 46 - } 47 - } 48 - 49 - -- 50 - 2.23.GIT 51 -
-32
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0010-qtbase-qtpluginpath.patch
··· 1 - From a3aaebda6d4b302cd202c21e306c55d3715e9b0d Mon Sep 17 00:00:00 2001 2 - From: Thomas Tuegel <ttuegel@mailbox.org> 3 - Date: Tue, 17 Sep 2019 05:36:41 -0500 4 - Subject: [PATCH 10/12] qtbase-qtpluginpath 5 - 6 - --- 7 - src/corelib/kernel/qcoreapplication.cpp | 9 +++++++++ 8 - 1 file changed, 9 insertions(+) 9 - 10 - diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp 11 - index db6546028a..cc97c46004 100644 12 - --- a/src/corelib/kernel/qcoreapplication.cpp 13 - +++ b/src/corelib/kernel/qcoreapplication.cpp 14 - @@ -2694,6 +2694,15 @@ QStringList QCoreApplication::libraryPaths() 15 - QStringList *app_libpaths = new QStringList; 16 - coreappdata()->app_libpaths.reset(app_libpaths); 17 - 18 - + // Add library paths derived from PATH 19 - + const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); 20 - + const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); 21 - + for (const QString &path: paths) { 22 - + if (!path.isEmpty()) { 23 - + app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); 24 - + } 25 - + } 26 - + 27 - QString libPathEnv = qEnvironmentVariable("QT_PLUGIN_PATH"); 28 - if (!libPathEnv.isEmpty()) { 29 - QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts); 30 - -- 31 - 2.23.GIT 32 -
-32
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0011-qtbase-assert.patch
··· 1 - From 4f93027de0e9b825c4b7853d583e9b02a0443c6b Mon Sep 17 00:00:00 2001 2 - From: Thomas Tuegel <ttuegel@mailbox.org> 3 - Date: Tue, 17 Sep 2019 05:37:04 -0500 4 - Subject: [PATCH 11/12] qtbase-assert 5 - 6 - --- 7 - src/testlib/qtestassert.h | 7 +++++-- 8 - 1 file changed, 5 insertions(+), 2 deletions(-) 9 - 10 - diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h 11 - index 6498ea84ef..d821ced7fc 100644 12 - --- a/src/testlib/qtestassert.h 13 - +++ b/src/testlib/qtestassert.h 14 - @@ -44,10 +44,13 @@ 15 - 16 - QT_BEGIN_NAMESPACE 17 - 18 - - 19 - +#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) 20 - +#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) 21 - +#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) 22 - +#else 23 - #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) 24 - - 25 - #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) 26 - +#endif 27 - 28 - QT_END_NAMESPACE 29 - 30 - -- 31 - 2.23.GIT 32 -
-25
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0012-fix-header_module.patch
··· 1 - From 821db0c3056a813e2d0d36fbb2c7361df5559b05 Mon Sep 17 00:00:00 2001 2 - From: Will Dietz <w@wdtz.org> 3 - Date: Mon, 30 Sep 2019 20:15:40 -0500 4 - Subject: [PATCH 12/12] fix header_module 5 - 6 - --- 7 - mkspecs/features/qt_module.prf | 2 +- 8 - 1 file changed, 1 insertion(+), 1 deletion(-) 9 - 10 - diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf 11 - index 9015b30d73..7347c791b4 100644 12 - --- a/mkspecs/features/qt_module.prf 13 - +++ b/mkspecs/features/qt_module.prf 14 - @@ -84,7 +84,7 @@ header_module { 15 - CONFIG += qt_no_install_library 16 - 17 - # Allow creation of .prl, .la and .pc files. 18 - - target.path = $$[QT_INSTALL_LIBS] 19 - + target.path = $$NIX_OUTPUT_OUT/lib 20 - target.CONFIG += dummy_install 21 - INSTALLS += target 22 - } else { 23 - -- 24 - 2.23.GIT 25 -
-16
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0013-define-kiosurfacesuccess.patch
··· 1 - diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm 2 - index a367487e..c3aeca1d 100644 3 - --- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm 4 - +++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm 5 - @@ -49,6 +49,11 @@ 6 - // but was only added in the 10.14 SDK, so declare it just in case. 7 - extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space); 8 - 9 - +// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html 10 - +#if !defined(kIOSurfaceSuccess) 11 - +#define kIOSurfaceSuccess KERN_SUCCESS 12 - +#endif 13 - + 14 - QT_BEGIN_NAMESPACE 15 - 16 - Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface");
-14
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0014-qtbase-pkg-config.patch
··· 1 - diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp 2 - --- a/qmake/generators/makefile.cpp 3 - +++ b/qmake/generators/makefile.cpp 4 - @@ -3390,8 +3390,7 @@ MakefileGenerator::writePkgConfigFile() 5 - << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ") 6 - // << varGlue("DEFINES","-D"," -D"," ") 7 - ; 8 - - if (!project->values("QMAKE_DEFAULT_INCDIRS").contains(includeDir)) 9 - - t << "-I${includedir}"; 10 - + t << "-I${includedir}"; 11 - if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle") 12 - && libDir != QLatin1String("/Library/Frameworks")) { 13 - t << " -F${libdir}"; 14 -
-15
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0015-qtbase-tbd-frameworks.patch
··· 1 - diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in 2 - index 84dbbfebd4..615bfed124 100644 3 - --- a/src/gui/Qt5GuiConfigExtras.cmake.in 4 - +++ b/src/gui/Qt5GuiConfigExtras.cmake.in 5 - @@ -119,6 +119,10 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) 6 - if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") 7 - set(Qt5Gui_${_cmake_lib_name}_LIBRARY) 8 - endif() 9 - + set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}.tbd") 10 - + if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") 11 - + set(Qt5Gui_${_cmake_lib_name}_LIBRARY) 12 - + endif() 13 - !!ENDIF 14 - if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY) 15 - # The above find_library call doesn\'t work for finding
-40
pkgs/development/libraries/qt-5/5.12/qtdeclarative-default-disable-qmlcache.patch
··· 1 - diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp 2 - index 9e5bc0b0..9219def6 100644 3 - --- a/src/qml/qml/qqmltypeloader.cpp 4 - +++ b/src/qml/qml/qqmltypeloader.cpp 5 - @@ -2151,7 +2151,7 @@ void QQmlTypeData::unregisterCallback(TypeDataCallback *callback) 6 - 7 - bool QQmlTypeData::tryLoadFromDiskCache() 8 - { 9 - - if (disableDiskCache() && !forceDiskCache()) 10 - + if (!forceDiskCache()) 11 - return false; 12 - 13 - if (isDebugging()) 14 - @@ -2658,7 +2658,7 @@ void QQmlTypeData::compile(const QQmlRefPointer<QQmlTypeNameCache> &typeNameCach 15 - return; 16 - } 17 - 18 - - const bool trySaveToDisk = (!disableDiskCache() || forceDiskCache()) && !m_document->jsModule.debugMode && !typeRecompilation; 19 - + const bool trySaveToDisk = (forceDiskCache()) && !m_document->jsModule.debugMode && !typeRecompilation; 20 - if (trySaveToDisk) { 21 - QString errorString; 22 - if (m_compiledData->saveToDisk(url(), &errorString)) { 23 - @@ -3014,7 +3014,7 @@ QQmlRefPointer<QQmlScriptData> QQmlScriptBlob::scriptData() const 24 - 25 - void QQmlScriptBlob::dataReceived(const SourceCodeData &data) 26 - { 27 - - if (!disableDiskCache() || forceDiskCache()) { 28 - + if (forceDiskCache()) { 29 - QQmlRefPointer<QV4::CompiledData::CompilationUnit> unit = QV4::Compiler::Codegen::createUnitForLoading(); 30 - QString error; 31 - if (unit->loadFromDisk(url(), data.sourceTimeStamp(), &error)) { 32 - @@ -3077,7 +3077,7 @@ void QQmlScriptBlob::dataReceived(const SourceCodeData &data) 33 - qmlGenerator.generate(irUnit); 34 - } 35 - 36 - - if ((!disableDiskCache() || forceDiskCache()) && !isDebugging()) { 37 - + if ((forceDiskCache()) && !isDebugging()) { 38 - QString errorString; 39 - if (unit->saveToDisk(url(), &errorString)) { 40 - QString error;
-33
pkgs/development/libraries/qt-5/5.12/qtdeclarative.patch
··· 1 - diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp 2 - index 005db4248..685c5b1b2 100644 3 - --- a/src/qml/qml/qqmlimport.cpp 4 - +++ b/src/qml/qml/qqmlimport.cpp 5 - @@ -1760,6 +1760,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) 6 - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); 7 - addImportPath(installImportsPath); 8 - 9 - + // Add import paths derived from PATH 10 - + const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); 11 - + const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX); 12 - + for (const QString &path: paths) { 13 - + if (!path.isEmpty()) { 14 - + addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir)); 15 - + } 16 - + } 17 - + 18 - // env import paths 19 - if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { 20 - const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH"); 21 - diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf 22 - index 537eaf62e..e21de58f6 100644 23 - --- a/tools/qmlcachegen/qmlcache.prf 24 - +++ b/tools/qmlcachegen/qmlcache.prf 25 - @@ -26,7 +26,7 @@ defineReplace(qmlCacheOutputFileName) { 26 - } 27 - 28 - qmlcacheinst.base = $$QMLCACHE_DESTDIR 29 - -qmlcacheinst.path = $$[QT_INSTALL_QML]/$$TARGETPATH 30 - +qmlcacheinst.path = $$NIX_OUTPUT_QML/$$TARGETPATH 31 - qmlcacheinst.CONFIG = no_check_exist 32 - 33 - qmlcachegen.input = CACHEGEN_FILES
-21
pkgs/development/libraries/qt-5/5.12/qtlocation-gcc-9.patch
··· 1 - diff --git a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp 2 - index d475c38..c1710a6 100644 3 - --- a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp 4 - +++ b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp 5 - @@ -5,6 +5,7 @@ 6 - #include <unicode/ushape.h> 7 - 8 - #include <memory> 9 - +#include <stdexcept> 10 - 11 - namespace mbgl { 12 - 13 - diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp 14 - index 97bfe91..56d3e17 100644 15 - --- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp 16 - +++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp 17 - @@ -1,3 +1,4 @@ 18 - +#include <cstdint> 19 - #include <mbgl/util/convert.hpp> 20 - 21 - namespace mbgl {
-13
pkgs/development/libraries/qt-5/5.12/qtscript.patch
··· 1 - diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2 - index 1f6d25e..087c3fb 100644 3 - --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 4 - +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 5 - @@ -81,7 +81,7 @@ 6 - #include <pthread.h> 7 - #elif PLATFORM(GTK) 8 - #include <wtf/gtk/GOwnPtr.h> 9 - -typedef struct _GMutex GMutex; 10 - +typedef union _GMutex GMutex; 11 - typedef struct _GCond GCond; 12 - #endif 13 -
-22
pkgs/development/libraries/qt-5/5.12/qtserialport.patch
··· 1 - diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h 2 - index af2dab2..8e17f64 100644 3 - --- a/src/serialport/qtudev_p.h 4 - +++ b/src/serialport/qtudev_p.h 5 - @@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN 6 - inline bool resolveSymbols(QLibrary *udevLibrary) 7 - { 8 - if (!udevLibrary->isLoaded()) { 9 - +#ifdef NIXPKGS_LIBUDEV 10 - + udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1); 11 - +#else 12 - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); 13 - +#endif 14 - if (!udevLibrary->load()) { 15 - +#ifdef NIXPKGS_LIBUDEV 16 - + udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0); 17 - +#else 18 - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); 19 - +#endif 20 - if (!udevLibrary->load()) { 21 - qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); 22 - return false;
-15
pkgs/development/libraries/qt-5/5.12/qttools.patch
··· 1 - --- a/src/macdeployqt/shared/shared.cpp 2 - +++ b/src/macdeployqt/shared/shared.cpp 3 - @@ -1241,6 +1241,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf 4 - if (!QFile(qmlImportScannerPath).exists()) 5 - qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner"; 6 - 7 - +#ifdef NIXPKGS_QMLIMPORTSCANNER 8 - + // Fallback: Nixpkgs hardcoded path 9 - + if (!QFile(qmlImportScannerPath).exists()) 10 - + qmlImportScannerPath = NIXPKGS_QMLIMPORTSCANNER; 11 - +#endif 12 - + 13 - // Verify that we found a qmlimportscanner binary 14 - if (!QFile(qmlImportScannerPath).exists()) { 15 - LogError() << "qmlimportscanner not found at" << qmlImportScannerPath;
-31
pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-fix-failed-static-assertion.patch
··· 1 - Fix a following build error: 2 - 3 - In file included from ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:7: 4 - ../../3rdparty/chromium/base/bind.h:59:3: error: static_assert failed "Bound argument |i| of type |Arg| cannot be forwarded as |Unwrapped| to the bound functor, which declares it as |Param|." 5 - static_assert( 6 - ^ 7 - ../../3rdparty/chromium/base/bind.h:91:7: note: in instantiation of template class 'base::internal::AssertConstructible<1, long, long, const long &, NSError *>' requested here 8 - : AssertConstructible<Ns, Args, std::decay_t<Args>, Unwrapped, Params>... { 9 - ^ 10 - ../../3rdparty/chromium/base/bind.h:213:27: note: in instantiation of template class 'base::internal::AssertBindArgsValidity<std::__1::integer_sequence<unsigned long, 0, 1>, base::internal::TypeList<base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>, base::internal::TypeList<device::BluetoothRemoteGattCharacteristicMac *, const long &>, base::internal::TypeList<device::BluetoothRemoteGattCharacteristicMac *, NSError *> >' requested here 11 - static_assert(internal::AssertBindArgsValidity< 12 - ^ 13 - ../../3rdparty/chromium/base/bind.h:242:16: note: in instantiation of function template specialization 'base::BindRepeating<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here 14 - return base::BindRepeating(std::forward<Functor>(functor), 15 - ^ 16 - ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:211:15: note: in instantiation of function template specialization 'base::Bind<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here 17 - base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, 18 - ^ 19 - 20 - Resurrected from https://github.com/NixOS/nixpkgs/blob/ddcf01bca6c7a7a7f096bec836a1e6a707ad473d/pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch because the same problem is present in 5.12 when compiling on macOS. 21 - 22 - --- a/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm 23 - +++ b/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm 24 - @@ -209,7 +209,7 @@ void BluetoothRemoteGattCharacteristicMac::WriteRemoteCharacteristic( 25 - base::ThreadTaskRunnerHandle::Get()->PostTask( 26 - FROM_HERE, 27 - base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, 28 - - weak_ptr_factory_.GetWeakPtr(), nil)); 29 - + weak_ptr_factory_.GetWeakPtr(), nullptr)); 30 - } 31 - }
-69
pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch
··· 1 - diff --git a/configure.pri b/configure.pri 2 - index 897bea540..6f834c202 100644 3 - --- a/configure.pri 4 - +++ b/configure.pri 5 - @@ -269,7 +269,7 @@ defineReplace(webEngineGetMacOSVersion) { 6 - } 7 - 8 - defineReplace(webEngineGetMacOSSDKVersion) { 9 - - value = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version ProductVersion 2>/dev/null") 10 - + value = $$system("xcrun --show-sdk-version") 11 - return($$value) 12 - } 13 - 14 - diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf 15 - index 35eb6b89c..7eed640a5 100644 16 - --- a/mkspecs/features/platform.prf 17 - +++ b/mkspecs/features/platform.prf 18 - @@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { 19 - } else:osx { 20 - # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 21 - !isMinXcodeVersion(8, 3, 3) { 22 - - skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") 23 - - return(false) 24 - } 25 - !clang|intel_icc { 26 - skipBuild("Qt WebEngine on macOS requires Clang.") 27 - @@ -54,8 +52,6 @@ defineTest(isPlatformSupported) { 28 - return(false) 29 - } 30 - !isMinOSXSDKVersion(10, 12): { 31 - - skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") 32 - - return(false) 33 - } 34 - } else { 35 - skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") 36 - @@ -111,7 +107,7 @@ defineTest(isMinOSXSDKVersion) { 37 - requested_minor = $$2 38 - requested_patch = $$3 39 - isEmpty(requested_patch): requested_patch = 0 40 - - WEBENGINE_OSX_SDK_PRODUCT_VERSION = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version ProductVersion 2>/dev/null") 41 - + WEBENGINE_OSX_SDK_PRODUCT_VERSION = $$system("xcrun --show-sdk-version") 42 - export(WEBENGINE_OSX_SDK_PRODUCT_VERSION) 43 - isEmpty(WEBENGINE_OSX_SDK_PRODUCT_VERSION) { 44 - skipBuild("Could not resolve SDK product version for \'$$QMAKE_MAC_SDK\'.") 45 - diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri 46 - index 7b77a8bf7..0e1284ee4 100644 47 - --- a/src/core/config/mac_osx.pri 48 - +++ b/src/core/config/mac_osx.pri 49 - @@ -5,7 +5,7 @@ load(functions) 50 - # otherwise query for it. 51 - QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) 52 - isEmpty(QMAKE_MAC_SDK_VERSION) { 53 - - QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") 54 - + QMAKE_MAC_SDK_VERSION = $$system("xcrun --show-sdk-version") 55 - isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") 56 - } 57 - 58 - @@ -14,11 +14,6 @@ isEmpty(QMAKE_MAC_SDK_VERSION) { 59 - QMAKE_MAC_SDK_VERSION_MAJOR_MINOR = $$section(QMAKE_MAC_SDK_VERSION, ".", 0, 1) 60 - 61 - QMAKE_CLANG_DIR = "/usr" 62 - -QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX) 63 - -!isEmpty(QMAKE_CLANG_PATH) { 64 - - clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../") 65 - - exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir 66 - -} 67 - 68 - QMAKE_CLANG_PATH = "$${QMAKE_CLANG_DIR}/bin/clang++" 69 - message("Using clang++ from $${QMAKE_CLANG_PATH}")
-12
pkgs/development/libraries/qt-5/5.12/qtwebengine-no-build-skip.patch
··· 1 - diff --git a/qtwebengine.pro b/qtwebengine.pro 2 - --- a/qtwebengine.pro 3 - +++ b/qtwebengine.pro 4 - @@ -5,7 +5,7 @@ runConfigure() 5 - 6 - !isEmpty(skipBuildReason) { 7 - SUBDIRS = 8 - - log($${skipBuildReason}$${EOL}) 9 - + error($${skipBuildReason}$${EOL}) 10 - log(QtWebEngine will not be built.$${EOL}) 11 - } 12 -
-11
pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-qos-classes.patch
··· 1 - diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake 2 - --- a/Source/cmake/OptionsQt.cmake 3 - +++ b/Source/cmake/OptionsQt.cmake 4 - @@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG) 5 - endif () 6 - 7 - if (APPLE) 8 - - SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1) 9 - endif () 10 - 11 - if (ENABLE_MATHML)
-45
pkgs/development/libraries/qt-5/5.12/qtwebkit-darwin-no-readline.patch
··· 1 - diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt 2 - --- a/Source/JavaScriptCore/shell/CMakeLists.txt 3 - +++ b/Source/JavaScriptCore/shell/CMakeLists.txt 4 - @@ -9,7 +9,6 @@ set(JSC_LIBRARIES 5 - ) 6 - 7 - if (WTF_OS_MAC_OS_X) 8 - - list(APPEND JSC_LIBRARIES edit) 9 - endif () 10 - 11 - if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC") 12 - diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h 13 - --- a/Source/WTF/wtf/Platform.h 14 - +++ b/Source/WTF/wtf/Platform.h 15 - @@ -563,7 +563,6 @@ 16 - #if PLATFORM(IOS) 17 - 18 - #define HAVE_NETWORK_EXTENSION 1 19 - -#define HAVE_READLINE 1 20 - #if USE(APPLE_INTERNAL_SDK) 21 - #define USE_CFNETWORK 1 22 - #endif 23 - @@ -650,7 +649,6 @@ 24 - #define HAVE_MADV_DONTNEED 1 25 - #define HAVE_MERGESORT 1 26 - #define HAVE_PTHREAD_SETNAME_NP 1 27 - -#define HAVE_READLINE 1 28 - #define HAVE_SYS_TIMEB_H 1 29 - 30 - #if !PLATFORM(GTK) && !PLATFORM(QT) 31 - diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake 32 - --- a/Source/WTF/wtf/PlatformMac.cmake 33 - +++ b/Source/WTF/wtf/PlatformMac.cmake 34 - @@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED) 35 - 36 - find_library(COCOA_LIBRARY Cocoa) 37 - find_library(COREFOUNDATION_LIBRARY CoreFoundation) 38 - -find_library(READLINE_LIBRARY Readline) 39 - list(APPEND WTF_LIBRARIES 40 - ${COREFOUNDATION_LIBRARY} 41 - ${COCOA_LIBRARY} 42 - - ${READLINE_LIBRARY} 43 - libicucore.dylib 44 - ) 45 -
-170
pkgs/development/libraries/qt-5/5.12/qtwebkit-icu68.patch
··· 1 - Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 2 - 3 - In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31: 4 - Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE' 5 - ucnv_setFallback(m_converterICU, TRUE); 6 - ^ 7 - In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40: 8 - In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27: 9 - Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE' 10 - isAccessible = TRUE; 11 - ^ 12 - Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE' 13 - isAccessible = FALSE; 14 - ^ 15 - Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE' 16 - isAccessible = TRUE; 17 - ^ 18 - Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE' 19 - isAccessible = FALSE; 20 - ^ 21 - In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41: 22 - Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' 23 - return TRUE; 24 - ^ 25 - Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' 26 - return FALSE; 27 - ^ 28 - Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' 29 - return TRUE; 30 - ^ 31 - Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' 32 - return FALSE; 33 - ^ 34 - Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' 35 - return TRUE; 36 - ^ 37 - Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE' 38 - return FALSE; 39 - ^ 40 - Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE' 41 - return TRUE; 42 - ^ 43 - In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42: 44 - Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE' 45 - return FALSE; 46 - ^ 47 - Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE' 48 - return TRUE; 49 - ^ 50 - 51 - --- a/Source/WebCore/platform/text/TextCodecICU.cpp 52 - +++ b/Source/WebCore/platform/text/TextCodecICU.cpp 53 - @@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const 54 - m_converterICU = ucnv_open(m_canonicalConverterName, &err); 55 - ASSERT(U_SUCCESS(err)); 56 - if (m_converterICU) 57 - - ucnv_setFallback(m_converterICU, TRUE); 58 - + ucnv_setFallback(m_converterICU, true); 59 - } 60 - 61 - int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) 62 - --- a/Source/WebCore/platform/text/icu/UTextProvider.h 63 - +++ b/Source/WebCore/platform/text/icu/UTextProvider.h 64 - @@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text 65 - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. 66 - ASSERT(offset < std::numeric_limits<int32_t>::max()); 67 - text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; 68 - - isAccessible = TRUE; 69 - + isAccessible = true; 70 - return true; 71 - } 72 - if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { 73 - text->chunkOffset = text->chunkLength; 74 - - isAccessible = FALSE; 75 - + isAccessible = false; 76 - return true; 77 - } 78 - } else { 79 - @@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text 80 - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. 81 - ASSERT(offset < std::numeric_limits<int32_t>::max()); 82 - text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; 83 - - isAccessible = TRUE; 84 - + isAccessible = true; 85 - return true; 86 - } 87 - if (nativeIndex <= 0 && !text->chunkNativeStart) { 88 - text->chunkOffset = 0; 89 - - isAccessible = FALSE; 90 - + isAccessible = false; 91 - return true; 92 - } 93 - } 94 - --- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp 95 - +++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp 96 - @@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i 97 - if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { 98 - // Already inside the buffer. Set the new offset. 99 - uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); 100 - - return TRUE; 101 - + return true; 102 - } 103 - if (index >= length && uText->chunkNativeLimit == length) { 104 - // Off the end of the buffer, but we can't get it. 105 - uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); 106 - - return FALSE; 107 - + return false; 108 - } 109 - } else { 110 - if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { 111 - // Already inside the buffer. Set the new offset. 112 - uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); 113 - - return TRUE; 114 - + return true; 115 - } 116 - if (!index && !uText->chunkNativeStart) { 117 - // Already at the beginning; can't go any farther. 118 - uText->chunkOffset = 0; 119 - - return FALSE; 120 - + return false; 121 - } 122 - } 123 - 124 - @@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i 125 - 126 - uText->nativeIndexingLimit = uText->chunkLength; 127 - 128 - - return TRUE; 129 - + return true; 130 - } 131 - 132 - static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) 133 - @@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe 134 - static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) 135 - { 136 - if (!text->context) 137 - - return FALSE; 138 - + return false; 139 - int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); 140 - UBool isAccessible; 141 - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) 142 - @@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text 143 - ASSERT(newContext == UTextProviderContext::PriorContext); 144 - textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); 145 - } 146 - - return TRUE; 147 - + return true; 148 - } 149 - 150 - static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) 151 - --- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp 152 - +++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp 153 - @@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng 154 - static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) 155 - { 156 - if (!text->context) 157 - - return FALSE; 158 - + return false; 159 - int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); 160 - UBool isAccessible; 161 - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) 162 - @@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, 163 - ASSERT(newContext == UTextProviderContext::PriorContext); 164 - textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); 165 - } 166 - - return TRUE; 167 - + return true; 168 - } 169 - 170 - static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
-12
pkgs/development/libraries/qt-5/5.12/qtwebkit.patch
··· 1 - diff --git a/Source/WebKit2/PlatformQt.cmake b/Source/WebKit2/PlatformQt.cmake 2 - --- a/Source/WebKit2/PlatformQt.cmake 3 - +++ b/Source/WebKit2/PlatformQt.cmake 4 - @@ -261,6 +261,7 @@ 5 - list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES 6 - ${GLIB_INCLUDE_DIRS} 7 - ${GSTREAMER_INCLUDE_DIRS} 8 - + ${GSTREAMER_PBUTILS_INCLUDE_DIRS} 9 - ${Qt5Quick_INCLUDE_DIRS} 10 - ${Qt5Quick_PRIVATE_INCLUDE_DIRS} 11 - ${SQLITE_INCLUDE_DIR} 12 -
-326
pkgs/development/libraries/qt-5/5.12/srcs.nix
··· 1 - # DO NOT EDIT! This file is generated automatically. 2 - # Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/5.12 3 - { fetchurl, mirror }: 4 - 5 - { 6 - qt3d = { 7 - version = "5.12.10"; 8 - src = fetchurl { 9 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qt3d-everywhere-src-5.12.10.tar.xz"; 10 - sha256 = "1fnhdy0vwh1npq04pw3lzb15rsp0nx8wh57c8lvz9jn945xwc3vd"; 11 - name = "qt3d-everywhere-src-5.12.10.tar.xz"; 12 - }; 13 - }; 14 - qtactiveqt = { 15 - version = "5.12.10"; 16 - src = fetchurl { 17 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtactiveqt-everywhere-src-5.12.10.tar.xz"; 18 - sha256 = "0lf96ziba5g8izwcjzzaf4n2j336j6627rb3dzwvmsdkd9168zax"; 19 - name = "qtactiveqt-everywhere-src-5.12.10.tar.xz"; 20 - }; 21 - }; 22 - qtandroidextras = { 23 - version = "5.12.10"; 24 - src = fetchurl { 25 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtandroidextras-everywhere-src-5.12.10.tar.xz"; 26 - sha256 = "0blapv4jd80wcvzp96zxlrsyca7lwax17y6yij1d14a51353hrnc"; 27 - name = "qtandroidextras-everywhere-src-5.12.10.tar.xz"; 28 - }; 29 - }; 30 - qtbase = { 31 - version = "5.12.10"; 32 - src = fetchurl { 33 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtbase-everywhere-src-5.12.10.tar.xz"; 34 - sha256 = "0h39r3irahdms4gidg5l4a1kr7kagc4bd0y02sapg3njwrsg3240"; 35 - name = "qtbase-everywhere-src-5.12.10.tar.xz"; 36 - }; 37 - }; 38 - qtcanvas3d = { 39 - version = "5.12.10"; 40 - src = fetchurl { 41 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtcanvas3d-everywhere-src-5.12.10.tar.xz"; 42 - sha256 = "0pbxw89m2s19yk2985c49msd7s1mapydka9b7nzg9phs9nrzvf1m"; 43 - name = "qtcanvas3d-everywhere-src-5.12.10.tar.xz"; 44 - }; 45 - }; 46 - qtcharts = { 47 - version = "5.12.10"; 48 - src = fetchurl { 49 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtcharts-everywhere-src-5.12.10.tar.xz"; 50 - sha256 = "0cndm8llvfl9jdzn34b886gxgxwsibb24amhblh96cadhhkpwadc"; 51 - name = "qtcharts-everywhere-src-5.12.10.tar.xz"; 52 - }; 53 - }; 54 - qtconnectivity = { 55 - version = "5.12.10"; 56 - src = fetchurl { 57 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtconnectivity-everywhere-src-5.12.10.tar.xz"; 58 - sha256 = "19l816zfpx87vwzj18mbib5x3mb9hy1msacpy8i9bagfw9p0i6c0"; 59 - name = "qtconnectivity-everywhere-src-5.12.10.tar.xz"; 60 - }; 61 - }; 62 - qtdatavis3d = { 63 - version = "5.12.10"; 64 - src = fetchurl { 65 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtdatavis3d-everywhere-src-5.12.10.tar.xz"; 66 - sha256 = "1ximhph17kkh40v2ksk51lq21mbjs2ajyf5l32ckhc7n7bmaryb6"; 67 - name = "qtdatavis3d-everywhere-src-5.12.10.tar.xz"; 68 - }; 69 - }; 70 - qtdeclarative = { 71 - version = "5.12.10"; 72 - src = fetchurl { 73 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtdeclarative-everywhere-src-5.12.10.tar.xz"; 74 - sha256 = "05la1zlijcaargfh4ljnmxvvksdwzl409wl7w3m96kwm8s370mmf"; 75 - name = "qtdeclarative-everywhere-src-5.12.10.tar.xz"; 76 - }; 77 - }; 78 - qtdoc = { 79 - version = "5.12.10"; 80 - src = fetchurl { 81 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtdoc-everywhere-src-5.12.10.tar.xz"; 82 - sha256 = "0ljc29hnn8knncvq8hsk0rdcwrxbsk1ywlprknkvyb4pggp9rkp6"; 83 - name = "qtdoc-everywhere-src-5.12.10.tar.xz"; 84 - }; 85 - }; 86 - qtgamepad = { 87 - version = "5.12.10"; 88 - src = fetchurl { 89 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtgamepad-everywhere-src-5.12.10.tar.xz"; 90 - sha256 = "1bs50wghy3n8af656angkkkaac0swkq3mfllg3dkjg236ngzdhdh"; 91 - name = "qtgamepad-everywhere-src-5.12.10.tar.xz"; 92 - }; 93 - }; 94 - qtgraphicaleffects = { 95 - version = "5.12.10"; 96 - src = fetchurl { 97 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtgraphicaleffects-everywhere-src-5.12.10.tar.xz"; 98 - sha256 = "0hnsb757ircqmid34d0cxbh0mi4qnil22k5ka9a1b8xy00ydkfky"; 99 - name = "qtgraphicaleffects-everywhere-src-5.12.10.tar.xz"; 100 - }; 101 - }; 102 - qtimageformats = { 103 - version = "5.12.10"; 104 - src = fetchurl { 105 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtimageformats-everywhere-src-5.12.10.tar.xz"; 106 - sha256 = "1bh38xp4v914ksg91p9pij1gsdzs3y7sn7diy3d7wn5i039syn0i"; 107 - name = "qtimageformats-everywhere-src-5.12.10.tar.xz"; 108 - }; 109 - }; 110 - qtlocation = { 111 - version = "5.12.10"; 112 - src = fetchurl { 113 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtlocation-everywhere-src-5.12.10.tar.xz"; 114 - sha256 = "1czg0z69ilnxp1sqk0jawlnyp2gx87yb57g8dwjznqxxvaq744dc"; 115 - name = "qtlocation-everywhere-src-5.12.10.tar.xz"; 116 - }; 117 - }; 118 - qtmacextras = { 119 - version = "5.12.10"; 120 - src = fetchurl { 121 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtmacextras-everywhere-src-5.12.10.tar.xz"; 122 - sha256 = "0mh9p3f1f22pj4i8yxnn56amy53dapmcikza04ll4fvx5hy340v8"; 123 - name = "qtmacextras-everywhere-src-5.12.10.tar.xz"; 124 - }; 125 - }; 126 - qtmultimedia = { 127 - version = "5.12.10"; 128 - src = fetchurl { 129 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtmultimedia-everywhere-src-5.12.10.tar.xz"; 130 - sha256 = "0g50jzhwbrl5r0lmfz5ffpkp54mf0zfc8m884x51yn2bnngg366c"; 131 - name = "qtmultimedia-everywhere-src-5.12.10.tar.xz"; 132 - }; 133 - }; 134 - qtnetworkauth = { 135 - version = "5.12.10"; 136 - src = fetchurl { 137 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtnetworkauth-everywhere-src-5.12.10.tar.xz"; 138 - sha256 = "12n3xqlskrk2mbcgz5p613sx219j6rmpq8yn7p97xdv7li61gzl2"; 139 - name = "qtnetworkauth-everywhere-src-5.12.10.tar.xz"; 140 - }; 141 - }; 142 - qtpurchasing = { 143 - version = "5.12.10"; 144 - src = fetchurl { 145 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtpurchasing-everywhere-src-5.12.10.tar.xz"; 146 - sha256 = "1azdg03vxyk140i9z93x0zzlazbmd3qrqxgwk747jsd1ibns9ddy"; 147 - name = "qtpurchasing-everywhere-src-5.12.10.tar.xz"; 148 - }; 149 - }; 150 - qtquickcontrols = { 151 - version = "5.12.10"; 152 - src = fetchurl { 153 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtquickcontrols-everywhere-src-5.12.10.tar.xz"; 154 - sha256 = "1cy9vjl9zf95frnydzljqwbx3is8p8w27kdgszvmb67p6xkpblk7"; 155 - name = "qtquickcontrols-everywhere-src-5.12.10.tar.xz"; 156 - }; 157 - }; 158 - qtquickcontrols2 = { 159 - version = "5.12.10"; 160 - src = fetchurl { 161 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtquickcontrols2-everywhere-src-5.12.10.tar.xz"; 162 - sha256 = "0541n8n012d0xwxrfznv1jwh28d35mdx6cl8jadsaxaspgwz4vb3"; 163 - name = "qtquickcontrols2-everywhere-src-5.12.10.tar.xz"; 164 - }; 165 - }; 166 - qtremoteobjects = { 167 - version = "5.12.10"; 168 - src = fetchurl { 169 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtremoteobjects-everywhere-src-5.12.10.tar.xz"; 170 - sha256 = "147p0xdi22xz2d3501ig78bs97gbyz8ccyhn6dhbw2yalx33gma6"; 171 - name = "qtremoteobjects-everywhere-src-5.12.10.tar.xz"; 172 - }; 173 - }; 174 - qtscript = { 175 - version = "5.12.10"; 176 - src = fetchurl { 177 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtscript-everywhere-src-5.12.10.tar.xz"; 178 - sha256 = "1cfcfwq4shr6yphgwq2jnvgzjjqjrz10qnzr7dccksmfg3i0ad02"; 179 - name = "qtscript-everywhere-src-5.12.10.tar.xz"; 180 - }; 181 - }; 182 - qtscxml = { 183 - version = "5.12.10"; 184 - src = fetchurl { 185 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtscxml-everywhere-src-5.12.10.tar.xz"; 186 - sha256 = "057zchhm1s5ly2a685y4105pgmzgqp1jkkf9w0ca8xd05z4clb4r"; 187 - name = "qtscxml-everywhere-src-5.12.10.tar.xz"; 188 - }; 189 - }; 190 - qtsensors = { 191 - version = "5.12.10"; 192 - src = fetchurl { 193 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtsensors-everywhere-src-5.12.10.tar.xz"; 194 - sha256 = "10f00njvc7kwjci0g4g3pibl9ra798iplvj2ymql3zppxqqdq25m"; 195 - name = "qtsensors-everywhere-src-5.12.10.tar.xz"; 196 - }; 197 - }; 198 - qtserialbus = { 199 - version = "5.12.10"; 200 - src = fetchurl { 201 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtserialbus-everywhere-src-5.12.10.tar.xz"; 202 - sha256 = "0zd0crs2nrsvncj070fl05g0nm3j5bf16g54c7m9603b6q7bryrx"; 203 - name = "qtserialbus-everywhere-src-5.12.10.tar.xz"; 204 - }; 205 - }; 206 - qtserialport = { 207 - version = "5.12.10"; 208 - src = fetchurl { 209 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtserialport-everywhere-src-5.12.10.tar.xz"; 210 - sha256 = "0anndf6pyssiygj0kk2j80vwil2z0765gccs87djhsni1xvk3n9r"; 211 - name = "qtserialport-everywhere-src-5.12.10.tar.xz"; 212 - }; 213 - }; 214 - qtspeech = { 215 - version = "5.12.10"; 216 - src = fetchurl { 217 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtspeech-everywhere-src-5.12.10.tar.xz"; 218 - sha256 = "11fycm604r1xswb9dg1g568jxd68zd9m2dzfy4qda6sr4mdaj6jg"; 219 - name = "qtspeech-everywhere-src-5.12.10.tar.xz"; 220 - }; 221 - }; 222 - qtsvg = { 223 - version = "5.12.10"; 224 - src = fetchurl { 225 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtsvg-everywhere-src-5.12.10.tar.xz"; 226 - sha256 = "0jrkz8y225g93pznsvc1icanxxc5cfm23ic2y6rprqaqw77z9zxm"; 227 - name = "qtsvg-everywhere-src-5.12.10.tar.xz"; 228 - }; 229 - }; 230 - qttools = { 231 - version = "5.12.10"; 232 - src = fetchurl { 233 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qttools-everywhere-src-5.12.10.tar.xz"; 234 - sha256 = "0v339a1w3kqvfl8hcds032g8zafp8d4c1b2rzihpq6y4mbksdkxh"; 235 - name = "qttools-everywhere-src-5.12.10.tar.xz"; 236 - }; 237 - }; 238 - qttranslations = { 239 - version = "5.12.10"; 240 - src = fetchurl { 241 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qttranslations-everywhere-src-5.12.10.tar.xz"; 242 - sha256 = "1pjkkkkjvs9harz70sir67yf3i528vyn1shmi09hlzlb23nmipp1"; 243 - name = "qttranslations-everywhere-src-5.12.10.tar.xz"; 244 - }; 245 - }; 246 - qtvirtualkeyboard = { 247 - version = "5.12.10"; 248 - src = fetchurl { 249 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtvirtualkeyboard-everywhere-src-5.12.10.tar.xz"; 250 - sha256 = "0afw3lj5cg3zj0hzxlhz5l7s1j2y491yxwylc4vchbqjpyvsadgg"; 251 - name = "qtvirtualkeyboard-everywhere-src-5.12.10.tar.xz"; 252 - }; 253 - }; 254 - qtwayland = { 255 - version = "5.12.10"; 256 - src = fetchurl { 257 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwayland-everywhere-src-5.12.10.tar.xz"; 258 - sha256 = "1bs61xmc4l03w21wkrxx0llfg5bbnq5ij7w0bnfkx3rk0vncy0q6"; 259 - name = "qtwayland-everywhere-src-5.12.10.tar.xz"; 260 - }; 261 - }; 262 - qtwebchannel = { 263 - version = "5.12.10"; 264 - src = fetchurl { 265 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebchannel-everywhere-src-5.12.10.tar.xz"; 266 - sha256 = "1jmprqgavqwknnnl6qp0psxz7bc69ivxhm7y4qci95vpx9k5yjg8"; 267 - name = "qtwebchannel-everywhere-src-5.12.10.tar.xz"; 268 - }; 269 - }; 270 - qtwebengine = { 271 - version = "5.12.10"; 272 - src = fetchurl { 273 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebengine-everywhere-src-5.12.10.tar.xz"; 274 - sha256 = "16zbyfc7qy9f20anfrdi25f6nf1j7zw8kps60mqb18nfjw411d50"; 275 - name = "qtwebengine-everywhere-src-5.12.10.tar.xz"; 276 - }; 277 - }; 278 - qtwebglplugin = { 279 - version = "5.12.10"; 280 - src = fetchurl { 281 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebglplugin-everywhere-src-5.12.10.tar.xz"; 282 - sha256 = "0nhim67rl9dbshnarismnd54qzks8v14a08h8qi7x0dm9bj9ij7q"; 283 - name = "qtwebglplugin-everywhere-src-5.12.10.tar.xz"; 284 - }; 285 - }; 286 - qtwebsockets = { 287 - version = "5.12.10"; 288 - src = fetchurl { 289 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebsockets-everywhere-src-5.12.10.tar.xz"; 290 - sha256 = "0p74ds53d3a30i7pq85b9ql9i4z1p0yyanhmaizw2bv9225py4jr"; 291 - name = "qtwebsockets-everywhere-src-5.12.10.tar.xz"; 292 - }; 293 - }; 294 - qtwebview = { 295 - version = "5.12.10"; 296 - src = fetchurl { 297 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwebview-everywhere-src-5.12.10.tar.xz"; 298 - sha256 = "07pz7wfhyijfdlxnaqpn4hwgvpglma6dfmkcb8xw6hfhg30riaxd"; 299 - name = "qtwebview-everywhere-src-5.12.10.tar.xz"; 300 - }; 301 - }; 302 - qtwinextras = { 303 - version = "5.12.10"; 304 - src = fetchurl { 305 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtwinextras-everywhere-src-5.12.10.tar.xz"; 306 - sha256 = "1x5k0z0p94zppqsw2fz8ki9v5abf0crzva16wllznn89ylqjyn0j"; 307 - name = "qtwinextras-everywhere-src-5.12.10.tar.xz"; 308 - }; 309 - }; 310 - qtx11extras = { 311 - version = "5.12.10"; 312 - src = fetchurl { 313 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtx11extras-everywhere-src-5.12.10.tar.xz"; 314 - sha256 = "0xk10iynkfs31vgpadrmw30k4s1hlnggxy2f3q988qyqd37dh5h8"; 315 - name = "qtx11extras-everywhere-src-5.12.10.tar.xz"; 316 - }; 317 - }; 318 - qtxmlpatterns = { 319 - version = "5.12.10"; 320 - src = fetchurl { 321 - url = "${mirror}/official_releases/qt/5.12/5.12.10/submodules/qtxmlpatterns-everywhere-src-5.12.10.tar.xz"; 322 - sha256 = "1qg09yxagz36sry03kv3swwfjc8lrik1asjk2lxlpzzcl2q95lbv"; 323 - name = "qtxmlpatterns-everywhere-src-5.12.10.tar.xz"; 324 - }; 325 - }; 326 - }
-249
pkgs/development/libraries/qt-5/5.14/default.nix
··· 1 - /* 2 - 3 - # Updates 4 - 5 - Before a major version update, make a copy of this directory. (We like to 6 - keep the old version around for a short time after major updates.) Add a 7 - top-level attribute to `top-level/all-packages.nix`. 8 - 9 - 1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. 10 - 2. From the top of the Nixpkgs tree, run 11 - `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION`. 12 - 3. Check that the new packages build correctly. 13 - 4. Commit the changes and open a pull request. 14 - 15 - */ 16 - 17 - { newScope 18 - , lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper 19 - , bison, cups ? null, harfbuzz, libGL, perl, python2 20 - , gstreamer, gst-plugins-base, gtk3, dconf 21 - , darwin 22 - , buildPackages 23 - 24 - # options 25 - , developerBuild ? false 26 - , decryptSslTraffic ? false 27 - , debug ? false 28 - }: 29 - 30 - let 31 - 32 - qtCompatVersion = srcs.qtbase.version; 33 - 34 - mirror = "https://download.qt.io"; 35 - srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // { 36 - # qtwebkit does not have an official release tarball on the qt mirror and is 37 - # mostly maintained by the community. 38 - qtwebkit = rec { 39 - src = fetchFromGitHub { 40 - owner = "qt"; 41 - repo = "qtwebkit"; 42 - rev = "v${version}"; 43 - sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg"; 44 - }; 45 - version = "5.212.0-alpha4"; 46 - }; 47 - }; 48 - 49 - patches = { 50 - qtbase = lib.optionals stdenv.isDarwin [ 51 - ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch 52 - 53 - # Downgrade minimal required SDK to 10.12 54 - ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch 55 - ./qtbase.patch.d/qtbase-sdk-10.12-mac.patch 56 - 57 - # Patch framework detection to support X.framework/X.tbd, 58 - # extending the current support for X.framework/X. 59 - ./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch 60 - ] ++ [ 61 - ./qtbase.patch.d/0003-qtbase-mkspecs.patch 62 - ./qtbase.patch.d/0004-qtbase-replace-libdir.patch 63 - ./qtbase.patch.d/0005-qtbase-cmake.patch 64 - ./qtbase.patch.d/0006-qtbase-gtk3.patch 65 - ./qtbase.patch.d/0007-qtbase-xcursor.patch 66 - ./qtbase.patch.d/0008-qtbase-tzdir.patch 67 - ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch 68 - ./qtbase.patch.d/0010-qtbase-assert.patch 69 - ./qtbase.patch.d/0011-fix-header_module.patch 70 - ]; 71 - qtdeclarative = [ 72 - ./qtdeclarative.patch 73 - # prevent headaches from stale qmlcache data 74 - ./qtdeclarative-default-disable-qmlcache.patch 75 - ]; 76 - qtlocation = [ ./qtlocation-gcc-9.patch ]; 77 - qtscript = [ ./qtscript.patch ]; 78 - qtserialport = [ ./qtserialport.patch ]; 79 - qtwebengine = [ 80 - # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599 81 - (fetchpatch { 82 - name = "qtwebengine-bison-3.7-build.patch"; 83 - url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599"; 84 - sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy"; 85 - stripLen = 1; 86 - extraPrefix = "src/3rdparty/"; 87 - }) 88 - # Fix build with GCC 10 (part 1): https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=fad3e27b 89 - (fetchpatch { 90 - name = "qtwebengine-gcc10-part1.patch"; 91 - url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=fad3e27bfb50d1e23a07577f087a826b5e00bb1d"; 92 - sha256 = "0c55j9zww8jyif6wl7jy1qqidgw9fdhiyfjgzhzi85r716m4pwwd"; 93 - stripLen = 1; 94 - extraPrefix = "src/3rdparty/"; 95 - }) 96 - # Fix build with GCC 10 (part 2): https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=193c5bed 97 - (fetchpatch { 98 - name = "qtwebengine-gcc10-part2.patch"; 99 - url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=193c5bed1cff123e21b7e6d12f464d6709ace2e3"; 100 - sha256 = "1jb6s32ara6l4rbn4h3gg95mzv8sd8dl1zpjaqwywf1w7p8ymk86"; 101 - stripLen = 1; 102 - extraPrefix = "src/3rdparty/"; 103 - }) 104 - 105 - # glibc 2.34 compat 106 - (fetchpatch { 107 - url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/4cef673b2dd01ce85ce7a841cf352104bbe79668/f/qtwebengine-everywhere-5.15.2-SIGSTKSZ.patch"; 108 - sha256 = "sha256-2D0/FL4PBL4p6ccd6JoDAGqNtLs2aeE1OdM+PJItock="; 109 - }) 110 - ] ++ lib.optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; 111 - qtwebkit = [ 112 - (fetchpatch { 113 - name = "qtwebkit-bison-3.7-build.patch"; 114 - url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; 115 - sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; 116 - }) 117 - (fetchpatch { 118 - name = "qtwebkit-glib-2.68.patch"; 119 - url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; 120 - sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; 121 - }) 122 - (fetchpatch { 123 - name = "qtwebkit-darwin-handle.patch"; 124 - url = "https://github.com/qtwebkit/qtwebkit/commit/5c272a21e621a66862821d3ae680f27edcc64c19.patch"; 125 - sha256 = "9hjqLyABz372QDgoq7nXXXQ/3OXBGcYN1/92ekcC3WE="; 126 - }) 127 - ./qtwebkit.patch 128 - ./qtwebkit-icu68.patch 129 - ] ++ lib.optionals stdenv.isDarwin [ 130 - ./qtwebkit-darwin-no-readline.patch 131 - ./qtwebkit-darwin-no-qos-classes.patch 132 - ]; 133 - qttools = [ ./qttools.patch ]; 134 - }; 135 - 136 - addPackages = self: with self; 137 - let 138 - qtModule = 139 - import ../qtModule.nix 140 - { 141 - inherit perl; 142 - inherit lib; 143 - # Use a variant of mkDerivation that does not include wrapQtApplications 144 - # to avoid cyclic dependencies between Qt modules. 145 - mkDerivation = 146 - import ../mkDerivation.nix 147 - { inherit lib; inherit debug; wrapQtAppsHook = null; } 148 - stdenv.mkDerivation; 149 - } 150 - { inherit self srcs patches; }; 151 - 152 - callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; 153 - in { 154 - 155 - inherit callPackage qtCompatVersion qtModule srcs; 156 - 157 - mkDerivationWith = 158 - import ../mkDerivation.nix 159 - { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; 160 - 161 - mkDerivation = mkDerivationWith stdenv.mkDerivation; 162 - 163 - qtbase = callPackage ../modules/qtbase.nix { 164 - inherit (srcs.qtbase) src version; 165 - patches = patches.qtbase; 166 - inherit bison cups harfbuzz libGL; 167 - withGtk3 = !stdenv.isDarwin; inherit dconf gtk3; 168 - inherit debug developerBuild decryptSslTraffic; 169 - inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth 170 - CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit; 171 - inherit (darwin) libobjc; 172 - }; 173 - 174 - qt3d = callPackage ../modules/qt3d.nix {}; 175 - qtcharts = callPackage ../modules/qtcharts.nix {}; 176 - qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; 177 - qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; 178 - qtdoc = callPackage ../modules/qtdoc.nix {}; 179 - qtgamepad = callPackage ../modules/qtgamepad.nix { 180 - inherit (darwin.apple_sdk.frameworks) GameController; 181 - }; 182 - qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; 183 - qtimageformats = callPackage ../modules/qtimageformats.nix {}; 184 - qtlocation = callPackage ../modules/qtlocation.nix {}; 185 - qtlottie = callPackage ../modules/qtlottie.nix {}; 186 - qtmacextras = callPackage ../modules/qtmacextras.nix {}; 187 - qtmultimedia = callPackage ../modules/qtmultimedia.nix { 188 - inherit gstreamer gst-plugins-base; 189 - }; 190 - qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; 191 - qtquick1 = null; 192 - qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; 193 - qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; 194 - qtscript = callPackage ../modules/qtscript.nix {}; 195 - qtsensors = callPackage ../modules/qtsensors.nix {}; 196 - qtserialbus = callPackage ../modules/qtserialbus.nix {}; 197 - qtserialport = callPackage ../modules/qtserialport.nix {}; 198 - qtspeech = callPackage ../modules/qtspeech.nix {}; 199 - qtsvg = callPackage ../modules/qtsvg.nix {}; 200 - qtscxml = callPackage ../modules/qtscxml.nix {}; 201 - qttools = callPackage ../modules/qttools.nix {}; 202 - qttranslations = callPackage ../modules/qttranslations.nix {}; 203 - qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; 204 - qtwayland = callPackage ../modules/qtwayland.nix {}; 205 - qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; 206 - qtwebengine = callPackage ../modules/qtwebengine.nix { 207 - python = python2; 208 - inherit (darwin) cctools libobjc libunwind xnu; 209 - inherit (darwin.apple_sdk.libs) sandbox; 210 - inherit (darwin.apple_sdk.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit 211 - ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication; 212 - }; 213 - qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; 214 - qtwebkit = callPackage ../modules/qtwebkit.nix { 215 - inherit (darwin) ICU; 216 - inherit (darwin.apple_sdk.frameworks) OpenGL; 217 - }; 218 - qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; 219 - qtwebview = callPackage ../modules/qtwebview.nix { 220 - inherit (darwin.apple_sdk.frameworks) CoreFoundation WebKit; 221 - }; 222 - qtx11extras = callPackage ../modules/qtx11extras.nix {}; 223 - qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; 224 - 225 - env = callPackage ../qt-env.nix {}; 226 - full = env "qt-full-${qtbase.version}" ([ 227 - qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects 228 - qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 229 - qtscript qtsensors qtserialport qtsvg qttools qttranslations 230 - qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets 231 - qtwebview qtx11extras qtxmlpatterns qtlottie 232 - ] ++ lib.optional (!stdenv.isDarwin) qtwayland 233 - ++ lib.optional (stdenv.isDarwin) qtmacextras); 234 - 235 - qmake = makeSetupHook { 236 - deps = [ self.qtbase.dev ]; 237 - substitutions = { 238 - inherit debug; 239 - fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; 240 - }; 241 - } ../hooks/qmake-hook.sh; 242 - 243 - wrapQtAppsHook = makeSetupHook { 244 - deps = [ self.qtbase.dev buildPackages.makeWrapper ] 245 - ++ lib.optional stdenv.isLinux self.qtwayland.dev; 246 - } ../hooks/wrap-qt-apps-hook.sh; 247 - }; 248 - 249 - in lib.makeScope newScope addPackages
-2
pkgs/development/libraries/qt-5/5.14/fetch.sh
··· 1 - WGET_ARGS=( https://download.qt.io/archive/qt/5.14/5.14.2/submodules/ \ 2 - -A '*.tar.xz' )
-409
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
··· 1 - From a5848991db270ffdd9f2fa05220475bb3194d12f Mon Sep 17 00:00:00 2001 2 - From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc> 3 - Date: Fri, 3 Apr 2020 21:07:58 +0200 4 - Subject: [PATCH 01/10] qtbase-mkspecs-mac 5 - 6 - --- 7 - mkspecs/common/mac.conf | 2 +- 8 - mkspecs/features/mac/default_post.prf | 206 -------------------------- 9 - mkspecs/features/mac/default_pre.prf | 58 -------- 10 - mkspecs/features/mac/sdk.mk | 25 ---- 11 - mkspecs/features/mac/sdk.prf | 61 -------- 12 - 5 files changed, 1 insertion(+), 351 deletions(-) 13 - delete mode 100644 mkspecs/features/mac/sdk.mk 14 - delete mode 100644 mkspecs/features/mac/sdk.prf 15 - 16 - diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf 17 - index 61bea952b2..9909dae726 100644 18 - --- a/mkspecs/common/mac.conf 19 - +++ b/mkspecs/common/mac.conf 20 - @@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ 21 - 22 - QMAKE_FIX_RPATH = install_name_tool -id 23 - 24 - -QMAKE_LFLAGS_RPATH = -Wl,-rpath, 25 - +QMAKE_LFLAGS_RPATH = 26 - QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip 27 - 28 - QMAKE_LFLAGS_REL_RPATH = 29 - diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf 30 - index ba163efc18..b80ec1e801 100644 31 - --- a/mkspecs/features/mac/default_post.prf 32 - +++ b/mkspecs/features/mac/default_post.prf 33 - @@ -68,212 +68,6 @@ qt { 34 - } 35 - } 36 - 37 - -# Add the same default rpaths as Xcode does for new projects. 38 - -# This is especially important for iOS/tvOS/watchOS where no other option is possible. 39 - -!no_default_rpath { 40 - - uikit: QMAKE_RPATHDIR += @executable_path/Frameworks 41 - - else: QMAKE_RPATHDIR += @executable_path/../Frameworks 42 - - equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks 43 - -} 44 - - 45 - -# Don't pass -headerpad_max_install_names when using Bitcode. 46 - -# In that case the linker emits a warning stating that the flag is ignored when 47 - -# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). 48 - -# Using this flag is also unnecessary in practice on UIKit platforms since they 49 - -# are sandboxed, and only UIKit platforms support bitcode to begin with. 50 - -!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD 51 - - 52 - -app_extension_api_only { 53 - - QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION 54 - - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION 55 - - QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION 56 - - QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION 57 - -} 58 - - 59 - -macx-xcode { 60 - - qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO 61 - - !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ 62 - - qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO 63 - - else: \ 64 - - qmake_pkginfo_typeinfo.value = "????" 65 - - QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo 66 - - 67 - - bundle_version = $$VERSION 68 - - isEmpty(bundle_version): bundle_version = 1.0.0 69 - - 70 - - l = $$split(bundle_version, '.') 0 0 # make sure there are at least three 71 - - VER_MAJ = $$member(l, 0, 0) 72 - - VER_MIN = $$member(l, 1, 1) 73 - - VER_PAT = $$member(l, 2, 2) 74 - - unset(l) 75 - - 76 - - qmake_full_version.name = QMAKE_FULL_VERSION 77 - - qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} 78 - - QMAKE_MAC_XCODE_SETTINGS += qmake_full_version 79 - - 80 - - qmake_short_version.name = QMAKE_SHORT_VERSION 81 - - qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} 82 - - QMAKE_MAC_XCODE_SETTINGS += qmake_short_version 83 - - 84 - - !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { 85 - - debug_information_format.name = DEBUG_INFORMATION_FORMAT 86 - - debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT 87 - - debug_information_format.build = debug 88 - - QMAKE_MAC_XCODE_SETTINGS += debug_information_format 89 - - } 90 - - 91 - - QMAKE_XCODE_ARCHS = 92 - - 93 - - arch_device.name = "ARCHS[sdk=$${device.sdk}*]" 94 - - arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS 95 - - QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS 96 - - QMAKE_MAC_XCODE_SETTINGS += arch_device 97 - - 98 - - simulator { 99 - - arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" 100 - - arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS 101 - - QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS 102 - - QMAKE_MAC_XCODE_SETTINGS += arch_simulator 103 - - } 104 - - 105 - - only_active_arch.name = ONLY_ACTIVE_ARCH 106 - - only_active_arch.value = YES 107 - - only_active_arch.build = debug 108 - - QMAKE_MAC_XCODE_SETTINGS += only_active_arch 109 - -} else { 110 - - device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS 111 - - simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS 112 - - VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS 113 - - 114 - - isEmpty(VALID_ARCHS): \ 115 - - error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") 116 - - 117 - - single_arch: VALID_ARCHS = $$first(VALID_ARCHS) 118 - - 119 - - ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) 120 - - ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) 121 - - 122 - - QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS 123 - - 124 - - arch_flags = $(EXPORT_ARCH_ARGS) 125 - - 126 - - QMAKE_CFLAGS += $$arch_flags 127 - - QMAKE_CXXFLAGS += $$arch_flags 128 - - QMAKE_LFLAGS += $$arch_flags 129 - - 130 - - QMAKE_PCH_ARCHS = $$VALID_ARCHS 131 - - 132 - - macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET 133 - - ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET 134 - - tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET 135 - - watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET 136 - - 137 - - # If we're doing a simulator and device build, device and simulator 138 - - # architectures use different paths and flags for the sysroot and 139 - - # deployment target switch, so we must multiplex them across multiple 140 - - # architectures using -Xarch. Otherwise we fall back to the simple path. 141 - - # This is not strictly necessary, but results in cleaner command lines 142 - - # and makes it easier for people to override EXPORT_VALID_ARCHS to limit 143 - - # individual rules to a different set of architecture(s) from the overall 144 - - # build (such as machtest in QtCore). 145 - - simulator:device { 146 - - QMAKE_XARCH_CFLAGS = 147 - - QMAKE_XARCH_LFLAGS = 148 - - QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS 149 - - 150 - - for (arch, VALID_ARCHS) { 151 - - contains(VALID_SIMULATOR_ARCHS, $$arch) { 152 - - sdk = $$simulator.sdk 153 - - version_identifier = $$simulator.deployment_identifier 154 - - } else { 155 - - sdk = $$device.sdk 156 - - version_identifier = $$device.deployment_identifier 157 - - } 158 - - 159 - - version_min_flags = \ 160 - - -Xarch_$${arch} \ 161 - - -m$${version_identifier}-version-min=$$deployment_target 162 - - QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ 163 - - -Xarch_$${arch} \ 164 - - -isysroot$$xcodeSDKInfo(Path, $$sdk) 165 - - QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ 166 - - -Xarch_$${arch} \ 167 - - -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk) 168 - - 169 - - QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) 170 - - QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) 171 - - 172 - - QMAKE_EXTRA_VARIABLES += \ 173 - - QMAKE_XARCH_CFLAGS_$${arch} \ 174 - - QMAKE_XARCH_LFLAGS_$${arch} 175 - - } 176 - - 177 - - QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) 178 - - QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) 179 - - QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) 180 - - } else { 181 - - simulator { 182 - - version_identifier = $$simulator.deployment_identifier 183 - - sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk) 184 - - } else { 185 - - version_identifier = $$device.deployment_identifier 186 - - sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) 187 - - } 188 - - version_min_flag = -m$${version_identifier}-version-min=$$deployment_target 189 - - QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag 190 - - QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag 191 - - QMAKE_LFLAGS += -Wl,-syslibroot,$$sysroot_path $$version_min_flag 192 - - } 193 - - 194 - - # Enable precompiled headers for multiple architectures 195 - - QMAKE_CFLAGS_USE_PRECOMPILE = 196 - - for (arch, VALID_ARCHS) { 197 - - icc_pch_style: \ 198 - - use_flag = "-pch-use " 199 - - else: \ 200 - - use_flag = -include 201 - - 202 - - # Only use Xarch with multi-arch, as the option confuses ccache 203 - - count(VALID_ARCHS, 1, greaterThan): \ 204 - - QMAKE_CFLAGS_USE_PRECOMPILE += \ 205 - - -Xarch_$${arch} 206 - - 207 - - QMAKE_CFLAGS_USE_PRECOMPILE += \ 208 - - $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} 209 - - } 210 - - icc_pch_style { 211 - - QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} 212 - - QMAKE_CFLAGS_USE_PRECOMPILE = 213 - - } else { 214 - - QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE 215 - - QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE 216 - - QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE 217 - - } 218 - - 219 - - QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} 220 - -} 221 - - 222 - -!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) { 223 - - # Explicit SDK version has been set, respect that 224 - - QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version 225 - -} 226 - - 227 - -cache(QMAKE_XCODE_DEVELOPER_PATH, stash) 228 - -!isEmpty(QMAKE_XCODE_VERSION): \ 229 - - cache(QMAKE_XCODE_VERSION, stash) 230 - - 231 - -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() 232 - - 233 - -xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER 234 - -xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX 235 - -isEmpty(xcode_product_bundle_identifier_setting.value): \ 236 - - xcode_product_bundle_identifier_setting.value = "com.yourcompany" 237 - -xcode_product_bundle_target = $$QMAKE_BUNDLE 238 - -isEmpty(xcode_product_bundle_target): \ 239 - - xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} 240 - -xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" 241 - -QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting 242 - - 243 - !macx-xcode { 244 - generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS 245 - generate_xcode_project.target = xcodeproj 246 - diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf 247 - index e3534561a5..3b01424e67 100644 248 - --- a/mkspecs/features/mac/default_pre.prf 249 - +++ b/mkspecs/features/mac/default_pre.prf 250 - @@ -1,60 +1,2 @@ 251 - CONFIG = asset_catalogs rez $$CONFIG 252 - load(default_pre) 253 - - 254 - -isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { 255 - - # Get path of Xcode's Developer directory 256 - - QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") 257 - - isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ 258 - - error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") 259 - - 260 - - # Make sure Xcode path is valid 261 - - !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ 262 - - error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") 263 - -} 264 - - 265 - -isEmpty(QMAKE_XCODEBUILD_PATH): \ 266 - - QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") 267 - - 268 - -!isEmpty(QMAKE_XCODEBUILD_PATH) { 269 - - # Make sure Xcode is set up properly 270 - - !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ 271 - - error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") 272 - - 273 - - isEmpty(QMAKE_XCODE_VERSION) { 274 - - # Extract Xcode version using xcodebuild 275 - - xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") 276 - - QMAKE_XCODE_VERSION = $$member(xcode_version, 1) 277 - - isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") 278 - - unset(xcode_version) 279 - - } 280 - -} 281 - - 282 - -isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { 283 - - QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist 284 - - exists($$QMAKE_XCODE_PREFERENCES_FILE): \ 285 - - QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") 286 - - 287 - - !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ 288 - - cache(QMAKE_TARGET_BUNDLE_PREFIX) 289 - -} 290 - - 291 - -QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon 292 - - 293 - -# Make the default debug info format for static debug builds 294 - -# DWARF instead of DWARF with dSYM. This cuts down build times 295 - -# for application debug builds significantly, as Xcode doesn't 296 - -# have to pull out all the DWARF info from the Qt static libs 297 - -# and put it into a dSYM file. We don't need that dSYM file in 298 - -# the first place, since the information is available in the 299 - -# object files inside the archives (static libraries). 300 - -macx-xcode:qtConfig(static): \ 301 - - QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf 302 - - 303 - -# This variable is used by the xcode_dynamic_library_suffix 304 - -# feature, which allows Xcode to choose the Qt libraries to link to 305 - -# at build time, depending on the current Xcode SDK and configuration. 306 - -QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX 307 - - 308 - -xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP 309 - -xcode_copy_phase_strip_setting.value = NO 310 - -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting 311 - diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk 312 - --- a/mkspecs/features/mac/sdk.mk 313 - +++ b/mkspecs/features/mac/sdk.mk 314 - @@ -1,25 +0,0 @@ 315 - - 316 - -ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) 317 - - CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1 318 - - CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) 319 - - ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) 320 - - # We don't want to complain about out of date SDK unless the target needs to be remade. 321 - - # This covers use-cases such as running 'make check' after moving the build to a 322 - - # computer without Xcode or with a different Xcode version. 323 - - TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) 324 - - ifeq ($(TARGET_UP_TO_DATE),0) 325 - - ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) 326 - - $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) 327 - - else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) 328 - - $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) 329 - - else ifneq ($(CURRENT_MAC_SDK_VERSION),) 330 - - $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) 331 - - else 332 - - $(info Unknown error resolving current platform SDK version.) 333 - - endif 334 - - $(info This requires a fresh build. Please wipe the build directory completely,) 335 - - $(info including any .qmake.stash and .qmake.cache files generated by qmake.) 336 - - $(error ^) 337 - - endif 338 - - endif 339 - -endif 340 - diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf 341 - deleted file mode 100644 342 - index 3a9c2778bb..0000000000 343 - --- a/mkspecs/features/mac/sdk.prf 344 - +++ /dev/null 345 - @@ -1,61 +0,0 @@ 346 - - 347 - -isEmpty(QMAKE_MAC_SDK): \ 348 - - error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") 349 - - 350 - -contains(QMAKE_MAC_SDK, .*/.*): \ 351 - - error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") 352 - - 353 - -defineReplace(xcodeSDKInfo) { 354 - - info = $$1 355 - - equals(info, "Path"): \ 356 - - infoarg = --show-sdk-path 357 - - equals(info, "PlatformPath"): \ 358 - - infoarg = --show-sdk-platform-path 359 - - equals(info, "SDKVersion"): \ 360 - - infoarg = --show-sdk-version 361 - - sdk = $$2 362 - - isEmpty(sdk): \ 363 - - sdk = $$QMAKE_MAC_SDK 364 - - 365 - - isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { 366 - - QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null") 367 - - # --show-sdk-platform-path won't work for Command Line Tools; this is fine 368 - - # only used by the XCTest backend to testlib 369 - - isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \ 370 - - error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg") 371 - - cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) 372 - - } 373 - - 374 - - return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) 375 - -} 376 - - 377 - -QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) 378 - -QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) 379 - -QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) 380 - - 381 - -isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) { 382 - - QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL 383 - - sysrootified = 384 - - for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val 385 - - QMAKE_INCDIR_OPENGL = $$sysrootified 386 - -} 387 - - 388 - -QMAKESPEC_NAME = $$basename(QMAKESPEC) 389 - - 390 - -# Resolve SDK version of various tools 391 - -for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) { 392 - - tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} 393 - - !isEmpty($$tool_variable) { 394 - - $$tool = $$eval($$tool_variable) 395 - - next() 396 - - } 397 - - 398 - - value = $$eval($$tool) 399 - - isEmpty(value): next() 400 - - 401 - - sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") 402 - - isEmpty(sysrooted): next() 403 - - 404 - - $$tool = $$sysrooted $$member(value, 1, -1) 405 - - cache($$tool_variable, set stash, $$tool) 406 - -} 407 - -- 408 - 2.25.1 409 -
-490
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch
··· 1 - From 87c81a31d65862a2f32fdc575cfb47b7a46bfae7 Mon Sep 17 00:00:00 2001 2 - From: OPNA2608 <christoph.neidahl@gmail.com> 3 - Date: Mon, 12 Apr 2021 20:05:25 +0200 4 - Subject: [PATCH 03/10] qtbase-mkspecs 5 - 6 - --- 7 - mkspecs/features/create_cmake.prf | 51 +++--------- 8 - .../data/cmake/Qt5BasicConfig.cmake.in | 80 +------------------ 9 - mkspecs/features/qml_module.prf | 2 +- 10 - mkspecs/features/qml_plugin.prf | 2 +- 11 - mkspecs/features/qt_app.prf | 2 +- 12 - mkspecs/features/qt_build_paths.prf | 4 +- 13 - mkspecs/features/qt_docs.prf | 10 +-- 14 - mkspecs/features/qt_example_installs.prf | 2 +- 15 - mkspecs/features/qt_functions.prf | 27 ++++--- 16 - mkspecs/features/qt_installs.prf | 22 ++--- 17 - mkspecs/features/qt_plugin.prf | 2 +- 18 - 11 files changed, 52 insertions(+), 152 deletions(-) 19 - 20 - diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf 21 - index 0e71fd0015..ba071d9a70 100644 22 - --- a/mkspecs/features/create_cmake.prf 23 - +++ b/mkspecs/features/create_cmake.prf 24 - @@ -21,7 +21,7 @@ load(cmake_functions) 25 - # at cmake time whether package has been found via a symlink, and correct 26 - # that to an absolute path. This is only done for installations to 27 - # the /usr or / prefix. 28 - -CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS]) 29 - +CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$NIX_OUTPUT_OUT/lib/) 30 - contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR 31 - 32 - CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake 33 - @@ -77,45 +77,20 @@ split_incpath { 34 - $$cmake_extra_source_includes.output 35 - } 36 - 37 - -CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX]) 38 - -contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { 39 - - CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ 40 - - CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True 41 - -} 42 - +CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/ 43 - +CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True 44 - 45 - -CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) 46 - -contains(CMAKE_LIB_DIR,"^\\.\\./.*") { 47 - - CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ 48 - - CMAKE_LIB_DIR_IS_ABSOLUTE = True 49 - -} else { 50 - - CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS]) 51 - - # We need to go up another two levels because the CMake files are 52 - - # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} 53 - - CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" 54 - -} 55 - +CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/ 56 - +CMAKE_BIN_DIR_IS_ABSOLUTE = True 57 - 58 - -CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) 59 - -contains(CMAKE_BIN_DIR, "^\\.\\./.*") { 60 - - CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ 61 - - CMAKE_BIN_DIR_IS_ABSOLUTE = True 62 - -} 63 - +CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ 64 - +CMAKE_LIB_DIR_IS_ABSOLUTE = True 65 - 66 - -CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]) 67 - -contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { 68 - - CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/ 69 - - CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True 70 - -} 71 - +CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/ 72 - +CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True 73 - 74 - -win32:!static:!staticlib { 75 - - CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) 76 - - contains(CMAKE_DLL_DIR, "^\\.\\./.*") { 77 - - CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ 78 - - CMAKE_DLL_DIR_IS_ABSOLUTE = True 79 - - } 80 - -} else { 81 - - CMAKE_DLL_DIR = $$CMAKE_LIB_DIR 82 - - CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE 83 - -} 84 - +CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ 85 - +CMAKE_DLL_DIR_IS_ABSOLUTE = True 86 - 87 - static|staticlib:CMAKE_STATIC_TYPE = true 88 - 89 - @@ -258,7 +233,7 @@ contains(CONFIG, plugin) { 90 - 91 - cmake_qt5_plugin_file.files = $$cmake_target_file.output 92 - static|staticlib: cmake_qt5_plugin_file.files += $$cmake_qt5_plugin_import_file.output 93 - - cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} 94 - + cmake_qt5_plugin_file.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} 95 - INSTALLS += cmake_qt5_plugin_file 96 - 97 - return() 98 - @@ -396,7 +371,7 @@ exists($$cmake_macros_file.input) { 99 - cmake_qt5_module_files.files += $$cmake_macros_file.output 100 - } 101 - 102 - -cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} 103 - +cmake_qt5_module_files.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} 104 - 105 - # We are generating cmake files. Most developers of Qt are not aware of cmake, 106 - # so we require automatic tests to be available. The only module which should 107 - diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 108 - index 1099a761ce..87679b7e68 100644 109 - --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 110 - +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 111 - @@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) 112 - message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") 113 - endif() 114 - 115 - -!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) 116 - -!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 117 - -set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") 118 - -!!ELSE 119 - -get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) 120 - -# Use original install prefix when loaded through a 121 - -# cross-prefix symbolic link such as /lib -> /usr/lib. 122 - -get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) 123 - -get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) 124 - -if(_realCurr STREQUAL _realOrig) 125 - - get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) 126 - -else() 127 - - get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) 128 - -endif() 129 - -unset(_realOrig) 130 - -unset(_realCurr) 131 - -unset(_IMPORT_PREFIX) 132 - -!!ENDIF 133 - -!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 134 - -get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) 135 - -!!ELSE 136 - -set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") 137 - -!!ENDIF 138 - - 139 - !!IF !equals(TEMPLATE, aux) 140 - # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. 141 - set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") 142 - @@ -146,11 +122,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI 143 - IsDebugAndRelease) 144 - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) 145 - 146 - -!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) 147 - - set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") 148 - -!!ELSE 149 - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") 150 - -!!ENDIF 151 - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) 152 - set(_deps 153 - ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} 154 - @@ -210,11 +182,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI 155 - !!ENDIF 156 - 157 - !!IF !isEmpty(CMAKE_WINDOWS_BUILD) 158 - -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 159 - - set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") 160 - -!!ELSE 161 - set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") 162 - -!!ENDIF 163 - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) 164 - if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") 165 - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES 166 - @@ -230,24 +198,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) 167 - !!IF !no_module_headers 168 - !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) 169 - set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS 170 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" 171 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" 172 - + \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" 173 - + \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" 174 - ) 175 - !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) 176 - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS 177 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" 178 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" 179 - - ) 180 - -!!ELSE 181 - - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") 182 - -!!ENDIF 183 - -!!ELSE 184 - -!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) 185 - - set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") 186 - -!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) 187 - - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS 188 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" 189 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" 190 - + \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/\" 191 - + \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" 192 - ) 193 - !!ELSE 194 - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") 195 - @@ -263,7 +220,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) 196 - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") 197 - !!ENDIF 198 - !!ENDIF 199 - -!!ENDIF 200 - !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) 201 - include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) 202 - !!ENDIF 203 - @@ -465,25 +421,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) 204 - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) 205 - !!IF isEmpty(CMAKE_DEBUG_TYPE) 206 - !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) 207 - -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 208 - - if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) 209 - -!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE 210 - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) 211 - -!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE 212 - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) 213 - !!ELSE // CMAKE_STATIC_WINDOWS_BUILD 214 - if (EXISTS 215 - -!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) 216 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" 217 - -!!ELSE 218 - \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" 219 - -!!ENDIF 220 - AND EXISTS 221 - -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 222 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) 223 - -!!ELSE 224 - \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) 225 - -!!ENDIF 226 - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) 227 - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD 228 - endif() 229 - @@ -502,25 +446,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) 230 - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) 231 - !!IF isEmpty(CMAKE_RELEASE_TYPE) 232 - !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) 233 - -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 234 - - if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) 235 - -!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE 236 - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) 237 - -!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE 238 - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) 239 - !!ELSE // CMAKE_STATIC_WINDOWS_BUILD 240 - if (EXISTS 241 - -!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) 242 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" 243 - -!!ELSE 244 - \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" 245 - -!!ENDIF 246 - AND EXISTS 247 - -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 248 - - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) 249 - -!!ELSE 250 - \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) 251 - -!!ENDIF 252 - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) 253 - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD 254 - endif() 255 - @@ -542,11 +474,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) 256 - IsDebugAndRelease) 257 - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) 258 - 259 - -!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) 260 - - set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") 261 - -!!ELSE 262 - set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") 263 - -!!ENDIF 264 - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) 265 - set_target_properties(Qt5::${Plugin} PROPERTIES 266 - \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} 267 - diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf 268 - index c0b50416c9..cabe39b22e 100644 269 - --- a/mkspecs/features/qml_module.prf 270 - +++ b/mkspecs/features/qml_module.prf 271 - @@ -51,7 +51,7 @@ builtin_resources { 272 - # Install rules 273 - qmldir.base = $$qmldir_path 274 - qmldir.files = $$qmldir_file 275 - -qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH 276 - +qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH 277 - 278 - qmlfiles.base = $$_PRO_FILE_PWD_ 279 - qmlfiles.files = $$fq_aux_qml_files 280 - diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf 281 - index f1c5658b04..029595e721 100644 282 - --- a/mkspecs/features/qml_plugin.prf 283 - +++ b/mkspecs/features/qml_plugin.prf 284 - @@ -50,7 +50,7 @@ load(qt_build_paths) 285 - 286 - DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH 287 - 288 - -target.path = $$[QT_INSTALL_QML]/$$TARGETPATH 289 - +target.path = $$NIX_OUTPUT_QML/$$TARGETPATH 290 - INSTALLS += target 291 - 292 - # Some final setup 293 - diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf 294 - index 8354f30eea..62028fef8e 100644 295 - --- a/mkspecs/features/qt_app.prf 296 - +++ b/mkspecs/features/qt_app.prf 297 - @@ -30,7 +30,7 @@ host_build:force_bootstrap { 298 - target.path = $$[QT_HOST_BINS] 299 - } else { 300 - !build_pass:qtConfig(debug_and_release): CONFIG += release 301 - - target.path = $$[QT_INSTALL_BINS] 302 - + target.path = $$NIX_OUTPUT_BIN/bin 303 - CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable 304 - } 305 - INSTALLS += target 306 - diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf 307 - index 3bb3823a8e..655b7b7db8 100644 308 - --- a/mkspecs/features/qt_build_paths.prf 309 - +++ b/mkspecs/features/qt_build_paths.prf 310 - @@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \ 311 - !force_independent { 312 - # If the module is not built independently, everything ends up in qtbase. 313 - # This is the case in non-prefix builds, except for selected modules. 314 - - MODULE_BASE_OUTDIR = $$[QT_HOST_PREFIX] 315 - - MODULE_QMAKE_OUTDIR = $$[QT_HOST_PREFIX] 316 - + MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT 317 - + MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT 318 - } 319 - diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf 320 - index 095bf15dac..4cc977bea5 100644 321 - --- a/mkspecs/features/qt_docs.prf 322 - +++ b/mkspecs/features/qt_docs.prf 323 - @@ -65,7 +65,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR 324 - 325 - QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) 326 - !build_online_docs: \ 327 - - QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS]) 328 - + QDOC += -installdir $$shell_quote($$NIX_OUTPUT_DOC) 329 - PREP_DOC_INDEXES = 330 - DOC_INDEXES = 331 - !isEmpty(QTREPOS) { 332 - @@ -84,8 +84,8 @@ DOC_INDEXES = 333 - DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) 334 - } else { 335 - prepare_docs: \ 336 - - PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) 337 - - DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) 338 - + PREP_DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) 339 - + DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) 340 - } 341 - 342 - qtattributionsscanner.target = qtattributionsscanner 343 - @@ -108,12 +108,12 @@ prepare_docs { 344 - qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) 345 - 346 - inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR 347 - - inst_html_docs.path = $$[QT_INSTALL_DOCS] 348 - + inst_html_docs.path = $$NIX_OUTPUT_DOC 349 - inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build 350 - INSTALLS += inst_html_docs 351 - 352 - inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch 353 - - inst_qch_docs.path = $$[QT_INSTALL_DOCS] 354 - + inst_qch_docs.path = $$NIX_OUTPUT_DOC 355 - inst_qch_docs.CONFIG += no_check_exist no_default_install no_build 356 - INSTALLS += inst_qch_docs 357 - 358 - diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf 359 - index 72b47bce27..d59e949e78 100644 360 - --- a/mkspecs/features/qt_example_installs.prf 361 - +++ b/mkspecs/features/qt_example_installs.prf 362 - @@ -90,7 +90,7 @@ sourcefiles += \ 363 - $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ 364 - $$DBUS_ADAPTORS $$DBUS_INTERFACES 365 - addInstallFiles(sources.files, $$sourcefiles) 366 - -sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase 367 - +sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase 368 - INSTALLS += sources 369 - 370 - check_examples { 371 - diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 372 - index 7777e615bd..b0c6880a74 100644 373 - --- a/mkspecs/features/qt_functions.prf 374 - +++ b/mkspecs/features/qt_functions.prf 375 - @@ -87,19 +87,22 @@ defineTest(qtHaveModule) { 376 - defineTest(qtPrepareTool) { 377 - cmd = $$eval(QT_TOOL.$${2}.binary) 378 - isEmpty(cmd) { 379 - - cmd = $$[QT_HOST_BINS]/$$2 380 - - exists($${cmd}.pl) { 381 - - $${1}_EXE = $${cmd}.pl 382 - - cmd = perl -w $$system_path($${cmd}.pl) 383 - - } else: contains(QMAKE_HOST.os, Windows) { 384 - - $${1}_EXE = $${cmd}.exe 385 - - cmd = $$system_path($${cmd}.exe) 386 - - } else:contains(QMAKE_HOST.os, Darwin) { 387 - - BUNDLENAME = $${cmd}.app/Contents/MacOS/$$2 388 - - exists($$BUNDLENAME) { 389 - - cmd = $$BUNDLENAME 390 - + cmd = $$system("command -v $${2}") 391 - + isEmpty(cmd) { 392 - + cmd = $$system("command -v $${2}.pl") 393 - + !isEmpty(cmd) { 394 - + $${1}_EXE = $$cmd 395 - + cmd = perl -w $$system_path($${cmd}) 396 - + } else: contains(QMAKE_HOST.os, Windows) { 397 - + cmd = $$system("command -v $${2}.exe") 398 - + $${1}_EXE = $$cmd 399 - + } else: contains(QMAKE_HOST.os, Darwin) { 400 - + cmd = $$system("command -v $${2}.app") 401 - + !isEmpty(cmd) { 402 - + cmd = $${cmd}/Contents/MacOS/$${2} 403 - + $${1}_EXE = $$cmd 404 - + } 405 - } 406 - - $${1}_EXE = $$cmd 407 - } else { 408 - $${1}_EXE = $$cmd 409 - } 410 - diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf 411 - index 1ebca17366..a8f958eae8 100644 412 - --- a/mkspecs/features/qt_installs.prf 413 - +++ b/mkspecs/features/qt_installs.prf 414 - @@ -12,16 +12,10 @@ 415 - #library 416 - !qt_no_install_library { 417 - win32 { 418 - - host_build: \ 419 - - dlltarget.path = $$[QT_HOST_BINS] 420 - - else: \ 421 - - dlltarget.path = $$[QT_INSTALL_BINS] 422 - + dlltarget.path = $$NIX_OUTPUT_BIN/bin 423 - INSTALLS += dlltarget 424 - } 425 - - host_build: \ 426 - - target.path = $$[QT_HOST_LIBS] 427 - - else: \ 428 - - target.path = $$[QT_INSTALL_LIBS] 429 - + target.path = $$NIX_OUTPUT_OUT/lib 430 - !static: target.CONFIG = no_dll 431 - INSTALLS += target 432 - } 433 - @@ -29,35 +23,35 @@ 434 - #headers 435 - qt_install_headers { 436 - gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES 437 - - gen_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME 438 - + gen_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME 439 - INSTALLS += gen_headers 440 - 441 - targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES 442 - - targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME 443 - + targ_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME 444 - INSTALLS += targ_headers 445 - 446 - private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES 447 - - private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private 448 - + private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private 449 - generated_privates: \ 450 - private_headers.CONFIG += no_check_exist 451 - INSTALLS += private_headers 452 - 453 - qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES 454 - - qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa 455 - + qpa_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa 456 - INSTALLS += qpa_headers 457 - } 458 - 459 - #module 460 - qt_install_module { 461 - !isEmpty(MODULE_PRI) { 462 - - pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules 463 - + pritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules 464 - pritarget.files = $$MODULE_PRI 465 - INSTALLS += pritarget 466 - } else: isEmpty(MODULE_PRIVATE_PRI) { 467 - warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.") 468 - } 469 - !isEmpty(MODULE_PRIVATE_PRI) { 470 - - privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules 471 - + privpritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules 472 - privpritarget.files = $$MODULE_PRIVATE_PRI 473 - INSTALLS += privpritarget 474 - } 475 - diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf 476 - index 573d717eea..024c624cb6 100644 477 - --- a/mkspecs/features/qt_plugin.prf 478 - +++ b/mkspecs/features/qt_plugin.prf 479 - @@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { 480 - } 481 - } 482 - 483 - -target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE 484 - +target.path = $$NIX_OUTPUT_PLUGIN/$$PLUGIN_TYPE 485 - INSTALLS += target 486 - 487 - qt_libinfix_plugins: TARGET = $$TARGET$$QT_LIBINFIX 488 - -- 489 - 2.29.3 490 -
-68
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch
··· 1 - From 1cae0c31c9849615190ee175ebf929b3aca13fe0 Mon Sep 17 00:00:00 2001 2 - From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc> 3 - Date: Sat, 4 Apr 2020 00:27:41 +0200 4 - Subject: [PATCH 04/10] qtbase-replace-libdir 5 - 6 - --- 7 - mkspecs/features/qt_common.prf | 20 ++------------------ 8 - mkspecs/features/qt_module.prf | 5 +---- 9 - 2 files changed, 3 insertions(+), 22 deletions(-) 10 - 11 - diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf 12 - index c24f2c6062..0d72ce7286 100644 13 - --- a/mkspecs/features/qt_common.prf 14 - +++ b/mkspecs/features/qt_common.prf 15 - @@ -31,32 +31,16 @@ contains(TEMPLATE, .*lib) { 16 - rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* 17 - else: \ 18 - rplbase = $$MODULE_BASE_OUTDIR 19 - - host_build { 20 - - qqt_libdir = \$\$\$\$[QT_HOST_LIBS] 21 - - qt_libdir = $$[QT_HOST_LIBS] 22 - - } else { 23 - - qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] 24 - - qt_libdir = $$[QT_INSTALL_LIBS] 25 - - } 26 - + qt_libdir = $$NIX_OUTPUT_OUT/lib 27 - contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { 28 - - lib_replace0.match = $$rplbase/lib/ 29 - - lib_replace0.replace = $$qqt_libdir/ 30 - - lib_replace0.CONFIG = path 31 - - QMAKE_PRL_INSTALL_REPLACE += lib_replace0 32 - lib_replace.match = "[^ ']*$$rplbase/lib" 33 - lib_replace.replace = 34 - } else { 35 - lib_replace.match = $$rplbase/lib 36 - - lib_replace.replace = $$qqt_libdir 37 - + lib_replace.replace = $$qt_libdir 38 - } 39 - lib_replace.CONFIG = path 40 - QMAKE_PRL_INSTALL_REPLACE += lib_replace 41 - - !equals(qt_libdir, $$rplbase/lib) { 42 - - qtlibdir_replace.match = $$qt_libdir 43 - - qtlibdir_replace.replace = $$qqt_libdir 44 - - qtlibdir_replace.CONFIG = path 45 - - QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace 46 - - } 47 - } 48 - 49 - # The remainder of this file must not apply to host tools/libraries, 50 - diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf 51 - index 828a9621b9..b9e5d35026 100644 52 - --- a/mkspecs/features/qt_module.prf 53 - +++ b/mkspecs/features/qt_module.prf 54 - @@ -305,10 +305,7 @@ load(qt_targets) 55 - } 56 - !lib_bundle:unix { 57 - CONFIG += create_libtool 58 - - host_build: \ 59 - - QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS] 60 - - else: \ 61 - - QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]" 62 - + QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib 63 - !isEmpty(lib_replace0.match) { 64 - ltlib_replace0.match = $$lib_replace0.match 65 - ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/ 66 - -- 67 - 2.25.1 68 -
-194
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch
··· 1 - From 7e93d1330e1f8c8cd68334201ad100b8c05c9ab5 Mon Sep 17 00:00:00 2001 2 - From: Thomas Tuegel <ttuegel@mailbox.org> 3 - Date: Tue, 17 Sep 2019 05:34:28 -0500 4 - Subject: [PATCH 05/10] qtbase-cmake 5 - 6 - --- 7 - mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +- 8 - mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in | 4 ++-- 9 - src/corelib/Qt5CoreConfigExtras.cmake.in | 10 +++++----- 10 - src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in | 2 +- 11 - .../Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in | 2 +- 12 - src/dbus/Qt5DBusConfigExtras.cmake.in | 12 ++---------- 13 - src/gui/Qt5GuiConfigExtras.cmake.in | 6 +++--- 14 - src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- 15 - 8 files changed, 16 insertions(+), 24 deletions(-) 16 - 17 - diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 18 - index 87679b7e68..57060e6470 100644 19 - --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 20 - +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 21 - @@ -474,7 +474,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) 22 - IsDebugAndRelease) 23 - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) 24 - 25 - - set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") 26 - + set(imported_location \"${PLUGIN_LOCATION}\") 27 - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) 28 - set_target_properties(Qt5::${Plugin} PROPERTIES 29 - \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} 30 - diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in 31 - index 7b70cfed09..e700cfa539 100644 32 - --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in 33 - +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in 34 - @@ -53,10 +53,10 @@ set_property(TARGET Qt5::$$CMAKE_PLUGIN_NAME PROPERTY INTERFACE_SOURCES 35 - !!ENDIF 36 - 37 - !!IF !isEmpty(CMAKE_RELEASE_TYPE) 38 - -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) 39 - +_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) 40 - !!ENDIF 41 - !!IF !isEmpty(CMAKE_DEBUG_TYPE) 42 - -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) 43 - +_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) 44 - !!ENDIF 45 - 46 - list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) 47 - diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in 48 - index 9b672327ef..319ba94d6d 100644 49 - --- a/src/corelib/Qt5CoreConfigExtras.cmake.in 50 - +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in 51 - @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) 52 - add_executable(Qt5::qmake IMPORTED) 53 - 54 - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 55 - - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") 56 - + set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") 57 - !!ELSE 58 - set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") 59 - !!ENDIF 60 - @@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) 61 - add_executable(Qt5::moc IMPORTED) 62 - 63 - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 64 - - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") 65 - + set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") 66 - !!ELSE 67 - set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") 68 - !!ENDIF 69 - @@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) 70 - add_executable(Qt5::rcc IMPORTED) 71 - 72 - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 73 - - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") 74 - + set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") 75 - !!ELSE 76 - set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") 77 - !!ENDIF 78 - @@ -118,7 +118,7 @@ if (NOT TARGET Qt5::WinMain) 79 - !!IF !isEmpty(CMAKE_RELEASE_TYPE) 80 - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) 81 - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 82 - - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") 83 - + set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") 84 - !!ELSE 85 - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") 86 - !!ENDIF 87 - @@ -132,7 +132,7 @@ if (NOT TARGET Qt5::WinMain) 88 - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) 89 - 90 - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 91 - - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") 92 - + set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") 93 - !!ELSE 94 - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") 95 - !!ENDIF 96 - diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 97 - index c357237d0e..6f0c75de3c 100644 98 - --- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 99 - +++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 100 - @@ -1,6 +1,6 @@ 101 - 102 - !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) 103 - -set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") 104 - +set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") 105 - !!ELSE 106 - set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") 107 - !!ENDIF 108 - diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 109 - index 706304cf34..546420f6ad 100644 110 - --- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 111 - +++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 112 - @@ -1,6 +1,6 @@ 113 - 114 - !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) 115 - -set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") 116 - +set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") 117 - !!ELSE 118 - set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") 119 - !!ENDIF 120 - diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in 121 - index 1d947159e2..b36865fc48 100644 122 - --- a/src/dbus/Qt5DBusConfigExtras.cmake.in 123 - +++ b/src/dbus/Qt5DBusConfigExtras.cmake.in 124 - @@ -2,11 +2,7 @@ 125 - if (NOT TARGET Qt5::qdbuscpp2xml) 126 - add_executable(Qt5::qdbuscpp2xml IMPORTED) 127 - 128 - -!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 129 - - set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") 130 - -!!ELSE 131 - - set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") 132 - -!!ENDIF 133 - + set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") 134 - _qt5_DBus_check_file_exists(${imported_location}) 135 - 136 - set_target_properties(Qt5::qdbuscpp2xml PROPERTIES 137 - @@ -17,11 +13,7 @@ endif() 138 - if (NOT TARGET Qt5::qdbusxml2cpp) 139 - add_executable(Qt5::qdbusxml2cpp IMPORTED) 140 - 141 - -!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 142 - - set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") 143 - -!!ELSE 144 - - set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") 145 - -!!ENDIF 146 - + set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") 147 - _qt5_DBus_check_file_exists(${imported_location}) 148 - 149 - set_target_properties(Qt5::qdbusxml2cpp PROPERTIES 150 - diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in 151 - index 84dbbfebd4..8ad0720c5c 100644 152 - --- a/src/gui/Qt5GuiConfigExtras.cmake.in 153 - +++ b/src/gui/Qt5GuiConfigExtras.cmake.in 154 - @@ -2,7 +2,7 @@ 155 - !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) 156 - 157 - !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) 158 - -set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") 159 - +set(Qt5Gui_EGL_INCLUDE_DIRS \"$$NIX_OUTPUT_DEV/$$CMAKE_INCLUDE_DIR/QtANGLE\") 160 - !!ELSE 161 - set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") 162 - !!ENDIF 163 - @@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO 164 - set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) 165 - 166 - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) 167 - - set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") 168 - + set(imported_location \"$$NIX_OUTPUT_OUT/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") 169 - !!ELSE 170 - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") 171 - !!ENDIF 172 - 173 - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 174 - - set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") 175 - + set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") 176 - !!ELSE 177 - set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") 178 - !!ENDIF 179 - diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 180 - index 99d87e2e46..a4eab2aa72 100644 181 - --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in 182 - +++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 183 - @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) 184 - add_executable(Qt5::uic IMPORTED) 185 - 186 - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) 187 - - set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") 188 - + set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") 189 - !!ELSE 190 - set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") 191 - !!ENDIF 192 - -- 193 - 2.25.1 194 -
-48
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch
··· 1 - From 1ad04525cdd342e3c8a750323fb3a61b93fee753 Mon Sep 17 00:00:00 2001 2 - From: Thomas Tuegel <ttuegel@mailbox.org> 3 - Date: Tue, 17 Sep 2019 05:35:33 -0500 4 - Subject: [PATCH 06/10] qtbase-gtk3 5 - 6 - --- 7 - src/plugins/platformthemes/gtk3/main.cpp | 17 ++++++++++++++++- 8 - 1 file changed, 16 insertions(+), 1 deletion(-) 9 - 10 - diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp 11 - index fb1c425d8e..bb8bab9795 100644 12 - --- a/src/plugins/platformthemes/gtk3/main.cpp 13 - +++ b/src/plugins/platformthemes/gtk3/main.cpp 14 - @@ -39,6 +39,7 @@ 15 - 16 - #include <qpa/qplatformthemeplugin.h> 17 - #include "qgtk3theme.h" 18 - +#include <QFile> 19 - 20 - QT_BEGIN_NAMESPACE 21 - 22 - @@ -54,8 +55,22 @@ public: 23 - QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList &params) 24 - { 25 - Q_UNUSED(params); 26 - - if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) 27 - + if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) { 28 - + 29 - +#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS 30 - + QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':'); 31 - + XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS); 32 - + qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':'))); 33 - +#endif 34 - + 35 - +#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES 36 - + QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':'); 37 - + GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES); 38 - + qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':'))); 39 - +#endif 40 - + 41 - return new QGtk3Theme; 42 - + } 43 - 44 - return 0; 45 - } 46 - -- 47 - 2.25.1 48 -
-29
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch
··· 1 - From cc953cc3f736fabef1f5c211964f30be719fb35e Mon Sep 17 00:00:00 2001 2 - From: Thomas Tuegel <ttuegel@mailbox.org> 3 - Date: Tue, 17 Sep 2019 05:35:58 -0500 4 - Subject: [PATCH 07/10] qtbase-xcursor 5 - 6 - --- 7 - src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- 8 - 1 file changed, 2 insertions(+), 2 deletions(-) 9 - 10 - diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp 11 - index fbadab4d50..c83ce0af5b 100644 12 - --- a/src/plugins/platforms/xcb/qxcbcursor.cpp 13 - +++ b/src/plugins/platforms/xcb/qxcbcursor.cpp 14 - @@ -317,10 +317,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) 15 - #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) 16 - static bool function_ptrs_not_initialized = true; 17 - if (function_ptrs_not_initialized) { 18 - - QLibrary xcursorLib(QLatin1String("Xcursor"), 1); 19 - + QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1); 20 - bool xcursorFound = xcursorLib.load(); 21 - if (!xcursorFound) { // try without the version number 22 - - xcursorLib.setFileName(QLatin1String("Xcursor")); 23 - + xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR)); 24 - xcursorFound = xcursorLib.load(); 25 - } 26 - if (xcursorFound) { 27 - -- 28 - 2.25.1 29 -
-64
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch
··· 1 - From 882343ea200fe28810bf217a820816affe885a39 Mon Sep 17 00:00:00 2001 2 - From: Thomas Tuegel <ttuegel@mailbox.org> 3 - Date: Tue, 17 Sep 2019 05:36:25 -0500 4 - Subject: [PATCH 08/10] qtbase-tzdir 5 - 6 - --- 7 - src/corelib/time/qtimezoneprivate_tz.cpp | 31 +++++++++++++++--------- 8 - 1 file changed, 19 insertions(+), 12 deletions(-) 9 - 10 - diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp 11 - index 3c2695a789..e75735f88f 100644 12 - --- a/src/corelib/time/qtimezoneprivate_tz.cpp 13 - +++ b/src/corelib/time/qtimezoneprivate_tz.cpp 14 - @@ -75,7 +75,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash; 15 - // Parse zone.tab table, assume lists all installed zones, if not will need to read directories 16 - static QTzTimeZoneHash loadTzTimeZones() 17 - { 18 - - QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); 19 - + // Try TZDIR first, in case we're running on NixOS. 20 - + QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); 21 - + // Fallback to traditional paths in case we are not on NixOS. 22 - + if (!QFile::exists(path)) 23 - + path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); 24 - if (!QFile::exists(path)) 25 - path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); 26 - 27 - @@ -658,20 +662,23 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) 28 - if (!tzif.open(QIODevice::ReadOnly)) 29 - return; 30 - } else { 31 - - // Open named tz, try modern path first, if fails try legacy path 32 - - tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); 33 - + // Try TZDIR first, in case we're running on NixOS 34 - + tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); 35 - if (!tzif.open(QIODevice::ReadOnly)) { 36 - - tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); 37 - + tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); 38 - if (!tzif.open(QIODevice::ReadOnly)) { 39 - - // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ 40 - - const QByteArray zoneInfo = ianaId.split(',').at(0); 41 - - const char *begin = zoneInfo.constBegin(); 42 - - if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() 43 - - && (begin == zoneInfo.constEnd() 44 - - || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { 45 - - m_id = m_posixRule = ianaId; 46 - + tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); 47 - + if (!tzif.open(QIODevice::ReadOnly)) { 48 - + // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ 49 - + const QByteArray zoneInfo = ianaId.split(',').at(0); 50 - + const char *begin = zoneInfo.constBegin(); 51 - + if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() 52 - + && (begin == zoneInfo.constEnd() 53 - + || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { 54 - + m_id = m_posixRule = ianaId; 55 - + } 56 - + return; 57 - } 58 - - return; 59 - } 60 - } 61 - } 62 - -- 63 - 2.25.1 64 -
-19
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch
··· 1 - --- qtbase-everywhere-src-5.14.2/src/corelib/kernel/qcoreapplication.cpp 2020-03-27 10:49:31.000000000 +0100 2 - +++ qtbase-everywhere-src-5.14.2/src/corelib/kernel/qcoreapplication.cpp.patched 2020-05-09 15:03:03.968084088 +0200 3 - @@ -2691,6 +2691,16 @@ 4 - QStringList *app_libpaths = new QStringList; 5 - coreappdata()->app_libpaths.reset(app_libpaths); 6 - 7 - + // Add library paths derived from PATH 8 - + const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); 9 - + const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); 10 - + for (const QString &path: paths) { 11 - + if (!path.isEmpty()) { 12 - + app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); 13 - + } 14 - + } 15 - + 16 - + 17 - auto setPathsFromEnv = [&](QString libPathEnv) { 18 - if (!libPathEnv.isEmpty()) { 19 - QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts);
-32
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch
··· 1 - From c8893a4e0a1b46796e39b4a338358fdb45685cba Mon Sep 17 00:00:00 2001 2 - From: Thomas Tuegel <ttuegel@mailbox.org> 3 - Date: Tue, 17 Sep 2019 05:37:04 -0500 4 - Subject: [PATCH 09/10] qtbase-assert 5 - 6 - --- 7 - src/testlib/qtestassert.h | 7 +++++-- 8 - 1 file changed, 5 insertions(+), 2 deletions(-) 9 - 10 - diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h 11 - index 6498ea84ef..d821ced7fc 100644 12 - --- a/src/testlib/qtestassert.h 13 - +++ b/src/testlib/qtestassert.h 14 - @@ -44,10 +44,13 @@ 15 - 16 - QT_BEGIN_NAMESPACE 17 - 18 - - 19 - +#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) 20 - +#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) 21 - +#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) 22 - +#else 23 - #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) 24 - - 25 - #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) 26 - +#endif 27 - 28 - QT_END_NAMESPACE 29 - 30 - -- 31 - 2.25.1 32 -
-25
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch
··· 1 - From 4c488fdb457e63924383fb7f8ad45bed3df49480 Mon Sep 17 00:00:00 2001 2 - From: Will Dietz <w@wdtz.org> 3 - Date: Mon, 30 Sep 2019 20:15:40 -0500 4 - Subject: [PATCH 10/10] fix header_module 5 - 6 - --- 7 - mkspecs/features/qt_module.prf | 2 +- 8 - 1 file changed, 1 insertion(+), 1 deletion(-) 9 - 10 - diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf 11 - index 16b39031bc..1ac3d6fe59 100644 12 - --- a/mkspecs/features/qt_module.prf 13 - +++ b/mkspecs/features/qt_module.prf 14 - @@ -84,7 +84,7 @@ header_module { 15 - CONFIG += qt_no_install_library 16 - 17 - # Allow creation of .prl, .la and .pc files. 18 - - target.path = $$[QT_INSTALL_LIBS] 19 - + target.path = $$NIX_OUTPUT_OUT/lib 20 - target.CONFIG += dummy_install 21 - INSTALLS += target 22 - } else { 23 - -- 24 - 2.25.1 25 -
-15
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch
··· 1 - diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in 2 - index 84dbbfebd4..615bfed124 100644 3 - --- a/src/gui/Qt5GuiConfigExtras.cmake.in 4 - +++ b/src/gui/Qt5GuiConfigExtras.cmake.in 5 - @@ -119,6 +119,10 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) 6 - if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") 7 - set(Qt5Gui_${_cmake_lib_name}_LIBRARY) 8 - endif() 9 - + set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}.tbd") 10 - + if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") 11 - + set(Qt5Gui_${_cmake_lib_name}_LIBRARY) 12 - + endif() 13 - !!ENDIF 14 - if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY) 15 - # The above find_library call doesn\'t work for finding
-16
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0013-define-kiosurfacesuccess.patch
··· 1 - diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm 2 - index a367487e..c3aeca1d 100644 3 - --- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm 4 - +++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm 5 - @@ -49,6 +49,11 @@ 6 - // but was only added in the 10.14 SDK, so declare it just in case. 7 - extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space); 8 - 9 - +// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html 10 - +#if !defined(kIOSurfaceSuccess) 11 - +#define kIOSurfaceSuccess KERN_SUCCESS 12 - +#endif 13 - + 14 - QT_BEGIN_NAMESPACE 15 - 16 - Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface");
-77
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/qtbase-sdk-10.12-mac.patch
··· 1 - diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf 2 - --- a/mkspecs/common/macx.conf 3 - +++ b/mkspecs/common/macx.conf 4 - @@ -10,7 +10,7 @@ QMAKE_APPLE_DEVICE_ARCHS = x86_64 5 - 6 - # Should be 10.15, but as long as the CI builds with 7 - # older SDKs we have to keep this. 8 - -QT_MAC_SDK_VERSION_MIN = 10.14 9 - +QT_MAC_SDK_VERSION_MIN = 10.12 10 - 11 - QT_MAC_SDK_VERSION_MAX = 10.15 12 - 13 - diff --git a/src/corelib/kernel/qcore_mac_objc.mm b/src/corelib/kernel/qcore_mac_objc.mm 14 - --- a/src/corelib/kernel/qcore_mac_objc.mm 15 - +++ b/src/corelib/kernel/qcore_mac_objc.mm 16 - @@ -142,16 +142,10 @@ QMacAutoReleasePool::QMacAutoReleasePool() 17 - 18 - #ifdef QT_DEBUG 19 - void *poolFrame = nullptr; 20 - - if (__builtin_available(macOS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)) { 21 - - void *frame; 22 - - if (backtrace_from_fp(__builtin_frame_address(0), &frame, 1)) 23 - - poolFrame = frame; 24 - - } else { 25 - static const int maxFrames = 3; 26 - void *callstack[maxFrames]; 27 - if (backtrace(callstack, maxFrames) == maxFrames) 28 - poolFrame = callstack[maxFrames - 1]; 29 - - } 30 - 31 - if (poolFrame) { 32 - Dl_info info; 33 - diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp 34 - --- a/src/gui/rhi/qrhi.cpp 35 - +++ b/src/gui/rhi/qrhi.cpp 36 - @@ -4050,7 +4050,7 @@ QRhi *QRhi::create(Implementation impl, QRhiInitParams *params, Flags flags, QRh 37 - #endif 38 - case Metal: 39 - //#ifdef Q_OS_DARWIN 40 - -#ifdef Q_OS_MACOS 41 - +#if 0 42 - r->d = new QRhiMetal(static_cast<QRhiMetalInitParams *>(params), 43 - static_cast<QRhiMetalNativeHandles *>(importDevice)); 44 - break; 45 - diff --git a/src/gui/rhi/rhi.pri b/src/gui/rhi/rhi.pri 46 - --- a/src/gui/rhi/rhi.pri 47 - +++ b/src/gui/rhi/rhi.pri 48 - @@ -44,7 +44,7 @@ win32 { 49 - } 50 - 51 - # darwin { 52 - -macos { 53 - +false { 54 - HEADERS += \ 55 - rhi/qrhimetal_p.h \ 56 - rhi/qrhimetal_p_p.h 57 - diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm 58 - --- a/src/plugins/platforms/cocoa/qcocoadrag.mm 59 - +++ b/src/plugins/platforms/cocoa/qcocoadrag.mm 60 - @@ -134,7 +134,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) 61 - NSImage *nsimage = qt_mac_create_nsimage(pm); 62 - [nsimage setSize:NSSizeFromCGSize(pmDeviceIndependentSize.toCGSize())]; 63 - 64 - - QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND); 65 - + QMacPasteboard dragBoard((CFStringRef) NSDragPboard, QMacInternalPasteboardMime::MIME_DND); 66 - m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy")); 67 - dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest); 68 - 69 - @@ -145,7 +145,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) 70 - CGFloat flippedY = pmDeviceIndependentSize.height() - hotSpot.y(); 71 - event_location.y -= flippedY; 72 - NSSize mouseOffset_unused = NSMakeSize(0.0, 0.0); 73 - - NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag]; 74 - + NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard]; 75 - 76 - [theWindow dragImage:nsimage 77 - at:event_location
-13
pkgs/development/libraries/qt-5/5.14/qtdeclarative-default-disable-qmlcache.patch
··· 1 - diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp 2 - index 6c12de92..fc67dc07 100644 3 - --- a/src/qml/qml/qqmltypeloader.cpp 4 - +++ b/src/qml/qml/qqmltypeloader.cpp 5 - @@ -705,7 +705,7 @@ bool QQmlTypeLoader::Blob::isDebugging() const 6 - 7 - bool QQmlTypeLoader::Blob::diskCacheEnabled() const 8 - { 9 - - return (!disableDiskCache() || forceDiskCache()) && !isDebugging(); 10 - + return (forceDiskCache()) && !isDebugging(); 11 - } 12 - 13 - bool QQmlTypeLoader::Blob::qmldirDataAvailable(const QQmlRefPointer<QQmlQmldirData> &data, QList<QQmlError> *errors)
-33
pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch
··· 1 - diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp 2 - index 005db4248..685c5b1b2 100644 3 - --- a/src/qml/qml/qqmlimport.cpp 4 - +++ b/src/qml/qml/qqmlimport.cpp 5 - @@ -1760,6 +1760,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) 6 - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); 7 - addImportPath(installImportsPath); 8 - 9 - + // Add import paths derived from PATH 10 - + const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); 11 - + const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX); 12 - + for (const QString &path: paths) { 13 - + if (!path.isEmpty()) { 14 - + addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir)); 15 - + } 16 - + } 17 - + 18 - // env import paths 19 - if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { 20 - const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH"); 21 - diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf 22 - index 537eaf62e..e21de58f6 100644 23 - --- a/tools/qmlcachegen/qmlcache.prf 24 - +++ b/tools/qmlcachegen/qmlcache.prf 25 - @@ -26,7 +26,7 @@ defineReplace(qmlCacheOutputFileName) { 26 - } 27 - 28 - qmlcacheinst.base = $$QMLCACHE_DESTDIR 29 - -qmlcacheinst.path = $$[QT_INSTALL_QML]/$$TARGETPATH 30 - +qmlcacheinst.path = $$NIX_OUTPUT_QML/$$TARGETPATH 31 - qmlcacheinst.CONFIG = no_check_exist 32 - 33 - qmlcachegen.input = CACHEGEN_FILES
-21
pkgs/development/libraries/qt-5/5.14/qtlocation-gcc-9.patch
··· 1 - diff --git a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp 2 - index d475c38..c1710a6 100644 3 - --- a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp 4 - +++ b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp 5 - @@ -5,6 +5,7 @@ 6 - #include <unicode/ushape.h> 7 - 8 - #include <memory> 9 - +#include <stdexcept> 10 - 11 - namespace mbgl { 12 - 13 - diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp 14 - index 97bfe91..56d3e17 100644 15 - --- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp 16 - +++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp 17 - @@ -1,3 +1,4 @@ 18 - +#include <cstdint> 19 - #include <mbgl/util/convert.hpp> 20 - 21 - namespace mbgl {
-13
pkgs/development/libraries/qt-5/5.14/qtscript.patch
··· 1 - diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2 - index 1f6d25e..087c3fb 100644 3 - --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 4 - +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 5 - @@ -81,7 +81,7 @@ 6 - #include <pthread.h> 7 - #elif PLATFORM(GTK) 8 - #include <wtf/gtk/GOwnPtr.h> 9 - -typedef struct _GMutex GMutex; 10 - +typedef union _GMutex GMutex; 11 - typedef struct _GCond GCond; 12 - #endif 13 -
-22
pkgs/development/libraries/qt-5/5.14/qtserialport.patch
··· 1 - diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h 2 - index af2dab2..8e17f64 100644 3 - --- a/src/serialport/qtudev_p.h 4 - +++ b/src/serialport/qtudev_p.h 5 - @@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN 6 - inline bool resolveSymbols(QLibrary *udevLibrary) 7 - { 8 - if (!udevLibrary->isLoaded()) { 9 - +#ifdef NIXPKGS_LIBUDEV 10 - + udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1); 11 - +#else 12 - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); 13 - +#endif 14 - if (!udevLibrary->load()) { 15 - +#ifdef NIXPKGS_LIBUDEV 16 - + udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0); 17 - +#else 18 - udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); 19 - +#endif 20 - if (!udevLibrary->load()) { 21 - qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); 22 - return false;
-15
pkgs/development/libraries/qt-5/5.14/qttools.patch
··· 1 - --- a/src/macdeployqt/shared/shared.cpp 2 - +++ b/src/macdeployqt/shared/shared.cpp 3 - @@ -1241,6 +1241,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf 4 - if (!QFile(qmlImportScannerPath).exists()) 5 - qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner"; 6 - 7 - +#ifdef NIXPKGS_QMLIMPORTSCANNER 8 - + // Fallback: Nixpkgs hardcoded path 9 - + if (!QFile(qmlImportScannerPath).exists()) 10 - + qmlImportScannerPath = NIXPKGS_QMLIMPORTSCANNER; 11 - +#endif 12 - + 13 - // Verify that we found a qmlimportscanner binary 14 - if (!QFile(qmlImportScannerPath).exists()) { 15 - LogError() << "qmlimportscanner not found at" << qmlImportScannerPath;
-33
pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch
··· 1 - diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf 2 - --- a/mkspecs/features/platform.prf 3 - +++ b/mkspecs/features/platform.prf 4 - @@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { 5 - } else:osx { 6 - # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 7 - !isMinXcodeVersion(8, 3, 3) { 8 - - skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") 9 - - return(false) 10 - } 11 - !clang|intel_icc { 12 - skipBuild("Qt WebEngine on macOS requires Clang.") 13 - @@ -54,8 +52,6 @@ defineTest(isPlatformSupported) { 14 - return(false) 15 - } 16 - !isMinOSXSDKVersion(10, 12): { 17 - - skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") 18 - - return(false) 19 - } 20 - } else { 21 - skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") 22 - diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri 23 - --- a/src/core/config/mac_osx.pri 24 - +++ b/src/core/config/mac_osx.pri 25 - @@ -5,8 +5,6 @@ load(functions) 26 - # otherwise query for it. 27 - QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) 28 - isEmpty(QMAKE_MAC_SDK_VERSION) { 29 - - QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") 30 - - isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") 31 - } 32 - 33 - QMAKE_CLANG_DIR = "/usr"
-11
pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch
··· 1 - diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake 2 - --- a/Source/cmake/OptionsQt.cmake 3 - +++ b/Source/cmake/OptionsQt.cmake 4 - @@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG) 5 - endif () 6 - 7 - if (APPLE) 8 - - SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1) 9 - endif () 10 - 11 - if (ENABLE_MATHML)
-30
pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch
··· 1 - diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt 2 - --- a/Source/JavaScriptCore/shell/CMakeLists.txt 3 - +++ b/Source/JavaScriptCore/shell/CMakeLists.txt 4 - @@ -9,7 +9,6 @@ set(JSC_LIBRARIES 5 - ) 6 - 7 - if (WTF_OS_MAC_OS_X) 8 - - list(APPEND JSC_LIBRARIES edit) 9 - endif () 10 - 11 - if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC") 12 - diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h 13 - --- a/Source/WTF/wtf/Platform.h 14 - +++ b/Source/WTF/wtf/Platform.h 15 - @@ -563,7 +563,6 @@ 16 - #if PLATFORM(IOS) 17 - 18 - #define HAVE_NETWORK_EXTENSION 1 19 - -#define HAVE_READLINE 1 20 - #if USE(APPLE_INTERNAL_SDK) 21 - #define USE_CFNETWORK 1 22 - #endif 23 - @@ -650,7 +649,6 @@ 24 - #define HAVE_MADV_DONTNEED 1 25 - #define HAVE_MERGESORT 1 26 - #define HAVE_PTHREAD_SETNAME_NP 1 27 - -#define HAVE_READLINE 1 28 - #define HAVE_SYS_TIMEB_H 1 29 - 30 - #if !PLATFORM(GTK) && !PLATFORM(QT)
-170
pkgs/development/libraries/qt-5/5.14/qtwebkit-icu68.patch
··· 1 - Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 2 - 3 - In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31: 4 - Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE' 5 - ucnv_setFallback(m_converterICU, TRUE); 6 - ^ 7 - In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40: 8 - In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27: 9 - Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE' 10 - isAccessible = TRUE; 11 - ^ 12 - Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE' 13 - isAccessible = FALSE; 14 - ^ 15 - Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE' 16 - isAccessible = TRUE; 17 - ^ 18 - Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE' 19 - isAccessible = FALSE; 20 - ^ 21 - In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41: 22 - Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' 23 - return TRUE; 24 - ^ 25 - Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' 26 - return FALSE; 27 - ^ 28 - Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' 29 - return TRUE; 30 - ^ 31 - Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' 32 - return FALSE; 33 - ^ 34 - Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' 35 - return TRUE; 36 - ^ 37 - Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE' 38 - return FALSE; 39 - ^ 40 - Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE' 41 - return TRUE; 42 - ^ 43 - In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42: 44 - Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE' 45 - return FALSE; 46 - ^ 47 - Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE' 48 - return TRUE; 49 - ^ 50 - 51 - --- a/Source/WebCore/platform/text/TextCodecICU.cpp 52 - +++ b/Source/WebCore/platform/text/TextCodecICU.cpp 53 - @@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const 54 - m_converterICU = ucnv_open(m_canonicalConverterName, &err); 55 - ASSERT(U_SUCCESS(err)); 56 - if (m_converterICU) 57 - - ucnv_setFallback(m_converterICU, TRUE); 58 - + ucnv_setFallback(m_converterICU, true); 59 - } 60 - 61 - int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) 62 - --- a/Source/WebCore/platform/text/icu/UTextProvider.h 63 - +++ b/Source/WebCore/platform/text/icu/UTextProvider.h 64 - @@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text 65 - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. 66 - ASSERT(offset < std::numeric_limits<int32_t>::max()); 67 - text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; 68 - - isAccessible = TRUE; 69 - + isAccessible = true; 70 - return true; 71 - } 72 - if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { 73 - text->chunkOffset = text->chunkLength; 74 - - isAccessible = FALSE; 75 - + isAccessible = false; 76 - return true; 77 - } 78 - } else { 79 - @@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text 80 - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. 81 - ASSERT(offset < std::numeric_limits<int32_t>::max()); 82 - text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; 83 - - isAccessible = TRUE; 84 - + isAccessible = true; 85 - return true; 86 - } 87 - if (nativeIndex <= 0 && !text->chunkNativeStart) { 88 - text->chunkOffset = 0; 89 - - isAccessible = FALSE; 90 - + isAccessible = false; 91 - return true; 92 - } 93 - } 94 - --- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp 95 - +++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp 96 - @@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i 97 - if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { 98 - // Already inside the buffer. Set the new offset. 99 - uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); 100 - - return TRUE; 101 - + return true; 102 - } 103 - if (index >= length && uText->chunkNativeLimit == length) { 104 - // Off the end of the buffer, but we can't get it. 105 - uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); 106 - - return FALSE; 107 - + return false; 108 - } 109 - } else { 110 - if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { 111 - // Already inside the buffer. Set the new offset. 112 - uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); 113 - - return TRUE; 114 - + return true; 115 - } 116 - if (!index && !uText->chunkNativeStart) { 117 - // Already at the beginning; can't go any farther. 118 - uText->chunkOffset = 0; 119 - - return FALSE; 120 - + return false; 121 - } 122 - } 123 - 124 - @@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i 125 - 126 - uText->nativeIndexingLimit = uText->chunkLength; 127 - 128 - - return TRUE; 129 - + return true; 130 - } 131 - 132 - static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) 133 - @@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe 134 - static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) 135 - { 136 - if (!text->context) 137 - - return FALSE; 138 - + return false; 139 - int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); 140 - UBool isAccessible; 141 - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) 142 - @@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text 143 - ASSERT(newContext == UTextProviderContext::PriorContext); 144 - textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); 145 - } 146 - - return TRUE; 147 - + return true; 148 - } 149 - 150 - static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) 151 - --- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp 152 - +++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp 153 - @@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng 154 - static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) 155 - { 156 - if (!text->context) 157 - - return FALSE; 158 - + return false; 159 - int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); 160 - UBool isAccessible; 161 - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) 162 - @@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, 163 - ASSERT(newContext == UTextProviderContext::PriorContext); 164 - textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); 165 - } 166 - - return TRUE; 167 - + return true; 168 - } 169 - 170 - static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
-12
pkgs/development/libraries/qt-5/5.14/qtwebkit.patch
··· 1 - diff --git a/Source/WebKit2/PlatformQt.cmake b/Source/WebKit2/PlatformQt.cmake 2 - --- a/Source/WebKit2/PlatformQt.cmake 3 - +++ b/Source/WebKit2/PlatformQt.cmake 4 - @@ -261,6 +261,7 @@ 5 - list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES 6 - ${GLIB_INCLUDE_DIRS} 7 - ${GSTREAMER_INCLUDE_DIRS} 8 - + ${GSTREAMER_PBUTILS_INCLUDE_DIRS} 9 - ${Qt5Quick_INCLUDE_DIRS} 10 - ${Qt5Quick_PRIVATE_INCLUDE_DIRS} 11 - ${SQLITE_INCLUDE_DIR} 12 -
-342
pkgs/development/libraries/qt-5/5.14/srcs.nix
··· 1 - # DO NOT EDIT! This file is generated automatically. 2 - # Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/5.14 3 - { fetchurl, mirror }: 4 - 5 - { 6 - qt3d = { 7 - version = "5.14.2"; 8 - src = fetchurl { 9 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qt3d-everywhere-src-5.14.2.tar.xz"; 10 - sha256 = "9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674"; 11 - name = "qt3d-everywhere-src-5.14.2.tar.xz"; 12 - }; 13 - }; 14 - qtactiveqt = { 15 - version = "5.14.2"; 16 - src = fetchurl { 17 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtactiveqt-everywhere-src-5.14.2.tar.xz"; 18 - sha256 = "b53517d5d128719773a2941ba52da10acd7aa3149948862bc08c98f5b64152a9"; 19 - name = "qtactiveqt-everywhere-src-5.14.2.tar.xz"; 20 - }; 21 - }; 22 - qtandroidextras = { 23 - version = "5.14.2"; 24 - src = fetchurl { 25 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtandroidextras-everywhere-src-5.14.2.tar.xz"; 26 - sha256 = "4a8fd92b5c49a663cf0bd492804eaf1574d11137e2cbdd41d6bf5fad0c3c4d76"; 27 - name = "qtandroidextras-everywhere-src-5.14.2.tar.xz"; 28 - }; 29 - }; 30 - qtbase = { 31 - version = "5.14.2"; 32 - src = fetchurl { 33 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz"; 34 - sha256 = "48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a"; 35 - name = "qtbase-everywhere-src-5.14.2.tar.xz"; 36 - }; 37 - }; 38 - qtcharts = { 39 - version = "5.14.2"; 40 - src = fetchurl { 41 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtcharts-everywhere-src-5.14.2.tar.xz"; 42 - sha256 = "adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7"; 43 - name = "qtcharts-everywhere-src-5.14.2.tar.xz"; 44 - }; 45 - }; 46 - qtconnectivity = { 47 - version = "5.14.2"; 48 - src = fetchurl { 49 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtconnectivity-everywhere-src-5.14.2.tar.xz"; 50 - sha256 = "abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28"; 51 - name = "qtconnectivity-everywhere-src-5.14.2.tar.xz"; 52 - }; 53 - }; 54 - qtdatavis3d = { 55 - version = "5.14.2"; 56 - src = fetchurl { 57 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtdatavis3d-everywhere-src-5.14.2.tar.xz"; 58 - sha256 = "723c03db2d2805b1be4ca534ac7bc867a1a21894d33a7e9261a382f3fa9d0e20"; 59 - name = "qtdatavis3d-everywhere-src-5.14.2.tar.xz"; 60 - }; 61 - }; 62 - qtdeclarative = { 63 - version = "5.14.2"; 64 - src = fetchurl { 65 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtdeclarative-everywhere-src-5.14.2.tar.xz"; 66 - sha256 = "a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650"; 67 - name = "qtdeclarative-everywhere-src-5.14.2.tar.xz"; 68 - }; 69 - }; 70 - qtdoc = { 71 - version = "5.14.2"; 72 - src = fetchurl { 73 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtdoc-everywhere-src-5.14.2.tar.xz"; 74 - sha256 = "5a55cdb55af35eb222d06179567851c175f24a3732f7dee5be073df4a893172b"; 75 - name = "qtdoc-everywhere-src-5.14.2.tar.xz"; 76 - }; 77 - }; 78 - qtgamepad = { 79 - version = "5.14.2"; 80 - src = fetchurl { 81 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtgamepad-everywhere-src-5.14.2.tar.xz"; 82 - sha256 = "f77daadb4755cf760e11812264259fb103396fd1b06df1e06b5df162081c8d03"; 83 - name = "qtgamepad-everywhere-src-5.14.2.tar.xz"; 84 - }; 85 - }; 86 - qtgraphicaleffects = { 87 - version = "5.14.2"; 88 - src = fetchurl { 89 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; 90 - sha256 = "487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f"; 91 - name = "qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; 92 - }; 93 - }; 94 - qtimageformats = { 95 - version = "5.14.2"; 96 - src = fetchurl { 97 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtimageformats-everywhere-src-5.14.2.tar.xz"; 98 - sha256 = "733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c"; 99 - name = "qtimageformats-everywhere-src-5.14.2.tar.xz"; 100 - }; 101 - }; 102 - qtlocation = { 103 - version = "5.14.2"; 104 - src = fetchurl { 105 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtlocation-everywhere-src-5.14.2.tar.xz"; 106 - sha256 = "c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc"; 107 - name = "qtlocation-everywhere-src-5.14.2.tar.xz"; 108 - }; 109 - }; 110 - qtlottie = { 111 - version = "5.14.2"; 112 - src = fetchurl { 113 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtlottie-everywhere-src-5.14.2.tar.xz"; 114 - sha256 = "55d1392dc92cbec11263084360075dc5fc3fdc25c1969adfbdec84299b285978"; 115 - name = "qtlottie-everywhere-src-5.14.2.tar.xz"; 116 - }; 117 - }; 118 - qtmacextras = { 119 - version = "5.14.2"; 120 - src = fetchurl { 121 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtmacextras-everywhere-src-5.14.2.tar.xz"; 122 - sha256 = "d12587b46c84a7822194fc3ccf46f7c18ff3b31566d3dde4f5fe772f1d8776e5"; 123 - name = "qtmacextras-everywhere-src-5.14.2.tar.xz"; 124 - }; 125 - }; 126 - qtmultimedia = { 127 - version = "5.14.2"; 128 - src = fetchurl { 129 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtmultimedia-everywhere-src-5.14.2.tar.xz"; 130 - sha256 = "7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9"; 131 - name = "qtmultimedia-everywhere-src-5.14.2.tar.xz"; 132 - }; 133 - }; 134 - qtnetworkauth = { 135 - version = "5.14.2"; 136 - src = fetchurl { 137 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtnetworkauth-everywhere-src-5.14.2.tar.xz"; 138 - sha256 = "4f00513dd18598487d02187b80b54c669662cf8a8f2573858c7f9282d7b9265e"; 139 - name = "qtnetworkauth-everywhere-src-5.14.2.tar.xz"; 140 - }; 141 - }; 142 - qtpurchasing = { 143 - version = "5.14.2"; 144 - src = fetchurl { 145 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtpurchasing-everywhere-src-5.14.2.tar.xz"; 146 - sha256 = "69b087001e8fcec5bb49ca333d5f44e6b7eb09f76421dc792fc9cd76dee9e851"; 147 - name = "qtpurchasing-everywhere-src-5.14.2.tar.xz"; 148 - }; 149 - }; 150 - qtquick3d = { 151 - version = "5.14.2"; 152 - src = fetchurl { 153 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquick3d-everywhere-src-5.14.2.tar.xz"; 154 - sha256 = "0640696d501f2b0bf57f64e98f30bfa3e1cc19c11c0e05e43d4fdb0d20488b2e"; 155 - name = "qtquick3d-everywhere-src-5.14.2.tar.xz"; 156 - }; 157 - }; 158 - qtquickcontrols = { 159 - version = "5.14.2"; 160 - src = fetchurl { 161 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquickcontrols-everywhere-src-5.14.2.tar.xz"; 162 - sha256 = "d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461"; 163 - name = "qtquickcontrols-everywhere-src-5.14.2.tar.xz"; 164 - }; 165 - }; 166 - qtquickcontrols2 = { 167 - version = "5.14.2"; 168 - src = fetchurl { 169 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; 170 - sha256 = "faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560"; 171 - name = "qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; 172 - }; 173 - }; 174 - qtquicktimeline = { 175 - version = "5.14.2"; 176 - src = fetchurl { 177 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtquicktimeline-everywhere-src-5.14.2.tar.xz"; 178 - sha256 = "83a45d0998cbc77f8094854a477ab1ac0838ae7fd822563d995df40149893a9e"; 179 - name = "qtquicktimeline-everywhere-src-5.14.2.tar.xz"; 180 - }; 181 - }; 182 - qtremoteobjects = { 183 - version = "5.14.2"; 184 - src = fetchurl { 185 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtremoteobjects-everywhere-src-5.14.2.tar.xz"; 186 - sha256 = "a6a601c4f4aab6fe41a462dae57033819f697e3317240a382cee45c08be614d6"; 187 - name = "qtremoteobjects-everywhere-src-5.14.2.tar.xz"; 188 - }; 189 - }; 190 - qtscript = { 191 - version = "5.14.2"; 192 - src = fetchurl { 193 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtscript-everywhere-src-5.14.2.tar.xz"; 194 - sha256 = "e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe"; 195 - name = "qtscript-everywhere-src-5.14.2.tar.xz"; 196 - }; 197 - }; 198 - qtscxml = { 199 - version = "5.14.2"; 200 - src = fetchurl { 201 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtscxml-everywhere-src-5.14.2.tar.xz"; 202 - sha256 = "030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790"; 203 - name = "qtscxml-everywhere-src-5.14.2.tar.xz"; 204 - }; 205 - }; 206 - qtsensors = { 207 - version = "5.14.2"; 208 - src = fetchurl { 209 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtsensors-everywhere-src-5.14.2.tar.xz"; 210 - sha256 = "bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61"; 211 - name = "qtsensors-everywhere-src-5.14.2.tar.xz"; 212 - }; 213 - }; 214 - qtserialbus = { 215 - version = "5.14.2"; 216 - src = fetchurl { 217 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtserialbus-everywhere-src-5.14.2.tar.xz"; 218 - sha256 = "0b7762175a649a40c4dd619c5de61d772235dc86099343278e2c3229d0836a91"; 219 - name = "qtserialbus-everywhere-src-5.14.2.tar.xz"; 220 - }; 221 - }; 222 - qtserialport = { 223 - version = "5.14.2"; 224 - src = fetchurl { 225 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtserialport-everywhere-src-5.14.2.tar.xz"; 226 - sha256 = "a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21"; 227 - name = "qtserialport-everywhere-src-5.14.2.tar.xz"; 228 - }; 229 - }; 230 - qtspeech = { 231 - version = "5.14.2"; 232 - src = fetchurl { 233 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtspeech-everywhere-src-5.14.2.tar.xz"; 234 - sha256 = "5e9e8ea62f0207ba894df1e136df0af9fc5443c7817d28c39f0ea2bbae9ec6da"; 235 - name = "qtspeech-everywhere-src-5.14.2.tar.xz"; 236 - }; 237 - }; 238 - qtsvg = { 239 - version = "5.14.2"; 240 - src = fetchurl { 241 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtsvg-everywhere-src-5.14.2.tar.xz"; 242 - sha256 = "c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1"; 243 - name = "qtsvg-everywhere-src-5.14.2.tar.xz"; 244 - }; 245 - }; 246 - qttools = { 247 - version = "5.14.2"; 248 - src = fetchurl { 249 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qttools-everywhere-src-5.14.2.tar.xz"; 250 - sha256 = "5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5"; 251 - name = "qttools-everywhere-src-5.14.2.tar.xz"; 252 - }; 253 - }; 254 - qttranslations = { 255 - version = "5.14.2"; 256 - src = fetchurl { 257 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qttranslations-everywhere-src-5.14.2.tar.xz"; 258 - sha256 = "2088ebee9f5dd0336c9fd11436899a95b7ce0141ce072290de1e8f315d82d1a6"; 259 - name = "qttranslations-everywhere-src-5.14.2.tar.xz"; 260 - }; 261 - }; 262 - qtvirtualkeyboard = { 263 - version = "5.14.2"; 264 - src = fetchurl { 265 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; 266 - sha256 = "364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7"; 267 - name = "qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; 268 - }; 269 - }; 270 - qtwayland = { 271 - version = "5.14.2"; 272 - src = fetchurl { 273 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwayland-everywhere-src-5.14.2.tar.xz"; 274 - sha256 = "d31633ca718fb407cf70870613d45d0ed80aa04c058586ac3036bae1aff7832a"; 275 - name = "qtwayland-everywhere-src-5.14.2.tar.xz"; 276 - }; 277 - }; 278 - qtwebchannel = { 279 - version = "5.14.2"; 280 - src = fetchurl { 281 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebchannel-everywhere-src-5.14.2.tar.xz"; 282 - sha256 = "7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874"; 283 - name = "qtwebchannel-everywhere-src-5.14.2.tar.xz"; 284 - }; 285 - }; 286 - qtwebengine = { 287 - version = "5.14.2"; 288 - src = fetchurl { 289 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebengine-everywhere-src-5.14.2.tar.xz"; 290 - sha256 = "e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947"; 291 - name = "qtwebengine-everywhere-src-5.14.2.tar.xz"; 292 - }; 293 - }; 294 - qtwebglplugin = { 295 - version = "5.14.2"; 296 - src = fetchurl { 297 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebglplugin-everywhere-src-5.14.2.tar.xz"; 298 - sha256 = "eb4118910b65d03d8448658ac1646e860d337e59b82d6575beda21824e313417"; 299 - name = "qtwebglplugin-everywhere-src-5.14.2.tar.xz"; 300 - }; 301 - }; 302 - qtwebsockets = { 303 - version = "5.14.2"; 304 - src = fetchurl { 305 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebsockets-everywhere-src-5.14.2.tar.xz"; 306 - sha256 = "f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84"; 307 - name = "qtwebsockets-everywhere-src-5.14.2.tar.xz"; 308 - }; 309 - }; 310 - qtwebview = { 311 - version = "5.14.2"; 312 - src = fetchurl { 313 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwebview-everywhere-src-5.14.2.tar.xz"; 314 - sha256 = "c61f9213ee84fd7408898c0194468208ffb51af9d257e87e6b53daf24f65ff4b"; 315 - name = "qtwebview-everywhere-src-5.14.2.tar.xz"; 316 - }; 317 - }; 318 - qtwinextras = { 319 - version = "5.14.2"; 320 - src = fetchurl { 321 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtwinextras-everywhere-src-5.14.2.tar.xz"; 322 - sha256 = "980f1bc31b37c8597c0bac55f69ecf00d1677218ce82f7bc3933236cb6d907f2"; 323 - name = "qtwinextras-everywhere-src-5.14.2.tar.xz"; 324 - }; 325 - }; 326 - qtx11extras = { 327 - version = "5.14.2"; 328 - src = fetchurl { 329 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtx11extras-everywhere-src-5.14.2.tar.xz"; 330 - sha256 = "be9a84a03a2ee81771215264e5dff7a996d04be6192b8cdaa1d41e319a81545a"; 331 - name = "qtx11extras-everywhere-src-5.14.2.tar.xz"; 332 - }; 333 - }; 334 - qtxmlpatterns = { 335 - version = "5.14.2"; 336 - src = fetchurl { 337 - url = "${mirror}/archive/qt/5.14/5.14.2/submodules/qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; 338 - sha256 = "219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7"; 339 - name = "qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; 340 - }; 341 - }; 342 - }
+6
pkgs/top-level/aliases.nix
··· 792 792 librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24 793 793 librewolf-wayland = librewolf; # Added 2022-11-15 794 794 libseat = seatd; # Added 2021-06-24 795 + libsForQt512 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24 796 + libsForQt514 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24 797 + libsForQt515 = libsForQt5; # Added 2022-11-24 795 798 libspotify = throw "libspotify has been removed because Spotify stopped supporting it"; # added 2022-05-29 796 799 libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used"; # Added 2020-06-22 797 800 libsysfs = throw "'libsysfs' has been renamed to/replaced by 'sysfsutils'"; # Converted to throw 2022-02-22 ··· 1269 1266 qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-02 1270 1267 qshowdiff = throw "'qshowdiff' (Qt4) is unmaintained and not been updated since its addition in 2010"; # Added 2022-06-14 1271 1268 qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-15 1269 + qt512 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24 1270 + qt514 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24 1271 + qt515 = qt5; # Added 2022-11-24 1272 1272 qt5ct = libsForQt5.qt5ct; # Added 2021-12-27 1273 1273 qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 1274 1274 qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04
+16 -57
pkgs/top-level/all-packages.nix
··· 1431 1431 1432 1432 q = callPackage ../tools/networking/q {}; 1433 1433 1434 - qFlipper = libsForQt515.callPackage ../tools/misc/qflipper { }; 1434 + qFlipper = libsForQt5.callPackage ../tools/misc/qflipper { }; 1435 1435 1436 1436 quich = callPackage ../tools/misc/quich { } ; 1437 1437 ··· 3734 3734 3735 3735 traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { }; 3736 3736 3737 - calamares = libsForQt515.callPackage ../tools/misc/calamares { 3737 + calamares = libsForQt5.callPackage ../tools/misc/calamares { 3738 3738 python = python3; 3739 3739 boost = boost.override { enablePython = true; python = python3; }; 3740 3740 }; ··· 12066 12066 12067 12067 ted = callPackage ../tools/typesetting/ted { }; 12068 12068 12069 - teamviewer = libsForQt515.callPackage ../applications/networking/remote/teamviewer { }; 12069 + teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; 12070 12070 12071 12071 teip = callPackage ../tools/text/teip { }; 12072 12072 ··· 17784 17784 17785 17785 rizin = pkgs.callPackage ../development/tools/analysis/rizin { }; 17786 17786 17787 - cutter = libsForQt515.callPackage ../development/tools/analysis/rizin/cutter.nix { }; 17787 + cutter = libsForQt5.callPackage ../development/tools/analysis/rizin/cutter.nix { }; 17788 17788 17789 17789 ragel = ragelStable; 17790 17790 ··· 22124 22124 developerBuild = true; 22125 22125 }; 22126 22126 22127 - qt512 = recurseIntoAttrs (makeOverridable 22128 - (import ../development/libraries/qt-5/5.12) { 22129 - inherit newScope; 22130 - inherit lib fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; 22131 - inherit bison cups dconf harfbuzz libGL perl gtk3 python2; 22132 - inherit (gst_all_1) gstreamer gst-plugins-base; 22133 - inherit darwin; 22134 - inherit buildPackages; 22135 - stdenv = if stdenv.cc.isGNU 22136 - then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv) 22137 - else stdenv; 22138 - }); 22139 - 22140 - qt514 = recurseIntoAttrs (makeOverridable 22141 - (import ../development/libraries/qt-5/5.14) { 22142 - inherit newScope; 22143 - inherit lib fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; 22144 - inherit bison cups dconf harfbuzz libGL perl gtk3 python2; 22145 - inherit (gst_all_1) gstreamer gst-plugins-base; 22146 - inherit darwin; 22147 - inherit buildPackages; 22148 - stdenv = if stdenv.cc.isGNU 22149 - then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv) 22150 - else stdenv; 22151 - }); 22152 - 22153 - qt515 = recurseIntoAttrs (makeOverridable 22127 + qt5 = recurseIntoAttrs (makeOverridable 22154 22128 (import ../development/libraries/qt-5/5.15) { 22155 22129 inherit newScope; 22156 22130 inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper; ··· 22134 22160 inherit buildPackages; 22135 22161 }); 22136 22162 22137 - libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix { 22138 - inherit lib pkgs; 22139 - qt5 = qt512; 22163 + libsForQt5 = recurseIntoAttrs (import ./qt5-packages.nix { 22164 + inherit lib pkgs qt5; 22140 22165 }); 22141 - 22142 - libsForQt514 = recurseIntoAttrs (import ./qt5-packages.nix { 22143 - inherit lib pkgs; 22144 - qt5 = qt514; 22145 - }); 22146 - 22147 - libsForQt515 = recurseIntoAttrs (import ./qt5-packages.nix { 22148 - inherit lib pkgs; 22149 - qt5 = qt515; 22150 - }); 22151 - 22152 - qt5 = qt515; 22153 - libsForQt5 = libsForQt515; 22154 22166 22155 22167 # TODO: remove once no package needs this anymore or together with OpenSSL 1.1 22156 22168 qt5_openssl_1_1 = qt5.overrideScope' (_: super: { ··· 22154 22194 }; 22155 22195 22156 22196 # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop 22157 - plasma5Packages = libsForQt515; 22197 + plasma5Packages = libsForQt5; 22158 22198 22159 22199 qtEnv = qt5.env; 22160 22200 qt5Full = qt5.full; ··· 23013 23053 23014 23054 vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; 23015 23055 23016 - vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix { 23056 + vtk_8 = libsForQt5.callPackage ../development/libraries/vtk/8.x.nix { 23017 23057 stdenv = gcc9Stdenv; 23018 23058 inherit (darwin) libobjc; 23019 23059 inherit (darwin.apple_sdk.libs) xpc; ··· 23024 23064 23025 23065 vtk_8_withQt5 = vtk_8.override { enableQt = true; }; 23026 23066 23027 - vtk_9 = libsForQt515.callPackage ../development/libraries/vtk/9.x.nix { 23067 + vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix { 23028 23068 inherit (darwin) libobjc; 23029 23069 inherit (darwin.apple_sdk.libs) xpc; 23030 23070 inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration ··· 27552 27592 27553 27593 milkytracker = callPackage ../applications/audio/milkytracker { }; 27554 27594 27555 - ptcollab = libsForQt515.callPackage ../applications/audio/ptcollab { }; 27595 + ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; 27556 27596 27557 27597 schismtracker = callPackage ../applications/audio/schismtracker { }; 27558 27598 ··· 27939 27979 ffmpeg = ffmpeg-full; 27940 27980 }; 27941 27981 27942 - cpeditor = libsForQt515.callPackage ../applications/editors/cpeditor { }; 27982 + cpeditor = libsForQt5.callPackage ../applications/editors/cpeditor { }; 27943 27983 27944 27984 csa = callPackage ../applications/audio/csa { }; 27945 27985 ··· 29890 29930 29891 29931 kooha = callPackage ../applications/video/kooha { }; 29892 29932 29893 - # Qt 5.15 is not default on mac, tdesktop requires 5.15 (and kotatogram subsequently) 29894 - kotatogram-desktop = libsForQt515.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { 29933 + kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { 29895 29934 inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices CoreText CoreGraphics 29896 29935 CoreMedia OpenGL AudioUnit ApplicationServices Foundation AGL Security SystemConfiguration 29897 29936 Carbon AudioToolbox VideoToolbox VideoDecodeAcceleration AVFoundation CoreAudio CoreVideo ··· 30042 30083 30043 30084 kupfer = callPackage ../applications/misc/kupfer { }; 30044 30085 30045 - kvirc = libsForQt515.callPackage ../applications/networking/irc/kvirc { }; 30086 + kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { }; 30046 30087 30047 30088 lame = callPackage ../development/libraries/lame { }; 30048 30089 ··· 31850 31891 31851 31892 scantailor = callPackage ../applications/graphics/scantailor { }; 31852 31893 31853 - scantailor-advanced = libsForQt515.callPackage ../applications/graphics/scantailor/advanced.nix { }; 31894 + scantailor-advanced = libsForQt5.callPackage ../applications/graphics/scantailor/advanced.nix { }; 31854 31895 31855 31896 sc-im = callPackage ../applications/misc/sc-im { }; 31856 31897 ··· 32031 32072 32032 32073 insync = callPackage ../applications/networking/insync { }; 32033 32074 32034 - insync-v3 = libsForQt515.callPackage ../applications/networking/insync/v3.nix { }; 32075 + insync-v3 = libsForQt5.callPackage ../applications/networking/insync/v3.nix { }; 32035 32076 32036 32077 libstrangle = callPackage ../tools/X11/libstrangle { 32037 32078 stdenv = stdenv_32bit;