Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MacOS Qt5 overlay clean up #45

Merged
merged 4 commits into from
Jun 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions overlay/osx/qt-advanced-docking-system/CONTROL

This file was deleted.

36 changes: 0 additions & 36 deletions overlay/osx/qt-advanced-docking-system/config_changes.patch

This file was deleted.

25 changes: 0 additions & 25 deletions overlay/osx/qt-advanced-docking-system/portfile.cmake

This file was deleted.

5 changes: 0 additions & 5 deletions overlay/osx/qt5-base/CONTROL

This file was deleted.

8 changes: 4 additions & 4 deletions overlay/osx/qt5-base/cmake/find_qt_mkspec.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ function(find_qt_mkspec TARGET_PLATFORM_MKSPEC_OUT HOST_PLATFORM_MKSPEC_OUT EXT_
else()
endif()
foreach(_triplet ${_test_triplets})
find_program(QMAKE_PATH qmake PATHS ${VCPKG_ROOT_DIR}/installed/${_triplet}/tools/qt5/bin NO_DEFAULT_PATHS)
message(STATUS "Checking: ${VCPKG_ROOT_DIR}/installed/${_triplet}/tools/qt5/bin. ${QMAKE_PATH}")
find_program(QMAKE_PATH qmake PATHS ${VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5/bin NO_DEFAULT_PATHS)
message(STATUS "Checking: ${VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5/bin. ${QMAKE_PATH}")
if(QMAKE_PATH)
set(_tmp_host_root "${VCPKG_ROOT_DIR}/installed/${_triplet}/tools/qt5")
set(_tmp_host_root "${VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5")
set(_tmp_host_qmake ${QMAKE_PATH} PARENT_SCOPE)
message(STATUS "Qt host tools root dir within vcpkg: ${_tmp_host_root}")
break()
Expand All @@ -98,4 +98,4 @@ function(find_qt_mkspec TARGET_PLATFORM_MKSPEC_OUT HOST_PLATFORM_MKSPEC_OUT EXT_
set(${EXT_HOST_TOOLS_OUT} ${_tmp_host_root} PARENT_SCOPE)
endif()

endfunction()
endfunction()
32 changes: 32 additions & 0 deletions overlay/osx/qt5-base/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"name": "qt5-base",
"version-semver": "5.12.4",
"port-version": 12,
"description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"dependencies": [
{
"name": "angle",
"platform": "!windows"
},
"double-conversion",
"egl-registry",
{
"name": "fontconfig",
"platform": "!windows"
},
"freetype",
"harfbuzz",
"libjpeg-turbo",
"libpng",
"openssl",
"pcre2",
"sqlite3",
{
"name": "vcpkg-pkgconfig-get-modules",
"host": true
},
"zlib",
"zstd"
]
}
4 changes: 0 additions & 4 deletions overlay/osx/qt5-declarative/CONTROL

This file was deleted.

12 changes: 12 additions & 0 deletions overlay/osx/qt5-declarative/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "qt5-declarative",
"version-string": "5.12.4",
"port-version": 1,
"description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.",
"dependencies": [
{
"name": "qt5-base",
"default-features": false
}
]
}
4 changes: 0 additions & 4 deletions overlay/osx/qt5-macextras/CONTROL

This file was deleted.

13 changes: 13 additions & 0 deletions overlay/osx/qt5-macextras/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "qt5-macextras",
"version-string": "5.12.4",
"port-version": 1,
"description": "Qt5 Mac Extras Module. Provides platform-specific APIs for mac.",
"supports": "osx",
"dependencies": [
{
"name": "qt5-base",
"default-features": false
}
]
}
4 changes: 0 additions & 4 deletions overlay/osx/qt5-script/CONTROL

This file was deleted.

13 changes: 13 additions & 0 deletions overlay/osx/qt5-script/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "qt5-script",
"version-string": "5.12.4",
"port-version": 1,
"description": "Qt5 Script Module.",
"dependencies": [
{
"name": "qt5-base",
"default-features": false
},
"qt5-tools"
]
}
4 changes: 0 additions & 4 deletions overlay/osx/qt5-svg/CONTROL

This file was deleted.

12 changes: 12 additions & 0 deletions overlay/osx/qt5-svg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "qt5-svg",
"version-string": "5.12.4",
"port-version": 1,
"description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files",
"dependencies": [
{
"name": "qt5-base",
"default-features": false
}
]
}
4 changes: 0 additions & 4 deletions overlay/osx/qt5-tools/CONTROL

This file was deleted.

13 changes: 13 additions & 0 deletions overlay/osx/qt5-tools/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "qt5-tools",
"version-string": "5.12.4",
"port-version": 1,
"description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications",
"dependencies": [
{
"name": "qt5-base",
"default-features": false
},
"qt5-declarative"
]
}
4 changes: 0 additions & 4 deletions overlay/osx/qt5-translations/CONTROL

This file was deleted.

13 changes: 13 additions & 0 deletions overlay/osx/qt5-translations/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "qt5-translations",
"version-string": "5.12.4",
"port-version": 1,
"description": "Qt5 translations module",
"dependencies": [
{
"name": "qt5-base",
"default-features": false
},
"qt5-tools"
]
}
4 changes: 0 additions & 4 deletions overlay/osx/qt5-winextras/CONTROL

This file was deleted.

5 changes: 0 additions & 5 deletions overlay/osx/qt5-winextras/portfile.cmake

This file was deleted.

4 changes: 0 additions & 4 deletions overlay/osx/qt5-xmlpatterns/CONTROL

This file was deleted.

13 changes: 13 additions & 0 deletions overlay/osx/qt5-xmlpatterns/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "qt5-xmlpatterns",
"version-string": "5.12.4",
"port-version": 1,
"description": "Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation",
"dependencies": [
{
"name": "qt5-base",
"default-features": false
},
"qt5-declarative"
]
}