Date: Sat, 6 Jan 2018 21:30:33 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458293 - in head: . Mk Mk/Uses accessibility accessibility/qt5-speech biology/ugene/files cad/qelectrotech chinese/gcin-qt5/files comms/qt5-connectivity comms/qt5-sensors comms/qt5-ser... Message-ID: <201801062130.w06LUXDa062927@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sat Jan 6 21:30:31 2018 New Revision: 458293 URL: https://svnweb.freebsd.org/changeset/ports/458293 Log: Update Qt5 ports to 5.9.3. This took quite a lot of time because Qt's own build system underwent several changes in 5.8.0 that took a while to adapt to. And, of course, qt5-webengine is a behemoth that we need to patch like crazy due to its bundling of Chromium. In fact, most of the Chromium patches in qt5-webengine have been imported with no changes from www/chromium@433510 ("www/chromium: update to 56.0.2924.87"). New port: accessibility/qt5-speech Bigger changes to Qt5 ports we had to make: - Qt now allows using a configure.json file to define configuration options and specify configuration checks that can be done when qmake is invoked. However, configure.json checks done in a subdirectory only propagates to subdirectories, and checks elsewhere will fail if all .pro files are being parsed at once (i.e. qmake -recursive), so several ports had to switch to USES=qmake:norecursive along with manual additional qmake invocations in subdirectories in order to work. It's been mentioned in a few places such as Qt's bug tracker that qmake's recursive mode is pretty much deprecated, so we might switch to non-recursive mode by default in the future. - Uses/qmake.mk: Introduce QMAKE_CONFIGURE_ARGS. qmake now accepts arbitrary options such as '-foo' and '-no-bar' at the end of the command-line. They can be specified in QMAKE_CONFIGURE_ARGS. - graphics/qt5-wayland: The port can only be built if graphics/mesa-libs is built with the WAYLAND option, so a corresponding option (off by default) was added to the port. - misc/qt5-doc: Switch to a pre-built documentation tarball. The existing port was not working with Qt 5.9. Instead of trying to fix it, switch to what Gentoo does and fetch a tarball that already contains all documentation so that we do not have to build anything at all. The tarball's name and location in download.qt.io look a bit weird, but it seems to work fine. - www/qt5-webengine: Use binutils from ports, Chromium's GN build system generates a build.ninja that uses ar(1) with the @file syntax that is not supported by BSD ar, so we need to use GNU ar from binutils. - x11-toolkits/qt5-declarative-render2d: This port was merged into the main Qt Declarative repository upstream, and into x11-toolkits/qt5-quick in the ports tree. Changes to other ports we had to make: - biology/ugene: Drop a '#define point "."' that is not present in more recent versions of the port. Defining a macro with such a common name causes build issues with Qt 5.9, which uses |point| as an argument name in methods. - cad/qelectrotech: Fix plist with Qt 5.9. Directories are no longer installed with `cp -f -R', but rather `qmake install qinstall', which does not install %%DATADIR%%/elements/10_electric/20_manufacturers_articles/bosch_rexroth/.directory That's a local file that should not even have been part of the tarball anyway. - chinese/gcin-qt5: Add additional private Qt directories (which should not be used in the first place) to get the port to build with Qt 5.9. - devel/qtcreator: Fix plist with Qt 5.9. Something changed in qdoc and some test classes no longer generate documentation files. - security/keepassx-devel: Import a patch sent upstream almost a year ago to fix the build with Qt 5.9. Thanks to antoine for the exp-run, and tcberner and Laurent Cimon <laurent@nuxi.ca> for landing changes in our qt-5.9 branch. PR: 224849 Added: head/accessibility/qt5-speech/ head/accessibility/qt5-speech/Makefile (contents, props changed) head/accessibility/qt5-speech/pkg-plist (contents, props changed) head/biology/ugene/files/patch-src_plugins__3rdparty_phylip_src_phylip.h (contents, props changed) head/devel/qt5-location/files/ head/devel/qt5-location/files/patch-src_plugins_geoservices_geoservices.pro (contents, props changed) head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf (contents, props changed) head/lang/qt5-qml/files/patch-configure.json (contents, props changed) head/misc/qt5-examples/distinfo (contents, props changed) head/security/keepassx-devel/files/ head/security/keepassx-devel/files/patch-PR202 (contents, props changed) head/www/qt5-webengine/files/extra-patch-10 (contents, props changed) head/www/qt5-webengine/files/patch-clang (contents, props changed) head/www/qt5-webengine/files/patch-config.tests-enable-on-FreeBSD (contents, props changed) head/www/qt5-webengine/files/patch-mkspecs_features_configure.prf (contents, props changed) head/www/qt5-webengine/files/patch-mkspecs_features_functions.prf (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base__trace_event__process_memory_dump.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_allocator__shim__default__dispatch__to__glibc.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_allocator__shim__override__libc__symbols.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_allocator__shim__unittest.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_proc__maps__linux.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_thread__heap__usage__tracker.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__unittest.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__util.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_native__library__posix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket__linux__unittest.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_internal__linux.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_memory.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_memory__unittest.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__freebsd.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__info__linux.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__freebsd.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__unittest.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_sys__info__freebsd.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_sys__info__posix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_test_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_third__party_libevent_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_breakpad_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_allocator.gni (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_clang_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_crypto.gni (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_features.gni (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_linux_gtk2_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_linux_gtk3_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_linux_pkg-config.py (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_sanitizers_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_sanitizers_sanitizers.gni (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_ui.gni (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_linux_libpci_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_secondary_third__party_nss_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_toolchain_get__concurrent__links.py (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_toolchain_linux_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_cc_layers_scrollbar__layer__impl__base.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_cc_trees_property__tree.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_chromium__strings.grd (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_generated__resources.grd (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_resources_locale__settings.grd (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_input__ime_input__ime__api.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_messaging_message__service.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_music__manager__private_device__id__linux.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_omnibox_omnibox__api.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_safe__browsing_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_safe__browsing_gen__file__type__proto.py (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_libgtkui_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths__internal.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_extensions_api_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_features.gni (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_renderer_pepper_pepper__flash__font__file__host.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_renderer_pepper_pepper__flash__font__file__host.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_test_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chromecast_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chromecast_browser_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chromecast_browser_metrics_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_chromecast_crash_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_autofill_content_renderer_password__form__conversion__utils.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_content__settings_core_browser_website__settings__registry.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_content__settings_core_browser_website__settings__registry.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_cookie__config_cookie__store__util.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_content_app_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_content_browser_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_feedback_anonymizer__tool.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_json__schema_json__schema__validator.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_keyed__service_core_dependency__graph__unittest.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_drive__metrics__provider__linux.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_system__memory__stats__recorder__linux.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_os__crypt.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_import_csv__reader.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_plugins_renderer_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_plugins_renderer_plugin__placeholder.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_policy_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_storage__monitor.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_storage__monitor__freebsd.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_storage__monitor__freebsd.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_update__client_update__query__params.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_regex__set__matcher.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_url__matcher__factory.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_variations_proto_study.proto (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_webcrypto_algorithms_test__helpers.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_app_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_accessibility_browser__accessibility__manager.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_device__sensors_data__fetcher__shared__memory.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_color__picker.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_download_base__file.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__internals__ui.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__internals.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_memory_memory__coordinator__impl.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_memory_memory__monitor.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_ppapi__plugin__process__host.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_tracing_tracing__controller__impl.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host__impl.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_common_sandbox__linux_sandbox__debug__handling__linux.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_common_set__process__title__linux.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_common_set__process__title__linux.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_in__process__gpu__thread.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_child__process__host.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_renderer__preferences.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_media_webrtc_processed__local__audio__source.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_webscrollbarbehavior__impl__aura.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_battery_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_gamepad__provider.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_geolocation_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_geolocation_location__arbitrator.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_hid_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_media__transfer__protocol_media__transfer__protocol__daemon__client.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_media__transfer__protocol_media__transfer__protocol__manager.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_serial_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_serial_serial__io__handler__posix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_time__zone__monitor_time__zone__monitor.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_time__zone__monitor_time__zone__monitor__linux.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__context__unittest.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__device__handle__impl.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__device__handle__impl.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__device__impl.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__error.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_declarative__webrequest_webrequest__action.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__event__router__factory.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_serial_serial__api.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_web__request_form__data__parser.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_image__util.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_stack__frame.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_program__manager.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list__unittest.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__info__collector.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__test__config.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_gles2__conform__support_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_gles2__conform__support_native_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_client_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_tools_compositor__model__bench_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media__audio__alsa__audio_manager_alsa.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__manager.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__manager.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_fake__video__capture__device__factory.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_cast_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_cdm_ppapi_ppapi__cdm__adapter.gni (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__adts.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__mpeg1audio.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_edk_test_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_native__client__sdk_src_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux__unittest.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_mime__util__unittest.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__interfaces__linux.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix__unittest.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_http_http__network__session.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_proxy_proxy__config__service__linux.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_proxy_proxy__service.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_socks5__client__socket.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_tools_get__server__time_get__server__time.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_proxy_file__io__resource.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_tests_extensions_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_cups__config__helper.py (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_remoting_host_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_sdch_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_runner_host_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_standalone_context.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_ui_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_ui_ime_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_ui_public_cpp_gles2__context.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_ui_surfaces_surfaces__context__provider.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_skia_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_skia_ext_SkMemory__new__handler.cpp (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_testing_gtest_src_gtest.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_core_layout_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_FontCache.cpp (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_FontCache.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_FontPlatformData.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_heap_GCInfo.cpp (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_web_PopupMenuImpl.cpp (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_wtf_Assertions.cpp (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_wtf_Atomics.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_wtf_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_wtf_ContainerAnnotations.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_wtf_ThreadingPthreads.cpp (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_gni_angle.gni (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_tests_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_ex__data.c (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_expat_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_ffmpeg__generated.gni (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_fontconfig_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_freetype2_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_glslang_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_harfbuzz-ng_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_leveldatabase_env__chromium.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_libusb_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_libxml_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_libxslt_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_libyuv_include_libyuv_row.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_mesa_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_minigbm_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_opus_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxcrt_fx__system.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_pdfium.gni (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_skia_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_third__party_base_logging.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_sqlite_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_usrsctp_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_base_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_base_httpcommon.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_base_ifaddrs__converter.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_base_ipaddress.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_base_linux.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_base_linux.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_base_network.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_base_network.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_base_physicalsocketserver.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_base_stringutils.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_base_systeminfo.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__device_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_video__coding_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_system__wrappers_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_widevine_cdm_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_yasm_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_tools_battor__agent_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_tools_gn_args.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_tools_gn_bootstrap_bootstrap.py (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_tools_variations_fieldtrial__to__struct.py (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_accessibility_platform_ax__platform__node.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_aura_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_ime__engine__handler__interface.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_input__method__factory.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_input__method__initializer.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__features.gni (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__fallback__linux.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__render__params.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_sync__control__vsync__provider.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_sync__control__vsync__provider.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_message__center_message__center__style.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_message__center_views_message__center__button__bar.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_message__center_views_message__center__button__bar.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_message__center_views_message__view__factory.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_resources_ui__resources.grd (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_accessibility_native__view__accessibility.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_bubble_bubble__dialog__delegate.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_label.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_webview_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_mus_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_selection__controller.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__switches.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_webui_resources_js_cr.js (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_webui_resources_js_icon.js (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_globals.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_log-utils.h (contents, props changed) head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_wasm-result.h (contents, props changed) head/www/qt5-webengine/files/patch-src_buildtools_buildtools.pro (contents, props changed) head/www/qt5-webengine/files/patch-src_buildtools_gn.pro (contents, props changed) head/www/qt5-webengine/files/patch-src_core_api_qtbug-61521.cpp (contents, props changed) head/www/qt5-webengine/files/patch-src_tools_qwebengine__convert__dict_qwebengine__convert__dict.pro (contents, props changed) Deleted: head/devel/qt5-core/files/patch-git_ea9a8672 head/devel/qt5-core/files/patch-git_fa3940cc head/devel/qt5-qmake/files/patch-mkspecs__common__freebsd.conf head/devel/qt5/files/extrapatch-config.tests-unix-compile.test head/devel/qt5/files/extrapatch-config.tests_unix_arch.test head/misc/qt5-doc/files/ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_base.gyp head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_base.gypi head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_tracked__objects.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_common.gypi head/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libusb.gyp head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_download_file__metadata__linux.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_frame__host_render__widget__host__view__guest.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_geolocation_location__arbitrator__impl.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_content__browser.gypi head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_content__common.gypi head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_devtools_v8__sampling__profiler.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_gpu__config.gypi head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_media.gyp head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_net.gypi head/www/qt5-webengine/files/patch-src_3rdparty_chromium_skia_skia__chrome.gypi head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_core_core.gyp head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_blink__platform.gyp head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_web_web.gyp head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_libjingle_libjingle.gyp head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_sfntly_src_cpp_src_sfntly_table_core_cmap__table.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_base_taskrunner.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_build_common.gypi head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_rtp__rtcp_source_rtp__utility.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_video__capture_device__info__impl.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_system__wrappers_source_atomic32__posix.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_system__wrappers_source_condition__variable.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl.gyp head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_crankshaft_lithium.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_crankshaft_lithium.h head/www/qt5-webengine/files/patch-src_core_core__common.pri head/www/qt5-webengine/files/patch-src_core_gyp__run.pro head/www/qt5-webengine/files/patch-src_core_qtwebengine.gypi head/www/qt5-webengine/files/patch-tools-qmake-config.tests-enable-on-FreeBSD head/www/qt5-webengine/files/patch-tools_qmake_mkspecs_features_configure.prf head/www/qt5-webengine/files/patch-tools_qmake_mkspecs_features_functions.prf head/x11-toolkits/qt5-declarative-render2d/ Modified: head/CHANGES head/MOVED head/Mk/Uses/qmake.mk head/Mk/bsd.qt.mk head/accessibility/Makefile head/cad/qelectrotech/Makefile head/cad/qelectrotech/pkg-plist head/chinese/gcin-qt5/files/patch-Makefile head/comms/qt5-connectivity/pkg-plist head/comms/qt5-sensors/Makefile head/comms/qt5-sensors/pkg-plist head/comms/qt5-serialbus/Makefile head/comms/qt5-serialbus/pkg-plist head/databases/qt5-sql/Makefile head/databases/qt5-sql/pkg-plist head/devel/qt5-assistant/Makefile head/devel/qt5-assistant/files/patch-src__src.pro head/devel/qt5-buildtools/Makefile head/devel/qt5-concurrent/Makefile head/devel/qt5-core/Makefile head/devel/qt5-core/files/patch-src_corelib_corelib.pro head/devel/qt5-core/pkg-plist head/devel/qt5-dbus/Makefile head/devel/qt5-dbus/pkg-plist head/devel/qt5-designer/Makefile head/devel/qt5-designer/files/patch-src__src.pro head/devel/qt5-help/files/patch-src__assistant__assistant.pro head/devel/qt5-help/files/patch-src__src.pro head/devel/qt5-help/pkg-plist head/devel/qt5-linguist/files/patch-src__src.pro head/devel/qt5-linguisttools/files/patch-src__src.pro head/devel/qt5-location/Makefile head/devel/qt5-location/pkg-plist head/devel/qt5-qdbus/files/patch-src_src.pro head/devel/qt5-qdbusviewer/files/patch-src__src.pro head/devel/qt5-qdoc/files/patch-src_src.pro head/devel/qt5-qmake/Makefile head/devel/qt5-qmake/files/patch-configure head/devel/qt5-qmake/pkg-plist head/devel/qt5-script/Makefile head/devel/qt5-scxml/pkg-plist head/devel/qt5-testlib/Makefile head/devel/qt5-testlib/pkg-plist head/devel/qt5-uitools/files/patch-src__src.pro head/devel/qt5/Makefile.sqldrivers head/devel/qt5/distinfo head/devel/qt5/files/extrapatch-configure head/devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf head/devel/qtcreator/Makefile head/devel/qtcreator/pkg-plist head/graphics/qt5-3d/Makefile head/graphics/qt5-3d/pkg-plist head/graphics/qt5-graphicaleffects/pkg-plist head/graphics/qt5-imageformats/Makefile head/graphics/qt5-imageformats/pkg-plist head/graphics/qt5-opengl/Makefile head/graphics/qt5-opengl/pkg-plist head/graphics/qt5-pixeltool/files/patch-src__src.pro head/graphics/qt5-svg/pkg-plist head/graphics/qt5-wayland/Makefile head/graphics/qt5-wayland/files/patch-qtwayland.pro head/graphics/qt5-wayland/pkg-plist head/lang/qt5-qml/Makefile head/lang/qt5-qml/files/patch-src__src.pro head/lang/qt5-qml/pkg-plist head/misc/qt5-doc/Makefile head/misc/qt5-doc/distinfo head/misc/qt5-doc/pkg-plist head/misc/qt5-examples/Makefile head/misc/qt5-examples/pkg-plist head/misc/qt5-l10n/pkg-plist head/multimedia/qt5-multimedia/Makefile head/multimedia/qt5-multimedia/pkg-plist head/net/qt5-network/Makefile head/net/qt5-network/pkg-plist head/print/qt5-printsupport/Makefile head/print/qt5-printsupport/pkg-plist head/textproc/qt5-xml/Makefile head/textproc/qt5-xml/pkg-plist head/textproc/qt5-xmlpatterns/Makefile head/textproc/qt5-xmlpatterns/pkg-plist head/www/qt5-webchannel/Makefile head/www/qt5-webengine/Makefile head/www/qt5-webengine/files/freebsd.pri head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket__linux.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_memory__stubs.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_trace__event_process__memory__dump.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__child__thread.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_crypto_nss__util.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__context.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__service__impl.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__service__impl.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_file__video__capture__device__factory.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__linux.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__factory.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_filters_vp9__parser.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__interfaces__posix.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_address__sorter__posix.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_shared__impl_private_net__address__private__impl.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_wtf_ByteSwap.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_mem.c head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_ots_include_opentype-sanitiser.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_base_platform__thread.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_voice__engine_voice__engine__defines.h head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.h head/www/qt5-webengine/files/patch-src_core_core__module.pro head/www/qt5-webengine/pkg-plist head/www/qt5-websockets-qml/files/patch-src_src.pro head/www/qt5-websockets/Makefile head/www/qt5-websockets/files/patch-src_src.pro head/www/qt5-websockets/pkg-plist head/x11-toolkits/Makefile head/x11-toolkits/qt5-charts/pkg-plist head/x11-toolkits/qt5-gamepad/Makefile head/x11-toolkits/qt5-gamepad/pkg-plist head/x11-toolkits/qt5-gui/Makefile head/x11-toolkits/qt5-gui/pkg-plist head/x11-toolkits/qt5-quick/Makefile head/x11-toolkits/qt5-quick/pkg-plist head/x11-toolkits/qt5-quickcontrols/pkg-plist head/x11-toolkits/qt5-quickcontrols2/Makefile head/x11-toolkits/qt5-quickcontrols2/pkg-plist head/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro head/x11-toolkits/qt5-widgets/Makefile head/x11-toolkits/qt5-widgets/pkg-plist Modified: head/CHANGES ============================================================================== --- head/CHANGES Sat Jan 6 21:22:10 2018 (r458292) +++ head/CHANGES Sat Jan 6 21:30:31 2018 (r458293) @@ -10,6 +10,20 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. +20180106: +AUTHOR: kde@FreeBSD.org + + USES=qmake now accepts a new variable, QMAKE_CONFIGURE_ARGS. + + Starting with Qt 5.8.0, qmake can use configure.json files to help define + configuration options and configuration time checks. These options are + generally in the form '-foo -no-bar', and must be passed after "--" at the + end of qmake's command line. + + The QMAKE_CONFIGURE_ARGS variable allows one to set those options, and + USES=qmake takes care of passing them at the right position when invoking + qmake. + 20180102: AUTHOR: kde@FreeBSD.org Modified: head/MOVED ============================================================================== --- head/MOVED Sat Jan 6 21:22:10 2018 (r458292) +++ head/MOVED Sat Jan 6 21:30:31 2018 (r458293) @@ -9843,3 +9843,4 @@ audio/beast||2018-01-05|Has expired: 4.5 years old ver devel/p5-MooseX-Role-WithOverloading||2018-01-06|Has expired: deprecated by upstream (obsolete with modern Moose) devel/p5-Test-Block||2018-01-06|Has expired: Marked as deprecated upstream sysutils/socket||2018-01-06|Has expired: Out of date +x11-toolkits/qt5-declarative-render2d/||2018-01-06|Merged into x11-toolkits/qt5-quick Modified: head/Mk/Uses/qmake.mk ============================================================================== --- head/Mk/Uses/qmake.mk Sat Jan 6 21:22:10 2018 (r458292) +++ head/Mk/Uses/qmake.mk Sat Jan 6 21:30:31 2018 (r458293) @@ -16,6 +16,11 @@ # Default: ${CONFIGURE_ENV} # QMAKE_ARGS - Arguments passed to qmake. # Default: see below +# QMAKE_CONFIGURE_ARGS - Extra arguments passed to qmake after everything +# else, such as "-foo -no-bar". The arguments are usually +# set in configure.json. This variable is specific to +# qmake from Qt 5. +# Default: empty # QMAKE_SOURCE_PATH - Path to qmake project files. # Default: ${WRKSRC} if out-of-source build is # requested, empty otherwise. @@ -105,7 +110,9 @@ DESTDIRNAME= INSTALL_ROOT qmake-configure: @${MKDIR} ${_QMAKE_WRKSRC} @cd ${_QMAKE_WRKSRC} && \ - ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH} + ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} \ + ${QMAKE_SOURCE_PATH} \ + ${QMAKE_CONFIGURE_ARGS:?--:} ${QMAKE_CONFIGURE_ARGS} .if !target(do-configure) && ! ${qmake_ARGS:M_env} _USES_configure+= 450:qmake-configure Modified: head/Mk/bsd.qt.mk ============================================================================== --- head/Mk/bsd.qt.mk Sat Jan 6 21:22:10 2018 (r458292) +++ head/Mk/bsd.qt.mk Sat Jan 6 21:30:31 2018 (r458293) @@ -27,7 +27,7 @@ Qt_Pre_Include= bsd.qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 4 5 QT4_VERSION?= 4.8.7 -QT5_VERSION?= 5.7.1 +QT5_VERSION?= 5.9.3 _QT_RELNAME= qt${_QT_VERSION:R:R} _QT_VERSION= # empty @@ -88,23 +88,19 @@ LDFLAGS+= -Wl,--as-needed # Ensure that the "makesum" target (with its inner "fetch" one) uses # devel/qt*/distinfo for every port. . if ${DISTINFO_FILE:H} == ${.CURDIR:H:H}/devel/${_QT_RELNAME} -QT_DIST= 3d base canvas3d charts connectivity datavis3d declarative \ - declarative-render2d gamepad graphicaleffects imageformats \ - location multimedia quickcontrols quickcontrols2 script scxml \ - sensors serialbus serialport svg tools translations \ - virtualkeyboard wayland webchannel webengine \ - websockets x11extras xmlpatterns +QT_DIST= 3d activeqt androidextras base canvas3d charts connectivity \ + datavis3d declarative doc gamepad graphicaleffects imageformats \ + location macextras multimedia networkauth purchasing \ + quickcontrols2 quickcontrols remoteobjects script scxml sensors \ + serialbus serialport speech svg tools translations \ + virtualkeyboard wayland webchannel webengine websockets webview \ + winextras x11extras xmlpatterns . endif . endif . if ${QT_DIST} == "base" && ${PORTNAME} != "qmake" # Qt configure requires pkg-config to detect dependencies. USES+= pkgconfig - -# Set QMAKESPEC when building qtbase so that qmake (called by the configure -# script) can find the mkspecs we create ourselves in devel/qmake5. -CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" -MAKE_ENV+= QMAKESPEC="${QMAKESPEC}" . endif # -nomake is only used by qtbase's configure script. @@ -117,7 +113,6 @@ EXTRACT_AFTER_ARGS?= ${DISTNAME:S,$,/examples,:S,^,--e CONFIGURE_ENV+= MAKE="${MAKE:T}" CONFIGURE_ARGS+=-opensource -confirm-license \ - -platform ${QMAKESPEC} \ -no-pch \ -prefix ${PREFIX} \ -bindir ${PREFIX}/${QT_BINDIR_REL} \ @@ -132,6 +127,7 @@ CONFIGURE_ARGS+=-opensource -confirm-license \ . if ${_QT_VERSION:M4*} CONFIGURE_ARGS+=-fast \ + -platform ${QMAKESPEC} \ -system-libjpeg -system-libpng \ -system-libmng -system-libtiff -system-zlib \ -no-phonon-backend \ @@ -139,6 +135,7 @@ CONFIGURE_ARGS+=-fast \ -demosdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/demos . else CONFIGURE_ARGS+=-nomake examples -nomake tests \ + -platform ${QMAKESPEC:T} \ -archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \ -libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \ -qmldir ${PREFIX}/${QT_QMLDIR_REL} \ @@ -150,6 +147,9 @@ CONFIGURE_ARGS+=-no-sse2 # Work around a bug in current binutils, where the gold linker creates # duplicate symbols. See pr 218187. Disable the gold-linker for Qt5 ports. CONFIGURE_ARGS+= -no-use-gold-linker +# Pass -recheck-all so that multiple calls to the configure script really +# re-run all checks. +CONFIGURE_ARGS+= -recheck-all . endif . if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG) @@ -174,16 +174,16 @@ CONFIGURE_ARGS+=-verbose . if ${QT_DIST} == "base" || ${_QT_VERSION:M4*} . if ${_QT_VERSION:M4*} _EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h \ - ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool \ + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test # Patch in proper name for armv6 architecture: https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html _EXTRA_PATCHES_QT4+= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-armv6 . else _EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \ - ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests_unix_arch.test + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf . endif EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \ - ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \ ${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5} . endif @@ -287,6 +287,11 @@ PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}" CONFIGURE_ENV+= QT_SELECT=${_QT_RELNAME} MAKE_ENV+= QT_SELECT=${_QT_RELNAME} +# Make sure both the installed mkspecs as well as the ones being built are +# found, with the ones from the port being built having preference. +CONFIGURE_ENV+= QMAKEMODULES="${WRKSRC}/mkspecs/modules:${LOCALBASE}/${QT_MKSPECDIR_REL}/modules" +MAKE_ENV+= QMAKEMODULES="${WRKSRC}/mkspecs/modules:${LOCALBASE}/${QT_MKSPECDIR_REL}/modules" + .endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include) .if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include) @@ -317,10 +322,10 @@ _USE_QT4_ONLY= accessible assistant-adp assistantclien qtestlib qvfb rcc uic uic3 xmlpatterns-tool _USE_QT5_ONLY= 3d buildtools canvas3d charts concurrent connectivity \ - core datavis3d declarative-render2d diag examples gamepad \ + core datavis3d diag examples gamepad \ graphicaleffects location paths phonon4 plugininfo printsupport \ qdbus qdoc qdoc-data qev qml quick quickcontrols \ - quickcontrols2 scxml sensors serialbus serialport \ + quickcontrols2 scxml sensors serialbus serialport speech \ sql-tds uiplugin uitools virtualkeyboard wayland webchannel \ webengine websockets websockets-qml widgets x11extras @@ -384,9 +389,6 @@ dbus_LIB= libQt${_QT_LIBVER}DBus.so declarative_PORT= x11-toolkits/${_QT_RELNAME}-declarative declarative_LIB= libQt${_QT_LIBVER}Declarative.so -declarative-render2d_PORT= x11-toolkits/${_QT_RELNAME}-declarative-render2d -declarative-render2d_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/scenegraph/libsoftwarecontext.so - demo_PORT= misc/${_QT_RELNAME}-qtdemo demo_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtdemo @@ -549,6 +551,9 @@ serialbus_LIB= libQt${_QT_LIBVER}SerialBus.so serialport_PORT= comms/${_QT_RELNAME}-serialport serialport_LIB= libQt${_QT_LIBVER}SerialPort.so +speech_PORT= accessibility/${_QT_RELNAME}-speech +speech_LIB= libQt${_QT_LIBVER}TextToSpeech.so + sql_PORT= databases/${_QT_RELNAME}-sql sql_LIB= libQt${_QT_LIBVER}Sql.so @@ -727,8 +732,6 @@ qtbase-post-patch: . if ${PORTNAME} != "qmake" _QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake - -post-configure: qmake-configure . endif . endif # ${QT_DIST} == "base" Modified: head/accessibility/Makefile ============================================================================== --- head/accessibility/Makefile Sat Jan 6 21:22:10 2018 (r458292) +++ head/accessibility/Makefile Sat Jan 6 21:30:31 2018 (r458293) @@ -25,6 +25,7 @@ SUBDIR += py-papi SUBDIR += py-speech-dispatcher SUBDIR += qt4-accessible + SUBDIR += qt5-speech SUBDIR += redshift SUBDIR += rubygem-atk SUBDIR += speech-dispatcher Added: head/accessibility/qt5-speech/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/accessibility/qt5-speech/Makefile Sat Jan 6 21:30:31 2018 (r458293) @@ -0,0 +1,17 @@ +# $FreeBSD$ + +PORTNAME= speech +DISTVERSION= ${QT5_VERSION} +CATEGORIES= accessibility +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Accessibilty features for Qt5 + +LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher + +USES= pkgconfig qmake:outsource +USE_QT5= core gui buildtools_build qmake_build +QT_DIST= ${PORTNAME} + +.include <bsd.port.mk> Added: head/accessibility/qt5-speech/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/accessibility/qt5-speech/pkg-plist Sat Jan 6 21:30:31 2018 (r458293) @@ -0,0 +1,28 @@ +%%QT_INCDIR%%/QtTextToSpeech/%%FULLVER%%/QtTextToSpeech/private/qtexttospeech_p.h +%%QT_INCDIR%%/QtTextToSpeech/%%FULLVER%%/QtTextToSpeech/private/qvoice_p.h +%%QT_INCDIR%%/QtTextToSpeech/QTextToSpeech +%%QT_INCDIR%%/QtTextToSpeech/QTextToSpeechEngine +%%QT_INCDIR%%/QtTextToSpeech/QTextToSpeechPlugin +%%QT_INCDIR%%/QtTextToSpeech/QVoice +%%QT_INCDIR%%/QtTextToSpeech/QtTextToSpeech +%%QT_INCDIR%%/QtTextToSpeech/QtTextToSpeechDepends +%%QT_INCDIR%%/QtTextToSpeech/QtTextToSpeechVersion +%%QT_INCDIR%%/QtTextToSpeech/qtexttospeech.h +%%QT_INCDIR%%/QtTextToSpeech/qtexttospeech_global.h +%%QT_INCDIR%%/QtTextToSpeech/qtexttospeechengine.h +%%QT_INCDIR%%/QtTextToSpeech/qtexttospeechplugin.h +%%QT_INCDIR%%/QtTextToSpeech/qttexttospeechversion.h +%%QT_INCDIR%%/QtTextToSpeech/qvoice.h +%%QT_CMAKEDIR%%/Qt5TextToSpeech/Qt5TextToSpeechConfig.cmake +%%QT_CMAKEDIR%%/Qt5TextToSpeech/Qt5TextToSpeechConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5TextToSpeech/Qt5TextToSpeech_QTextToSpeechPluginSpeechd.cmake +%%QT_LIBDIR%%/libQt5TextToSpeech.prl +%%QT_LIBDIR%%/libQt5TextToSpeech.so +%%QT_LIBDIR%%/libQt5TextToSpeech.so.5 +%%QT_LIBDIR%%/libQt5TextToSpeech.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt5TextToSpeech.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt5TextToSpeech.so.%%FULLVER%%.debug +%%QT_MKSPECDIR%%/modules/qt_lib_texttospeech.pri +%%QT_MKSPECDIR%%/modules/qt_lib_texttospeech_private.pri +%%QT_PLUGINDIR%%/texttospeech/libqtexttospeech_speechd.so +libdata/pkgconfig/Qt5TextToSpeech.pc Added: head/biology/ugene/files/patch-src_plugins__3rdparty_phylip_src_phylip.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/ugene/files/patch-src_plugins__3rdparty_phylip_src_phylip.h Sat Jan 6 21:30:31 2018 (r458293) @@ -0,0 +1,10 @@ +--- src/plugins_3rdparty/phylip/src/phylip.h.orig 2017-12-30 19:54:56 UTC ++++ src/plugins_3rdparty/phylip/src/phylip.h +@@ -271,7 +271,6 @@ MALLOCRETURN *mymalloc(long); + #define MAXNCH 30 /* must be greater than or equal to nmlngth */ + #define maxcategs 9 /* maximum number of site types */ + #define maxcategs2 11 /* maximum number of site types + 2 */ +-#define point "." + #define pointe '.' + #define down 2 + #define MAXSHIMOTREES 100 Modified: head/cad/qelectrotech/Makefile ============================================================================== --- head/cad/qelectrotech/Makefile Sat Jan 6 21:22:10 2018 (r458292) +++ head/cad/qelectrotech/Makefile Sat Jan 6 21:30:31 2018 (r458293) @@ -3,7 +3,7 @@ PORTNAME= qelectrotech PORTVERSION= 0.5 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= cad MASTER_SITES= http://download.tuxfamily.org/qet/tags/20151127/ Modified: head/cad/qelectrotech/pkg-plist ============================================================================== --- head/cad/qelectrotech/pkg-plist Sat Jan 6 21:22:10 2018 (r458292) +++ head/cad/qelectrotech/pkg-plist Sat Jan 6 21:30:31 2018 (r458293) @@ -1025,7 +1025,6 @@ share/mimelnk/application/x-qet-titleblock.desktop %%DATADIR%%/elements/10_electric/20_manufacturers_articles/beka/beka_2806_b_2_0_1_2_01_000.elmt %%DATADIR%%/elements/10_electric/20_manufacturers_articles/beka/beka_2806_b_2_0_1_4_01_000.elmt %%DATADIR%%/elements/10_electric/20_manufacturers_articles/beka/qet_directory -%%DATADIR%%/elements/10_electric/20_manufacturers_articles/bosch_rexroth/.directory %%DATADIR%%/elements/10_electric/20_manufacturers_articles/bosch_rexroth/bosch_rexroth_cdb02.1b-et-ec-ec-nn-s4-s4-nn-nn-fw.elmt %%DATADIR%%/elements/10_electric/20_manufacturers_articles/bosch_rexroth/bosch_rexroth_hmd01.1n-w0036-a-07-nnnn.elmt %%DATADIR%%/elements/10_electric/20_manufacturers_articles/bosch_rexroth/bosch_rexroth_hmv01.1r-w0018-a-07-nnnn.elmt Modified: head/chinese/gcin-qt5/files/patch-Makefile ============================================================================== --- head/chinese/gcin-qt5/files/patch-Makefile Sat Jan 6 21:22:10 2018 (r458292) +++ head/chinese/gcin-qt5/files/patch-Makefile Sat Jan 6 21:30:31 2018 (r458293) @@ -15,8 +15,9 @@ +INCS=-I../im-client -I$(prefix)/include -I$(prefix)/include/qt5 `pkg-config Qt5Core Qt5Gui Qt5DBus --cflags` MODVERSION=`pkg-config --modversion Qt5Gui` QTINC=`pkg-config --variable=includedir Qt5Gui` - INCS+=-I$(QTINC)/QtGui/$(MODVERSION)/QtGui +-INCS+=-I$(QTINC)/QtGui/$(MODVERSION)/QtGui -#INCS+=-I/usr/include/i386-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui ++INCS+=-I$(QTINC)/QtGui/$(MODVERSION) -I$(QTINC)/QtGui/$(MODVERSION)/QtGui -I$(QTINC)/QtCore/$(MODVERSION) -CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC -DQT5 -DQT_SHARED -DQT_IMMODULE -DPIC -DDEBUG="0$(GCIN_DEBUG)" +CXXFLAGS+=$(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC -DQT5 -DQT_SHARED -DQT_IMMODULE -DPIC -DDEBUG="0$(GCIN_DEBUG)" Modified: head/comms/qt5-connectivity/pkg-plist ============================================================================== --- head/comms/qt5-connectivity/pkg-plist Sat Jan 6 21:22:10 2018 (r458292) +++ head/comms/qt5-connectivity/pkg-plist Sat Jan 6 21:30:31 2018 (r458293) @@ -2,6 +2,7 @@ %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/adapter_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/agent_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/androidbroadcastreceiver_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluetoothmanagement_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluez5_helper_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluez_data_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/device1_bluez5_p.h @@ -33,6 +34,7 @@ %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtledeviceinquiry_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtnotifier_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtobexsession_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtperipheralmanager_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtrfcommchannel_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtsdpinquiry_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtservicerecord_p.h @@ -42,7 +44,6 @@ %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/properties_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothaddress_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothdevicediscoveryagent_p.h -%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothdevicediscoverytimer_osx_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothdeviceinfo_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothhostinfo_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothlocaldevice_p.h @@ -61,6 +62,8 @@ %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergyserviceprivate_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qprivatelinearbuffer_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qtbluetooth-config_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/remotedevicemanager_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/serveracceptancethread_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/service_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/servicediscoverybroadcastreceiver_p.h @@ -118,6 +121,7 @@ %%QT_INCDIR%%/QtBluetooth/qlowenergydescriptordata.h %%QT_INCDIR%%/QtBluetooth/qlowenergyservice.h %%QT_INCDIR%%/QtBluetooth/qlowenergyservicedata.h +%%QT_INCDIR%%/QtBluetooth/qtbluetooth-config.h %%QT_INCDIR%%/QtBluetooth/qtbluetoothversion.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/adapter_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/agent_p.h Modified: head/comms/qt5-sensors/Makefile ============================================================================== --- head/comms/qt5-sensors/Makefile Sat Jan 6 21:22:10 2018 (r458292) +++ head/comms/qt5-sensors/Makefile Sat Jan 6 21:30:31 2018 (r458293) @@ -10,7 +10,7 @@ COMMENT= Qt sensors module USE_QT5= core qml quick buildtools_build QT_DIST= ${PORTNAME} -USES= qmake +USES= qmake:norecursive USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} Modified: head/comms/qt5-sensors/pkg-plist ============================================================================== --- head/comms/qt5-sensors/pkg-plist Sat Jan 6 21:22:10 2018 (r458292) +++ head/comms/qt5-sensors/pkg-plist Sat Jan 6 21:30:31 2018 (r458293) @@ -6,7 +6,9 @@ %%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qdistancesensor_p.h %%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qgyroscope_p.h %%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qholstersensor_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qhumiditysensor_p.h %%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qirproximitysensor_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qlidsensor_p.h %%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qlightsensor_p.h %%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qmagnetometer_p.h %%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qorientationsensor_p.h @@ -19,6 +21,7 @@ %%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qsensorgesturemanagerprivate_p.h %%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qtapsensor_p.h %%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qtiltsensor_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qtsensors-config_p.h %%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/sensorlog_p.h %%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/simulatorgesturescommon_p.h %%QT_INCDIR%%/QtSensors/QAccelerometer @@ -45,9 +48,15 @@ %%QT_INCDIR%%/QtSensors/QHolsterFilter %%QT_INCDIR%%/QtSensors/QHolsterReading %%QT_INCDIR%%/QtSensors/QHolsterSensor +%%QT_INCDIR%%/QtSensors/QHumidityFilter +%%QT_INCDIR%%/QtSensors/QHumidityReading +%%QT_INCDIR%%/QtSensors/QHumiditySensor %%QT_INCDIR%%/QtSensors/QIRProximityFilter %%QT_INCDIR%%/QtSensors/QIRProximityReading %%QT_INCDIR%%/QtSensors/QIRProximitySensor +%%QT_INCDIR%%/QtSensors/QLidFilter +%%QT_INCDIR%%/QtSensors/QLidReading +%%QT_INCDIR%%/QtSensors/QLidSensor %%QT_INCDIR%%/QtSensors/QLightFilter %%QT_INCDIR%%/QtSensors/QLightReading %%QT_INCDIR%%/QtSensors/QLightSensor @@ -95,7 +104,9 @@ %%QT_INCDIR%%/QtSensors/qdistancesensor.h %%QT_INCDIR%%/QtSensors/qgyroscope.h %%QT_INCDIR%%/QtSensors/qholstersensor.h +%%QT_INCDIR%%/QtSensors/qhumiditysensor.h %%QT_INCDIR%%/QtSensors/qirproximitysensor.h +%%QT_INCDIR%%/QtSensors/qlidsensor.h %%QT_INCDIR%%/QtSensors/qlightsensor.h %%QT_INCDIR%%/QtSensors/qmagnetometer.h %%QT_INCDIR%%/QtSensors/qorientationsensor.h @@ -113,6 +124,7 @@ %%QT_INCDIR%%/QtSensors/qsensorsglobal.h %%QT_INCDIR%%/QtSensors/qtapsensor.h %%QT_INCDIR%%/QtSensors/qtiltsensor.h +%%QT_INCDIR%%/QtSensors/qtsensors-config.h %%QT_INCDIR%%/QtSensors/qtsensorsversion.h %%QT_CMAKEDIR%%/Qt5Sensors/Qt5SensorsConfig.cmake %%QT_CMAKEDIR%%/Qt5Sensors/Qt5SensorsConfigVersion.cmake Modified: head/comms/qt5-serialbus/Makefile ============================================================================== --- head/comms/qt5-serialbus/Makefile Sat Jan 6 21:22:10 2018 (r458292) +++ head/comms/qt5-serialbus/Makefile Sat Jan 6 21:30:31 2018 (r458293) @@ -2,7 +2,6 @@ PORTNAME= serialbus DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 CATEGORIES= comms PKGNAMEPREFIX= qt5- Modified: head/comms/qt5-serialbus/pkg-plist ============================================================================== --- head/comms/qt5-serialbus/pkg-plist Sat Jan 6 21:22:10 2018 (r458292) +++ head/comms/qt5-serialbus/pkg-plist Sat Jan 6 21:30:31 2018 (r458293) @@ -1,5 +1,6 @@ %%QT_BINDIR%%/canbusutil %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdevice_p.h +%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdeviceinfo_p.h %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbus_symbols_p.h %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbusadu_p.h %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbusclient_p.h @@ -10,9 +11,12 @@ %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbusserver_p.h %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbustcpclient_p.h %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbustcpserver_p.h +%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qtserialbus-config_p.h %%QT_INCDIR%%/QtSerialBus/QCanBus %%QT_INCDIR%%/QtSerialBus/QCanBusDevice +%%QT_INCDIR%%/QtSerialBus/QCanBusDeviceInfo %%QT_INCDIR%%/QtSerialBus/QCanBusFactory +%%QT_INCDIR%%/QtSerialBus/QCanBusFactoryV2 %%QT_INCDIR%%/QtSerialBus/QCanBusFrame %%QT_INCDIR%%/QtSerialBus/QModbusClient %%QT_INCDIR%%/QtSerialBus/QModbusDataUnit @@ -34,6 +38,7 @@ %%QT_INCDIR%%/QtSerialBus/QtSerialBusVersion %%QT_INCDIR%%/QtSerialBus/qcanbus.h %%QT_INCDIR%%/QtSerialBus/qcanbusdevice.h +%%QT_INCDIR%%/QtSerialBus/qcanbusdeviceinfo.h %%QT_INCDIR%%/QtSerialBus/qcanbusfactory.h %%QT_INCDIR%%/QtSerialBus/qcanbusframe.h %%QT_INCDIR%%/QtSerialBus/qmodbusclient.h @@ -48,6 +53,7 @@ %%QT_INCDIR%%/QtSerialBus/qmodbustcpclient.h %%QT_INCDIR%%/QtSerialBus/qmodbustcpserver.h %%QT_INCDIR%%/QtSerialBus/qserialbusglobal.h +%%QT_INCDIR%%/QtSerialBus/qtserialbus-config.h %%QT_INCDIR%%/QtSerialBus/qtserialbusversion.h %%QT_CMAKEDIR%%/Qt5SerialBus/Qt5SerialBusConfig.cmake %%QT_CMAKEDIR%%/Qt5SerialBus/Qt5SerialBusConfigVersion.cmake Modified: head/databases/qt5-sql/Makefile ============================================================================== --- head/databases/qt5-sql/Makefile Sat Jan 6 21:22:10 2018 (r458292) +++ head/databases/qt5-sql/Makefile Sat Jan 6 21:30:31 2018 (r458293) @@ -17,4 +17,10 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} +post-configure: +.for d in src/sql + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} +.endfor + .include <bsd.port.mk> Modified: head/databases/qt5-sql/pkg-plist ============================================================================== --- head/databases/qt5-sql/pkg-plist Sat Jan 6 21:22:10 2018 (r458292) +++ head/databases/qt5-sql/pkg-plist Sat Jan 6 21:30:31 2018 (r458293) @@ -1,18 +1,10 @@ -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_db2_p.h -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_ibase_p.h -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_mysql_p.h -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_oci_p.h -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_odbc_p.h -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_psql_p.h -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_sqlite2_p.h -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_sqlite_p.h -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_tds_p.h %%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqlcachedresult_p.h %%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqldriver_p.h %%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqlnulldriver_p.h %%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqlquerymodel_p.h %%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqlresult_p.h %%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqltablemodel_p.h +%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qtsqlglobal_p.h %%QT_INCDIR%%/QtSql/QSql %%QT_INCDIR%%/QtSql/QSqlDatabase %%QT_INCDIR%%/QtSql/QSqlDriver @@ -47,6 +39,7 @@ %%QT_INCDIR%%/QtSql/qsqlrelationaltablemodel.h %%QT_INCDIR%%/QtSql/qsqlresult.h %%QT_INCDIR%%/QtSql/qsqltablemodel.h +%%QT_INCDIR%%/QtSql/qtsqlglobal.h %%QT_INCDIR%%/QtSql/qtsqlversion.h %%QT_CMAKEDIR%%/Qt5Sql/Qt5SqlConfig.cmake %%QT_CMAKEDIR%%/Qt5Sql/Qt5SqlConfigVersion.cmake Modified: head/devel/qt5-assistant/Makefile ============================================================================== --- head/devel/qt5-assistant/Makefile Sat Jan 6 21:22:10 2018 (r458292) +++ head/devel/qt5-assistant/Makefile Sat Jan 6 21:30:31 2018 (r458293) @@ -2,7 +2,6 @@ PORTNAME= assistant DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- Modified: head/devel/qt5-assistant/files/patch-src__src.pro ============================================================================== --- head/devel/qt5-assistant/files/patch-src__src.pro Sat Jan 6 21:22:10 2018 (r458292) +++ head/devel/qt5-assistant/files/patch-src__src.pro Sat Jan 6 21:30:31 2018 (r458293) @@ -3,16 +3,15 @@ missing dependencies. --- src/src.pro.orig 2016-02-25 20:14:01 UTC +++ src/src.pro -@@ -1,38 +1,3 @@ +@@ -1,52 +1,2 @@ TEMPLATE = subdirs - +- -qtHaveModule(widgets) { - no-png { - message("Some graphics-related tools are unavailable without PNG support") - } else { - SUBDIRS = assistant \ - pixeltool \ -- qtestlib \ - designer - - linguist.depends = designer @@ -21,9 +20,14 @@ missing dependencies. - -SUBDIRS += linguist \ - qdoc \ -- qtplugininfo --if(!android|android_app):!ios: SUBDIRS += qtpaths +- qtattributionsscanner - +-qtConfig(library) { +- !android|android_app: SUBDIRS += qtplugininfo +-} +- +-if(!android|android_app):!uikit: SUBDIRS += qtpaths +- -mac { - SUBDIRS += macdeployqt -} @@ -36,10 +40,20 @@ missing dependencies. - -win32|winrt:SUBDIRS += windeployqt -winrt:SUBDIRS += winrtrunner --qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag - -qtNomakeTools( \ - pixeltool \ - macdeployqt \ -) +- +-# This is necessary to avoid a race condition between toolchain.prf +-# invocations in a module-by-module cross-build. +-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) { +- androiddeployqt.depends += qtattributionsscanner +- qdoc.depends += qtattributionsscanner +- windeployqt.depends += qtattributionsscanner +- winrtrunner.depends += qtattributionsscanner +- linguist.depends += qtattributionsscanner +-} +SUBDIRS = assistant Modified: head/devel/qt5-buildtools/Makefile ============================================================================== --- head/devel/qt5-buildtools/Makefile Sat Jan 6 21:22:10 2018 (r458292) +++ head/devel/qt5-buildtools/Makefile Sat Jan 6 21:30:31 2018 (r458293) @@ -21,6 +21,12 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} MORE_WRKSRCS= src/tools/moc \ src/tools/rcc +post-configure: +.for d in src/tools/bootstrap ${MORE_WRKSRCS} + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} +.endfor + post-build: .for d in ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ Modified: head/devel/qt5-concurrent/Makefile ============================================================================== --- head/devel/qt5-concurrent/Makefile Sat Jan 6 21:22:10 2018 (r458292) +++ head/devel/qt5-concurrent/Makefile Sat Jan 6 21:30:31 2018 (r458293) @@ -20,4 +20,10 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} QT_DEFINES= CONCURRENT QT_CONFIG= concurrent +post-configure: +.for d in src/concurrent + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} +.endfor + .include <bsd.port.mk> Modified: head/devel/qt5-core/Makefile ============================================================================== --- head/devel/qt5-core/Makefile Sat Jan 6 21:22:10 2018 (r458292) +++ head/devel/qt5-core/Makefile Sat Jan 6 21:30:31 2018 (r458293) @@ -2,7 +2,6 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 4 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -10,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt core non-graphical module LIB_DEPENDS= libicui18n.so:devel/icu \ - libpcre.so:devel/pcre + libpcre2-posix.so:devel/pcre2 USE_GNOME= glib20 USE_QT5= qmake_build buildtools_build @@ -22,10 +21,10 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-accessibility -no-gif -no-libpng -no-libjpeg \ -no-openssl -no-gui -no-widgets -no-cups \ -no-iconv -no-dbus -no-opengl \ - -no-alsa -no-egl -no-evdev -no-feature-concurrent \ + -no-egl -no-evdev \ -no-fontconfig -no-freetype -no-gtk -no-harfbuzz \ - -no-libudev -no-pulseaudio -no-xcb -no-xinput2 -no-xkb -no-xcb-xlib \ - -no-xkbcommon -no-xrender -no-xshape -no-xsync -no-libinput + -no-libudev -no-xcb -no-xinput2 -no-xkb -no-xcb-xlib \ + -no-xkbcommon -no-libinput USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/corelib @@ -36,10 +35,26 @@ QT_CONFIG= glib icu .include <bsd.port.pre.mk> +post-configure: +.for d in src/tools/bootstrap src/tools/qfloat16-tables src/corelib + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} +.endfor + +pre-build: +.for d in src/tools/bootstrap src/tools/qfloat16-tables src/corelib + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && \ + ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ + ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} +.endfor + post-install: # Allow qconfig.h to be customized by single ports. ${AWK} 'BEGIN{print "#include <QtCore/qconfig-modules.h>"}{print}' \ ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h > ${WRKDIR}/qconfig.h +# Cleanup qconfig.h and remove stray '#define QT_NO_FOO' + ${REINPLACE_CMD} "/#define QT_NO_/d" ${WRKDIR}/qconfig.h ${MV} ${WRKDIR}/qconfig.h ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h .include <bsd.port.post.mk> Modified: head/devel/qt5-core/files/patch-src_corelib_corelib.pro ============================================================================== --- head/devel/qt5-core/files/patch-src_corelib_corelib.pro Sat Jan 6 21:22:10 2018 (r458292) +++ head/devel/qt5-core/files/patch-src_corelib_corelib.pro Sat Jan 6 21:30:31 2018 (r458293) @@ -12,21 +12,22 @@ to fix up the paths so that cmake files still land in in /usr/local/lib/cmake -- as this seemed to be the least intrusive method. - ---- src/corelib/corelib.pro.orig 2017-02-04 18:51:27 UTC -+++ src/corelib/corelib.pro -@@ -113,12 +113,12 @@ cmake_extras_mkspec_dir_for_install.inpu - cmake_extras_mkspec_dir_for_install.output = $$DESTDIR/cmake/install/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake - - cmake_qt5_umbrella_module_files.files = $$cmake_umbrella_config_file.output $$cmake_umbrella_config_version_file.output +--- src/corelib/corelib.pro.orig 2017-06-28 11:54:29.000000000 +0200 ++++ src/corelib/corelib.pro 2017-07-20 23:06:37.223900000 +0200 +@@ -130,7 +130,7 @@ + $$cmake_umbrella_config_version_file.output \ + $$cmake_umbrella_config_module_location_for_install.output + -cmake_qt5_umbrella_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5 +cmake_qt5_umbrella_module_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5 - - QMAKE_SUBSTITUTES += ctest_macros_file cmake_umbrella_config_file cmake_umbrella_config_version_file cmake_extras_mkspec_dir cmake_extras_mkspec_dir_for_install - + + QMAKE_SUBSTITUTES += \ + ctest_macros_file \ +@@ -143,6 +143,6 @@ + ctest_qt5_module_files.files += $$ctest_macros_file.output $$cmake_extras_mkspec_dir_for_install.output - + -ctest_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5Core +ctest_qt5_module_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5Core - + INSTALLS += ctest_qt5_module_files cmake_qt5_umbrella_module_files Modified: head/devel/qt5-core/pkg-plist ============================================================================== --- head/devel/qt5-core/pkg-plist Sat Jan 6 21:22:10 2018 (r458292) +++ head/devel/qt5-core/pkg-plist Sat Jan 6 21:30:31 2018 (r458293) @@ -12,16 +12,17 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcfsocketnotifier_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcollator_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qconfig_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcore_mac_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcore_unix_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcoreapplication_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcorecmdlineargs_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcoreglobaldata_p.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcrashhandler_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatastream_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdataurl_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatetime_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatetimeparser_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdeadlinetimer_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdebug_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdir_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdoublescanprint_p.h @@ -51,6 +52,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_polling_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_win_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfinalstate_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfloat16_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfreelist_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_iterator_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_p.h @@ -59,6 +61,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfutureinterface_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfuturewatcher_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qgb18030codec_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qglobal_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qharfbuzz_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhistorystate_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhooks_p.h @@ -100,6 +103,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qnoncontiguousbytedevice_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qnumeric_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qobject_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qoperatingsystemversion_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qorderedmutexlocker_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qparallelanimationgroup_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qpodlist_p.h @@ -133,6 +137,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemlibrary_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemsemaphore_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qt_pch.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtcore-config_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtemporaryfile_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtextcodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtextstream_p.h @@ -206,6 +211,7 @@ %%QT_INCDIR%%/QtCore/QDataStream %%QT_INCDIR%%/QtCore/QDate %%QT_INCDIR%%/QtCore/QDateTime +%%QT_INCDIR%%/QtCore/QDeadlineTimer %%QT_INCDIR%%/QtCore/QDebug %%QT_INCDIR%%/QtCore/QDebugStateSaver %%QT_INCDIR%%/QtCore/QDeferredDeleteEvent @@ -231,7 +237,7 @@ %%QT_INCDIR%%/QtCore/QFinalState %%QT_INCDIR%%/QtCore/QFlag %%QT_INCDIR%%/QtCore/QFlags -%%QT_INCDIR%%/QtCore/QForeachContainer +%%QT_INCDIR%%/QtCore/QFloat16 %%QT_INCDIR%%/QtCore/QFunctionPointer %%QT_INCDIR%%/QtCore/QFuture %%QT_INCDIR%%/QtCore/QFutureInterface @@ -326,6 +332,7 @@ %%QT_INCDIR%%/QtCore/QObjectData %%QT_INCDIR%%/QtCore/QObjectList %%QT_INCDIR%%/QtCore/QObjectUserData +%%QT_INCDIR%%/QtCore/QOperatingSystemVersion %%QT_INCDIR%%/QtCore/QPair %%QT_INCDIR%%/QtCore/QParallelAnimationGroup %%QT_INCDIR%%/QtCore/QPauseAnimation @@ -382,6 +389,7 @@ %%QT_INCDIR%%/QtCore/QStaticArrayData %%QT_INCDIR%%/QtCore/QStaticAssertFailure %%QT_INCDIR%%/QtCore/QStaticByteArrayData +%%QT_INCDIR%%/QtCore/QStaticByteArrayMatcherBase %%QT_INCDIR%%/QtCore/QStaticPlugin %%QT_INCDIR%%/QtCore/QStaticStringData %%QT_INCDIR%%/QtCore/QStorageInfo @@ -499,12 +507,7 @@ %%QT_INCDIR%%/QtCore/qcommandlineoption.h %%QT_INCDIR%%/QtCore/qcommandlineparser.h %%QT_INCDIR%%/QtCore/qcompilerdetection.h -%%QT_INCDIR%%/QtCore/qconfig-dist.h -%%QT_INCDIR%%/QtCore/qconfig-large.h -%%QT_INCDIR%%/QtCore/qconfig-medium.h -%%QT_INCDIR%%/QtCore/qconfig-minimal.h -%%QT_INCDIR%%/QtCore/qconfig-nacl.h -%%QT_INCDIR%%/QtCore/qconfig-small.h +%%QT_INCDIR%%/QtCore/qconfig-bootstrapped.h %%QT_INCDIR%%/QtCore/qconfig.h %%QT_INCDIR%%/QtCore/qcontainerfwd.h %%QT_INCDIR%%/QtCore/qcontiguouscache.h @@ -513,6 +516,7 @@ %%QT_INCDIR%%/QtCore/qcryptographichash.h %%QT_INCDIR%%/QtCore/qdatastream.h %%QT_INCDIR%%/QtCore/qdatetime.h +%%QT_INCDIR%%/QtCore/qdeadlinetimer.h %%QT_INCDIR%%/QtCore/qdebug.h %%QT_INCDIR%%/QtCore/qdir.h %%QT_INCDIR%%/QtCore/qdiriterator.h @@ -523,7 +527,6 @@ %%QT_INCDIR%%/QtCore/qeventtransition.h %%QT_INCDIR%%/QtCore/qexception.h %%QT_INCDIR%%/QtCore/qfactoryinterface.h -%%QT_INCDIR%%/QtCore/qfeatures.h %%QT_INCDIR%%/QtCore/qfile.h %%QT_INCDIR%%/QtCore/qfiledevice.h %%QT_INCDIR%%/QtCore/qfileinfo.h @@ -531,9 +534,9 @@ %%QT_INCDIR%%/QtCore/qfilesystemwatcher.h %%QT_INCDIR%%/QtCore/qfinalstate.h %%QT_INCDIR%%/QtCore/qflags.h +%%QT_INCDIR%%/QtCore/qfloat16.h %%QT_INCDIR%%/QtCore/qfunctions_nacl.h %%QT_INCDIR%%/QtCore/qfunctions_vxworks.h -%%QT_INCDIR%%/QtCore/qfunctions_wince.h %%QT_INCDIR%%/QtCore/qfunctions_winrt.h %%QT_INCDIR%%/QtCore/qfuture.h %%QT_INCDIR%%/QtCore/qfutureinterface.h @@ -580,6 +583,7 @@ %%QT_INCDIR%%/QtCore/qobjectcleanuphandler.h %%QT_INCDIR%%/QtCore/qobjectdefs.h %%QT_INCDIR%%/QtCore/qobjectdefs_impl.h +%%QT_INCDIR%%/QtCore/qoperatingsystemversion.h %%QT_INCDIR%%/QtCore/qpair.h %%QT_INCDIR%%/QtCore/qparallelanimationgroup.h %%QT_INCDIR%%/QtCore/qpauseanimation.h @@ -629,6 +633,7 @@ %%QT_INCDIR%%/QtCore/qsystemdetection.h %%QT_INCDIR%%/QtCore/qsystemsemaphore.h %%QT_INCDIR%%/QtCore/qt_windows.h +%%QT_INCDIR%%/QtCore/qtcore-config.h %%QT_INCDIR%%/QtCore/qtcoreversion.h %%QT_INCDIR%%/QtCore/qtemporarydir.h %%QT_INCDIR%%/QtCore/qtemporaryfile.h @@ -658,6 +663,7 @@ %%QT_INCDIR%%/QtCore/qxmlstream.h %%QT_CMAKEDIR%%/Qt5/Qt5Config.cmake %%QT_CMAKEDIR%%/Qt5/Qt5ConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5/Qt5ModuleLocation.cmake %%QT_CMAKEDIR%%/Qt5Core/Qt5CTestMacros.cmake %%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfig.cmake %%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfigExtras.cmake Modified: head/devel/qt5-dbus/Makefile ============================================================================== --- head/devel/qt5-dbus/Makefile Sat Jan 6 21:22:10 2018 (r458292) +++ head/devel/qt5-dbus/Makefile Sat Jan 6 21:30:31 2018 (r458293) @@ -24,6 +24,12 @@ TOOLS= qdbuscpp2xml qdbusxml2cpp QT_DEFINES= DBUS QT_CONFIG= dbus +post-configure: +.for d in src/dbus src/tools/qdbuscpp2xml src/tools/qdbusxml2cpp + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} +.endfor + post-build: .for t in ${TOOLS} @cd ${WRKSRC}/src/tools/${t} && \ Modified: head/devel/qt5-dbus/pkg-plist ============================================================================== --- head/devel/qt5-dbus/pkg-plist Sat Jan 6 21:22:10 2018 (r458292) +++ head/devel/qt5-dbus/pkg-plist Sat Jan 6 21:30:31 2018 (r458293) @@ -16,6 +16,7 @@ %%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusthreaddebug_p.h %%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusutil_p.h %%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusxmlparser_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qtdbusglobal_p.h %%QT_INCDIR%%/QtDBus/QDBusAbstractAdaptor %%QT_INCDIR%%/QtDBus/QDBusAbstractInterface %%QT_INCDIR%%/QtDBus/QDBusAbstractInterfaceBase @@ -61,6 +62,7 @@ %%QT_INCDIR%%/QtDBus/qdbusservicewatcher.h %%QT_INCDIR%%/QtDBus/qdbusunixfiledescriptor.h %%QT_INCDIR%%/QtDBus/qdbusvirtualobject.h +%%QT_INCDIR%%/QtDBus/qtdbusglobal.h %%QT_INCDIR%%/QtDBus/qtdbusversion.h %%QT_CMAKEDIR%%/Qt5DBus/Qt5DBusConfig.cmake %%QT_CMAKEDIR%%/Qt5DBus/Qt5DBusConfigExtras.cmake Modified: head/devel/qt5-designer/Makefile ============================================================================== --- head/devel/qt5-designer/Makefile Sat Jan 6 21:22:10 2018 (r458292) +++ head/devel/qt5-designer/Makefile Sat Jan 6 21:30:31 2018 (r458293) @@ -2,7 +2,6 @@ PORTNAME= designer DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- Modified: head/devel/qt5-designer/files/patch-src__src.pro ============================================================================== --- head/devel/qt5-designer/files/patch-src__src.pro Sat Jan 6 21:22:10 2018 (r458292) +++ head/devel/qt5-designer/files/patch-src__src.pro Sat Jan 6 21:30:31 2018 (r458293) @@ -3,16 +3,15 @@ missing dependencies. --- src/src.pro.orig 2016-02-25 20:24:46 UTC +++ src/src.pro -@@ -1,38 +1,3 @@ +@@ -1,52 +1,2 @@ TEMPLATE = subdirs - +- -qtHaveModule(widgets) { - no-png { - message("Some graphics-related tools are unavailable without PNG support") - } else { - SUBDIRS = assistant \ - pixeltool \ -- qtestlib \ - designer - - linguist.depends = designer @@ -21,9 +20,14 @@ missing dependencies. - -SUBDIRS += linguist \ - qdoc \ -- qtplugininfo --if(!android|android_app):!ios: SUBDIRS += qtpaths +- qtattributionsscanner - +-qtConfig(library) { +- !android|android_app: SUBDIRS += qtplugininfo +-} +- +-if(!android|android_app):!uikit: SUBDIRS += qtpaths +- -mac { - SUBDIRS += macdeployqt -} @@ -36,10 +40,20 @@ missing dependencies. - -win32|winrt:SUBDIRS += windeployqt -winrt:SUBDIRS += winrtrunner --qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag - -qtNomakeTools( \ - pixeltool \ - macdeployqt \ -) +- +-# This is necessary to avoid a race condition between toolchain.prf +-# invocations in a module-by-module cross-build. +-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) { +- androiddeployqt.depends += qtattributionsscanner +- qdoc.depends += qtattributionsscanner +- windeployqt.depends += qtattributionsscanner +- winrtrunner.depends += qtattributionsscanner +- linguist.depends += qtattributionsscanner +-} +SUBDIRS = designer Modified: head/devel/qt5-help/files/patch-src__assistant__assistant.pro ============================================================================== --- head/devel/qt5-help/files/patch-src__assistant__assistant.pro Sat Jan 6 21:22:10 2018 (r458292) +++ head/devel/qt5-help/files/patch-src__assistant__assistant.pro Sat Jan 6 21:30:31 2018 (r458293) @@ -5,16 +5,15 @@ assistant/ is built in devel/qt5-assistant. --- src/assistant/assistant.pro.orig 2016-06-10 14:46:48 UTC +++ src/assistant/assistant.pro -@@ -2,19 +2,16 @@ TEMPLATE = subdirs +@@ -2,18 +2,15 @@ TEMPLATE = subdirs - SUBDIRS += clucene \ + SUBDIRS += \ help \ - assistant \ qhelpgenerator \ qcollectiongenerator \ qhelpconverter - help.depends = clucene -assistant.depends = help qhelpgenerator.depends = help qcollectiongenerator.depends = help Modified: head/devel/qt5-help/files/patch-src__src.pro ============================================================================== --- head/devel/qt5-help/files/patch-src__src.pro Sat Jan 6 21:22:10 2018 (r458292) +++ head/devel/qt5-help/files/patch-src__src.pro Sat Jan 6 21:30:31 2018 (r458293) @@ -3,16 +3,15 @@ missing dependencies. --- src/src.pro.orig 2016-02-25 17:34:05 UTC +++ src/src.pro -@@ -1,38 +1,3 @@ +@@ -1,52 +1,2 @@ TEMPLATE = subdirs - +- -qtHaveModule(widgets) { - no-png { - message("Some graphics-related tools are unavailable without PNG support") - } else { - SUBDIRS = assistant \ - pixeltool \ -- qtestlib \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801062130.w06LUXDa062927>