From 8fccec58a695f1849ba8cb7f3dbaae6e0ef22506 Mon Sep 17 00:00:00 2001 From: Stijn Herfst Date: Fri, 9 Aug 2019 21:36:36 +0200 Subject: [qt-advanced-docking-system] Add new port --- ports/qt-advanced-docking-system/CONTROL | 4 +++ .../config_changes.patch | 30 ++++++++++++++++++++++ ports/qt-advanced-docking-system/portfile.cmake | 24 +++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 ports/qt-advanced-docking-system/CONTROL create mode 100644 ports/qt-advanced-docking-system/config_changes.patch create mode 100644 ports/qt-advanced-docking-system/portfile.cmake diff --git a/ports/qt-advanced-docking-system/CONTROL b/ports/qt-advanced-docking-system/CONTROL new file mode 100644 index 000000000..7b79688ba --- /dev/null +++ b/ports/qt-advanced-docking-system/CONTROL @@ -0,0 +1,4 @@ +Source: qt-advanced-docking-system +Version: 2019-08-09 +Build-Depends: zlib, bzip2 +Description: Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio diff --git a/ports/qt-advanced-docking-system/config_changes.patch b/ports/qt-advanced-docking-system/config_changes.patch new file mode 100644 index 000000000..c7ce77c90 --- /dev/null +++ b/ports/qt-advanced-docking-system/config_changes.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 289e108..c907c90 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -79,8 +79,8 @@ install(FILES + DESTINATION license + COMPONENT license + ) +-install(TARGETS qtadvanceddocking +- EXPORT adsBinary ++install(TARGETS qtadvanceddocking ++ EXPORT qt-advanced-docking-systemConfig + RUNTIME DESTINATION bin COMPONENT library + LIBRARY DESTINATION lib COMPONENT library + ARCHIVE DESTINATION lib COMPONENT library +@@ -93,7 +93,6 @@ target_link_libraries(qtadvanceddocking PUBLIC ${ads_LIBS}) + target_compile_definitions(qtadvanceddocking PRIVATE ${ads_COMPILE_DEFINE}) + set_target_properties(qtadvanceddocking PROPERTIES + VERSION ${ads_VERSION} +- EXPORT_NAME "Qt Advanced Docking System" + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib" + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin" +@@ -103,3 +102,5 @@ if(BUILD_EXAMPLES) + add_subdirectory(demo) + endif() + ++ ++install(EXPORT qt-advanced-docking-systemConfig NAMESPACE qt-advanced-docking-system:: DESTINATION share/qt-advanced-docking-system) +\ No newline at end of file diff --git a/ports/qt-advanced-docking-system/portfile.cmake b/ports/qt-advanced-docking-system/portfile.cmake new file mode 100644 index 000000000..d5a019d34 --- /dev/null +++ b/ports/qt-advanced-docking-system/portfile.cmake @@ -0,0 +1,24 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO githubuser0xFFFF/Qt-Advanced-Docking-System + REF 6cc7d7983201596a3f579adbe09417fe8c73c409 + SHA512 fc508ffb69a265ac52a9be72854140717e7c61925c7275e44fd2f76d0df03637b8d7fd61b7ce86e03fa1e9bf0a0e4a9c2ed9477b9d758a3b0e4760839288e431 + HEAD_REF master + PATCHES + config_changes.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt-advanced-docking-system RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/license) +vcpkg_fixup_cmake_targets() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) \ No newline at end of file -- cgit v1.2.3 From 29938e73d88e5a2d7d6dfae552015c8f3517741b Mon Sep 17 00:00:00 2001 From: Stijn Herfst Date: Fri, 9 Aug 2019 21:43:57 +0200 Subject: Added qt dependency --- ports/qt-advanced-docking-system/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt-advanced-docking-system/CONTROL b/ports/qt-advanced-docking-system/CONTROL index 7b79688ba..1d6199555 100644 --- a/ports/qt-advanced-docking-system/CONTROL +++ b/ports/qt-advanced-docking-system/CONTROL @@ -1,4 +1,4 @@ Source: qt-advanced-docking-system Version: 2019-08-09 -Build-Depends: zlib, bzip2 +Build-Depends: qt5-base Description: Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio -- cgit v1.2.3 From a47efa0cd4d8163012c49fd73d157743dc1007c4 Mon Sep 17 00:00:00 2001 From: Stijn Herfst Date: Fri, 9 Aug 2019 22:04:24 +0200 Subject: Retrigger faulty CI/CD --- ports/qt-advanced-docking-system/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt-advanced-docking-system/CONTROL b/ports/qt-advanced-docking-system/CONTROL index 1d6199555..b7fb29421 100644 --- a/ports/qt-advanced-docking-system/CONTROL +++ b/ports/qt-advanced-docking-system/CONTROL @@ -1,4 +1,4 @@ Source: qt-advanced-docking-system Version: 2019-08-09 Build-Depends: qt5-base -Description: Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio +Description: Create highly customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio -- cgit v1.2.3 From 7481330ea25ef212dfd9e8a3ada2012f7b4110b3 Mon Sep 17 00:00:00 2001 From: Stijn Herfst Date: Wed, 14 Aug 2019 10:31:41 +0200 Subject: remove space character from patch file --- ports/qt-advanced-docking-system/config_changes.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt-advanced-docking-system/config_changes.patch b/ports/qt-advanced-docking-system/config_changes.patch index c7ce77c90..6e17f1a68 100644 --- a/ports/qt-advanced-docking-system/config_changes.patch +++ b/ports/qt-advanced-docking-system/config_changes.patch @@ -1,7 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 289e108..c907c90 100644 --- a/CMakeLists.txt -+++ b/CMakeLists.txt ++++ b/CMakeLists.txt @@ -79,8 +79,8 @@ install(FILES DESTINATION license COMPONENT license -- cgit v1.2.3 From cdcb4eaaa8a708ff7bf946809571e5752e884d4c Mon Sep 17 00:00:00 2001 From: Stijn Herfst Date: Wed, 14 Aug 2019 11:09:22 +0200 Subject: fixed static build --- ports/qt-advanced-docking-system/CONTROL | 6 +++--- .../qt-advanced-docking-system/config_changes.patch | 20 +++++++++++++------- ports/qt-advanced-docking-system/portfile.cmake | 4 ++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/ports/qt-advanced-docking-system/CONTROL b/ports/qt-advanced-docking-system/CONTROL index b7fb29421..a578f8643 100644 --- a/ports/qt-advanced-docking-system/CONTROL +++ b/ports/qt-advanced-docking-system/CONTROL @@ -1,4 +1,4 @@ Source: qt-advanced-docking-system -Version: 2019-08-09 -Build-Depends: qt5-base -Description: Create highly customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio +Version: 2019-08-14 +Build-Depends: qt5-base, zlib, bzip2 +Description: Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio diff --git a/ports/qt-advanced-docking-system/config_changes.patch b/ports/qt-advanced-docking-system/config_changes.patch index 6e17f1a68..ea9fd2801 100644 --- a/ports/qt-advanced-docking-system/config_changes.patch +++ b/ports/qt-advanced-docking-system/config_changes.patch @@ -1,14 +1,21 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 289e108..c907c90 100644 +index 8a9f919..9c2b8ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -79,8 +79,8 @@ install(FILES - DESTINATION license +@@ -62,7 +62,7 @@ if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") + else() + set(ads_PlatformDir "x64") + endif() +-if(BUILD_STATIC) ++if(NOT BUILD_SHARED_LIBS) + add_library(qtadvanceddocking STATIC ${ads_SRCS}) + set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ADS_STATIC) + else() +@@ -80,7 +80,7 @@ install(FILES COMPONENT license ) --install(TARGETS qtadvanceddocking + install(TARGETS qtadvanceddocking - EXPORT adsBinary -+install(TARGETS qtadvanceddocking + EXPORT qt-advanced-docking-systemConfig RUNTIME DESTINATION bin COMPONENT library LIBRARY DESTINATION lib COMPONENT library @@ -21,10 +28,9 @@ index 289e108..c907c90 100644 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib" LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin" -@@ -103,3 +102,5 @@ if(BUILD_EXAMPLES) +@@ -103,3 +102,4 @@ if(BUILD_EXAMPLES) add_subdirectory(demo) endif() -+ +install(EXPORT qt-advanced-docking-systemConfig NAMESPACE qt-advanced-docking-system:: DESTINATION share/qt-advanced-docking-system) \ No newline at end of file diff --git a/ports/qt-advanced-docking-system/portfile.cmake b/ports/qt-advanced-docking-system/portfile.cmake index d5a019d34..4df947b5a 100644 --- a/ports/qt-advanced-docking-system/portfile.cmake +++ b/ports/qt-advanced-docking-system/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO githubuser0xFFFF/Qt-Advanced-Docking-System - REF 6cc7d7983201596a3f579adbe09417fe8c73c409 - SHA512 fc508ffb69a265ac52a9be72854140717e7c61925c7275e44fd2f76d0df03637b8d7fd61b7ce86e03fa1e9bf0a0e4a9c2ed9477b9d758a3b0e4760839288e431 + REF a2b07fd97f0fac63fd7a0ed7b1eb0692b3efab71 + SHA512 a44babd6100f299aea7fcf2d730874e204151ce363e1f58a2be938f70d28b07f3cb39adfbf46527fdacc3b12a630e7d97851e4a6fcd04e750a007ee06d06d3b5 HEAD_REF master PATCHES config_changes.patch -- cgit v1.2.3 From 531009c7992ff6a632704a8c833e328415f7ea04 Mon Sep 17 00:00:00 2001 From: Stijn Herfst Date: Wed, 21 Aug 2019 14:50:17 +0200 Subject: disabled examples --- ports/qt-advanced-docking-system/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/qt-advanced-docking-system/portfile.cmake b/ports/qt-advanced-docking-system/portfile.cmake index 4df947b5a..2a53981cb 100644 --- a/ports/qt-advanced-docking-system/portfile.cmake +++ b/ports/qt-advanced-docking-system/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS -DBUILD_EXAMPLES=OFF ) vcpkg_install_cmake() -- cgit v1.2.3