-
Notifications
You must be signed in to change notification settings - Fork 6.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add Qt5 static missing dependencies, fix mac packages (#5680)
* [qt5-macextras] Add qt5-macextras port * [cutelyst2] Fix install on mac * [qt5-purchasing] Add missing dependency on qt5-declarative * [qt5] Ensure we link to required libraries for qt5 static build * [qscintilla] Fix install on mac * [libqglviewer] Fix install paths on mac * [libqglviewer] Fix regressions * [qscintilla] Fix regressions * Bump version numbers * [qt5] restore harfbuzz on osx
- Loading branch information
Showing
13 changed files
with
123 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Source: cutelyst2 | ||
| Version: 2.5.2-1 | ||
| Version: 2.5.2-2 | ||
| Description: A C++ Web Framework built on top of Qt, using the simple approach of Catalyst (Perl) framework | ||
| Build-Depends: qt5-base |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Source: libqglviewer | ||
| Version: 2.7.1 | ||
| Version: 2.7.1-1 | ||
| Description: libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers. | ||
| Build-Depends: qt5-base |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Source: qscintilla | ||
| Version: 2.10-7 | ||
| Version: 2.10-8 | ||
| Description: QScintilla is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin) | ||
| Build-Depends: qt5-base | ||
| Build-Depends: qt5-base, qt5-macextras (osx), qt5-winextras (windows) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Source: qt5-base | ||
| Version: 5.12.1-3 | ||
| Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. | ||
| Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz (!osx), sqlite3, libpq, double-conversion, openssl | ||
| Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| _find_package(${ARGS}) | ||
|
|
||
| function(add_qt_library _target) | ||
| foreach(_lib IN LISTS ARGN) | ||
| find_library(${_lib}_LIBRARY_DEBUG NAMES ${_lib}d PATH_SUFFIXES plugins/platforms) | ||
| find_library(${_lib}_LIBRARY_RELEASE NAMES ${_lib} PATH_SUFFIXES plugins/platforms) | ||
| set_property(TARGET ${_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES | ||
| \$<\$<NOT:\$<CONFIG:DEBUG>>:${${_lib}_LIBRARY_RELEASE}>\$<\$<CONFIG:DEBUG>:${${_lib}_LIBRARY_DEBUG}>) | ||
| endforeach() | ||
| endfunction() | ||
|
|
||
| get_target_property(_target_type Qt5::Core TYPE) | ||
| if("${_target_type}" STREQUAL "STATIC_LIBRARY") | ||
| find_package(ZLIB) | ||
| find_package(JPEG) | ||
| find_package(PNG) | ||
| find_package(Freetype) | ||
| find_package(sqlite3 CONFIG) | ||
| find_package(PostgreSQL MODULE REQUIRED) | ||
| find_package(double-conversion CONFIG) | ||
| find_package(OpenSSL) | ||
| find_package(harfbuzz CONFIG) | ||
|
|
||
| set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES | ||
| ZLIB::ZLIB JPEG::JPEG PNG::PNG Freetype::Freetype sqlite3 harfbuzz::harfbuzz | ||
| ${PostgreSQL_LIBRARY} double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto | ||
| ) | ||
|
|
||
| add_qt_library(Qt5::Core | ||
| pcre2-16 | ||
| Qt5ThemeSupport | ||
| Qt5EventDispatcherSupport | ||
| Qt5PlatformCompositorSupport | ||
| Qt5FontDatabaseSupport) | ||
|
|
||
| if(MSVC) | ||
| set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES | ||
| Netapi32.lib Ws2_32.lib Mincore.lib Winmm.lib Iphlpapi.lib Wtsapi32.lib Dwmapi.lib) | ||
|
|
||
| add_qt_library(Qt5::Core Qt5WindowsUIAutomationSupport qwindows qdirect2d) | ||
|
|
||
| elseif(APPLE) | ||
| set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES | ||
| "-weak_framework DiskArbitration" "-weak_framework IOKit" "-weak_framework Foundation" "-weak_framework CoreServices" | ||
| "-weak_framework AppKit" "-weak_framework Security" "-weak_framework ApplicationServices" | ||
| "-weak_framework CoreFoundation" "-weak_framework SystemConfiguration" | ||
| "-weak_framework Carbon" | ||
| "-weak_framework QuartzCore" | ||
| "-weak_framework CoreVideo" | ||
| "-weak_framework Metal" | ||
| "-weak_framework CoreText" | ||
| "-weak_framework ApplicationServices" | ||
| "-weak_framework CoreGraphics" | ||
| "-weak_framework OpenGL" | ||
| "-weak_framework AGL" | ||
| "-weak_framework ImageIO" | ||
| "z" "m" | ||
| cups) | ||
| add_qt_library(Qt5::Core | ||
| Qt5GraphicsSupport | ||
| Qt5ClipboardSupport | ||
| Qt5AccessibilitySupport | ||
| qcocoa) | ||
| endif() | ||
|
|
||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| Source: qt5-macextras | ||
| Version: 5.12.1 | ||
| Description: Qt5 Mac Extras Module. Provides platform-specific APIs for mac. | ||
| Build-Depends: qt5-modularscripts, qt5-base |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| include(vcpkg_common_functions) | ||
|
|
||
| include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) | ||
|
|
||
| qt_modular_library(qtmacextras 0d307b85e09fd97f36c5ee333297ceda4c709f6dc995dba4e8b8c1a85bd95c83ed80ee641e13e05fe3b965060c7847ba1835b7e6d9099a03c8bf9f2c4bae1ded) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Source: qt5-purchasing | ||
| Version: 5.12.1 | ||
| Description: Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications. | ||
| Build-Depends: qt5-modularscripts, qt5-base | ||
| Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Source: qt5 | ||
| Version: 5.12.1-1 | ||
| Version: 5.12.1-2 | ||
| Description: Qt5 Application Framework | ||
| Build-Depends: qt5-3d, qt5-activeqt, qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-location, qt5-multimedia, qt5-mqtt, qt5-networkauth, qt5-purchasing, qt5-quickcontrols, qt5-quickcontrols2, qt5-script, qt5-scxml, qt5-sensors, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-webchannel, qt5-websockets, qt5-winextras, qt5-xmlpatterns | ||
| Build-Depends: qt5-3d, qt5-activeqt, qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-location, qt5-multimedia, qt5-mqtt, qt5-networkauth, qt5-purchasing, qt5-quickcontrols, qt5-quickcontrols2, qt5-script, qt5-scxml, qt5-sensors, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-webchannel, qt5-websockets, qt5-winextras (windows), qt5-macextras (osx), qt5-xmlpatterns |