diff --git a/ports/qt-advanced-docking-system/CONTROL b/ports/qt-advanced-docking-system/CONTROL index 81ef72515f..75304a47f1 100644 --- a/ports/qt-advanced-docking-system/CONTROL +++ b/ports/qt-advanced-docking-system/CONTROL @@ -1,5 +1,5 @@ Source: qt-advanced-docking-system -Version: 3.2.5-2 -Build-Depends: qt5-base[core], zlib, bzip2 +Version: 3.6.1 +Build-Depends: qt5-base[core], qt5-x11extras (!windows), 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 Homepage: https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System diff --git a/ports/qt-advanced-docking-system/config_changes.patch b/ports/qt-advanced-docking-system/config_changes.patch index 8063b3006a..3ee543de47 100644 --- a/ports/qt-advanced-docking-system/config_changes.patch +++ b/ports/qt-advanced-docking-system/config_changes.patch @@ -1,47 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 578dfc1..a4c9460 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -70,7 +70,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}) - target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC) - else() -@@ -88,7 +88,7 @@ install(FILES - COMPONENT license - ) - install(TARGETS qtadvanceddocking -- EXPORT adsTargets -+ EXPORT qt-advanced-docking-systemConfig - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -@@ -100,14 +100,8 @@ write_basic_package_version_file("adsConfigVersion.cmake" - VERSION ${ads_VERSION} - COMPATIBILITY SameMajorVersion - ) --install(EXPORT adsTargets -- FILE adsTargets.cmake -- NAMESPACE ads:: -- DESTINATION lib/cmake/ads --) --install(FILES "adsConfig.cmake" "${CMAKE_BINARY_DIR}/adsConfigVersion.cmake" -- DESTINATION lib/cmake/ads --) -+ -+install(EXPORT qt-advanced-docking-systemConfig NAMESPACE qt-advanced-docking-system:: DESTINATION share/qt-advanced-docking-system) - - target_include_directories(qtadvanceddocking PUBLIC - "$" -@@ -117,7 +111,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 "QtAdvancedDockingSystem" - 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" +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 0bd721d..4848c5f 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -52,7 +52,7 @@ if (UNIX) + set(ads_SRCS linux/FloatingWidgetTitleBar.cpp ${ads_SRCS}) + set(ads_HEADERS linux/FloatingWidgetTitleBar.h ${ads_HEADERS}) + endif() +-if(BUILD_STATIC) ++if(NOT BUILD_SHARED_LIBS) + add_library(qtadvanceddocking STATIC ${ads_SRCS} ${ads_HEADERS}) + target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC) + else() diff --git a/ports/qt-advanced-docking-system/hardcode_version.patch b/ports/qt-advanced-docking-system/hardcode_version.patch new file mode 100644 index 0000000000..f5fc9caf83 --- /dev/null +++ b/ports/qt-advanced-docking-system/hardcode_version.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 94fdb8d..6febea2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,11 +1,6 @@ + cmake_minimum_required(VERSION 3.5) + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) +-include(GetGitRevisionDescription) +-git_describe(GitTagVersion --tags) +-string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" VERSION_MAJOR "${GitTagVersion}") +-string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${GitTagVersion}") +-string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${GitTagVersion}") +-set(VERSION_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") ++ + project(QtADS LANGUAGES CXX VERSION ${VERSION_SHORT}) + option(BUILD_STATIC "Build the static library" OFF) + option(BUILD_EXAMPLES "Build the examples" ON) diff --git a/ports/qt-advanced-docking-system/portfile.cmake b/ports/qt-advanced-docking-system/portfile.cmake index dd70c21e2b..690f1ea375 100644 --- a/ports/qt-advanced-docking-system/portfile.cmake +++ b/ports/qt-advanced-docking-system/portfile.cmake @@ -1,18 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO githubuser0xFFFF/Qt-Advanced-Docking-System - REF 661d0c4356ab61d155b53718aa1bf6bab86dad13 - SHA512 3504d91b63cc68abbc56e935f22dda2e5b667400501b547a159e3e43d5862c2cff5739423606732361b331b00596202a19a67c3273948cccfbdb8593970cb840 + REF 6846c9614602f21c51057a32d759a51eba1fc4d9 + SHA512 1ea130bf5bf2a567ec5510f450c1de74abeaab36258cb28585539a266889326e40c4912bf52b66dfced47e54b6fe0947211b9f53789666fe55744da509328edd HEAD_REF master PATCHES + hardcode_version.patch config_changes.patch - skip_license_install.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DBUILD_EXAMPLES=OFF + OPTIONS + -DBUILD_EXAMPLES=OFF + -DVERSION_SHORT=3.6.1 ) vcpkg_install_cmake() @@ -21,5 +23,5 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${ file(INSTALL ${SOURCE_PATH}/gnu-lgpl-v2.1.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) 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) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/qtadvanceddocking TARGET_PATH share/qtadvanceddocking) diff --git a/ports/qt-advanced-docking-system/skip_license_install.patch b/ports/qt-advanced-docking-system/skip_license_install.patch deleted file mode 100644 index e6cfb32a5f..0000000000 --- a/ports/qt-advanced-docking-system/skip_license_install.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a2cb47d..57a1cf5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -81,14 +81,8 @@ install(FILES ${ads_INSTALL_INCLUDE} - DESTINATION include - COMPONENT headers - ) --install(FILES -- "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE" -- "${CMAKE_CURRENT_SOURCE_DIR}/gnu-lgpl-v2.1.md" -- DESTINATION license -- COMPONENT license --) - install(TARGETS qtadvanceddocking - EXPORT qt-advanced-docking-systemConfig - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib