move to own git serverHEADmaster

4 files changed, 99 insertions, 0 deletions

diff --git a/vcpkg/ports/qt5-tools/fix-pkgconfig-qt5uiplugin-not-found.patch b/vcpkg/ports/qt5-tools/fix-pkgconfig-qt5uiplugin-not-found.patch
new file mode 100644
index 0000000..699c010
--- /dev/null
+++ b/vcpkg/ports/qt5-tools/fix-pkgconfig-qt5uiplugin-not-found.patch
@@ -0,0 +1,14 @@
+diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro

+index de0dc73..eef68be 100644

+--- a/src/designer/src/lib/lib.pro

++++ b/src/designer/src/lib/lib.pro

+@@ -1,7 +1,8 @@

+ TARGET = QtDesigner

+ MODULE = designer

+ 

+-QT = core-private gui-private widgets-private xml uiplugin

++QT = core-private gui-private widgets-private xml

++QT_PRIVATE += uiplugin

+ 

+ DEFINES += \

+     QDESIGNER_SDK_LIBRARY \

diff --git a/vcpkg/ports/qt5-tools/libclang.patch b/vcpkg/ports/qt5-tools/libclang.patch
new file mode 100644
index 0000000..caacf8b
--- /dev/null
+++ b/vcpkg/ports/qt5-tools/libclang.patch
@@ -0,0 +1,30 @@
+diff --git a/src/qdoc/configure.pri b/src/qdoc/configure.pri
+index 4f3d776..547d6a6 100644
+--- a/src/qdoc/configure.pri
++++ b/src/qdoc/configure.pri
+@@ -87,10 +87,7 @@ defineTest(qtConfTest_libclang) {
+     }
+     LLVM_INSTALL_DIR = $$clean_path($$LLVM_INSTALL_DIR)
+ 
+-    contains(QMAKE_HOST.arch, x86_64): \
+-        clangInstallDir = $$replace(LLVM_INSTALL_DIR, _ARCH_, 64)
+-    else: \
+-        clangInstallDir = $$replace(LLVM_INSTALL_DIR, _ARCH_, 32)
++    clangInstallDir = $$LLVM_INSTALL_DIR
+     isEmpty(LLVM_INSTALL_DIR) {
+         win32 {
+             return(false)
+@@ -113,7 +110,13 @@ defineTest(qtConfTest_libclang) {
+     } else {
+         CLANG_LIBDIR = $$clangInstallDir/lib
+         CLANG_INCLUDEPATH = $$clangInstallDir/include
++        exists($$clangInstallDir/tools/llvm): {
++            output = $$system("$$clangInstallDir/tools/llvm/llvm-config --version")
++            CLANG_VERSION = $$extractVersion($$output)
++        }
++        else: {
+         CLANG_VERSION = $$findLLVMVersionFromLibDir($$CLANG_LIBDIR)
++        }
+     }
+     isEmpty(CLANG_VERSION) {
+         !isEmpty(LLVM_INSTALL_DIR): \
diff --git a/vcpkg/ports/qt5-tools/portfile.cmake b/vcpkg/ports/qt5-tools/portfile.cmake
new file mode 100644
index 0000000..c15e540
--- /dev/null
+++ b/vcpkg/ports/qt5-tools/portfile.cmake
@@ -0,0 +1,21 @@
+include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
+
+vcpkg_list(SET OPTIONS)
+if("qdoc" IN_LIST FEATURES)
+    set(ENV{LLVM_INSTALL_DIR} "${CURRENT_INSTALLED_DIR}")
+    vcpkg_list(APPEND OPTIONS -feature-qdoc)
+else()
+    vcpkg_list(APPEND OPTIONS -no-feature-qdoc)
+endif()
+
+qt_submodule_installation(
+    PATCHES
+        fix-pkgconfig-qt5uiplugin-not-found.patch
+        libclang.patch
+    BUILD_OPTIONS
+        ${OPTIONS}
+)
+
+if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
+    file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms")
+endif()
diff --git a/vcpkg/ports/qt5-tools/vcpkg.json b/vcpkg/ports/qt5-tools/vcpkg.json
new file mode 100644
index 0000000..5903396
--- /dev/null
+++ b/vcpkg/ports/qt5-tools/vcpkg.json
@@ -0,0 +1,34 @@
+{
+  "name": "qt5-tools",
+  "version": "5.15.18",
+  "description": "A collection of tools and utilities that come with the Qt framework to assist developers in the creation, management, and deployment of Qt applications.",
+  "license": null,
+  "dependencies": [
+    {
+      "name": "qt5-activeqt",
+      "platform": "windows"
+    },
+    {
+      "name": "qt5-base",
+      "default-features": false,
+      "features": [
+        "sqlite3plugin"
+      ]
+    },
+    "qt5-declarative"
+  ],
+  "features": {
+    "qdoc": {
+      "description": "Build the qdoc tool.",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "clang"
+          ]
+        }
+      ]
+    }
+  }
+}