From 6aa76db897298fab1ec6ae495b1d43fe50e3e1e4 Mon Sep 17 00:00:00 2001 From: Stijn Herfst Date: Thu, 3 Sep 2020 22:40:45 +0200 Subject: [PATCH 1/6] update to 3.6.1 --- ports/qt-advanced-docking-system/CONTROL | 2 +- .../config_changes.patch | 93 +++++++++---------- .../hardcode_version.patch | 22 +++++ .../qt-advanced-docking-system/portfile.cmake | 8 +- .../skip_license_install.patch | 19 ---- 5 files changed, 73 insertions(+), 71 deletions(-) create mode 100644 ports/qt-advanced-docking-system/hardcode_version.patch delete mode 100644 ports/qt-advanced-docking-system/skip_license_install.patch diff --git a/ports/qt-advanced-docking-system/CONTROL b/ports/qt-advanced-docking-system/CONTROL index 81ef72515fe668..ee94ca56a82d86 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 +Version: 3.6.1 Build-Depends: qt5-base[core], 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 8063b3006af7fb..326090cc55e910 100644 --- a/ports/qt-advanced-docking-system/config_changes.patch +++ b/ports/qt-advanced-docking-system/config_changes.patch @@ -1,47 +1,46 @@ -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..2595af8 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() +@@ -70,7 +70,6 @@ set_target_properties(qtadvanceddocking PROPERTIES + CXX_STANDARD_REQUIRED ON + CXX_EXTENSIONS OFF + VERSION ${VERSION_SHORT} +- EXPORT_NAME "qtadvanceddocking" + 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" +@@ -92,20 +91,16 @@ install(FILES + COMPONENT license + ) + install(TARGETS qtadvanceddocking +- EXPORT adsTargets ++ EXPORT qt-advanced-docking-systemConfig + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + INCLUDES DESTINATION include + ) + +-install(EXPORT adsTargets +- FILE adsTargets.cmake +- NAMESPACE ads:: +- DESTINATION lib/cmake/qtadvanceddocking +-) +-install(FILES qtadvanceddockingConfig.cmake "${CMAKE_CURRENT_BINARY_DIR}/qtadvanceddockingConfigVersion.cmake" +- DESTINATION lib/cmake/qtadvanceddocking ++install(EXPORT qt-advanced-docking-systemConfig ++ NAMESPACE qt-advanced-docking-system:: ++ DESTINATION share/qt-advanced-docking-system + ) + + target_include_directories(qtadvanceddocking PUBLIC 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 00000000000000..4428316f49b243 --- /dev/null +++ b/ports/qt-advanced-docking-system/hardcode_version.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 94fdb8d..0455d0a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,14 +1,10 @@ + 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}") ++ ++set(VERSION_SHORT "3.6.1") + project(QtADS LANGUAGES CXX VERSION ${VERSION_SHORT}) + option(BUILD_STATIC "Build the static library" OFF) +-option(BUILD_EXAMPLES "Build the examples" ON) ++option(BUILD_EXAMPLES "Build the examples" OFF) + if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") + set(ads_PlatformDir "x86") + else() diff --git a/ports/qt-advanced-docking-system/portfile.cmake b/ports/qt-advanced-docking-system/portfile.cmake index dd70c21e2b92d7..6935f2df48238c 100644 --- a/ports/qt-advanced-docking-system/portfile.cmake +++ b/ports/qt-advanced-docking-system/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO githubuser0xFFFF/Qt-Advanced-Docking-System - REF 661d0c4356ab61d155b53718aa1bf6bab86dad13 - SHA512 3504d91b63cc68abbc56e935f22dda2e5b667400501b547a159e3e43d5862c2cff5739423606732361b331b00596202a19a67c3273948cccfbdb8593970cb840 + REF 6846c9614602f21c51057a32d759a51eba1fc4d9 + SHA512 35d27002a678a2117fdd9e46e0cc94b9d8435f9b43149fb7a3b6f6389e04b1e7f3a94b64e3077d8f80c408f861e335d9f5d4facda08b47d25b60bf6ba7ceda01 HEAD_REF master PATCHES + hardcode_version.patch config_changes.patch - skip_license_install.patch ) vcpkg_configure_cmake( @@ -21,5 +21,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) + 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 e6cfb32a5fac62..00000000000000 --- 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 From 5941d2f40aa299f826181b99db081c1193afdac4 Mon Sep 17 00:00:00 2001 From: Stijn Herfst Date: Fri, 4 Sep 2020 12:43:50 +0200 Subject: [PATCH 2/6] remove unneeded changes --- .../config_changes.patch | 35 +------------------ .../hardcode_version.patch | 10 ++---- .../qt-advanced-docking-system/portfile.cmake | 2 +- 3 files changed, 5 insertions(+), 42 deletions(-) diff --git a/ports/qt-advanced-docking-system/config_changes.patch b/ports/qt-advanced-docking-system/config_changes.patch index 326090cc55e910..3ee543de47f8cc 100644 --- a/ports/qt-advanced-docking-system/config_changes.patch +++ b/ports/qt-advanced-docking-system/config_changes.patch @@ -1,5 +1,5 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0bd721d..2595af8 100644 +index 0bd721d..4848c5f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -52,7 +52,7 @@ if (UNIX) @@ -11,36 +11,3 @@ index 0bd721d..2595af8 100644 add_library(qtadvanceddocking STATIC ${ads_SRCS} ${ads_HEADERS}) target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC) else() -@@ -70,7 +70,6 @@ set_target_properties(qtadvanceddocking PROPERTIES - CXX_STANDARD_REQUIRED ON - CXX_EXTENSIONS OFF - VERSION ${VERSION_SHORT} -- EXPORT_NAME "qtadvanceddocking" - 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" -@@ -92,20 +91,16 @@ install(FILES - COMPONENT license - ) - install(TARGETS qtadvanceddocking -- EXPORT adsTargets -+ EXPORT qt-advanced-docking-systemConfig - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - INCLUDES DESTINATION include - ) - --install(EXPORT adsTargets -- FILE adsTargets.cmake -- NAMESPACE ads:: -- DESTINATION lib/cmake/qtadvanceddocking --) --install(FILES qtadvanceddockingConfig.cmake "${CMAKE_CURRENT_BINARY_DIR}/qtadvanceddockingConfigVersion.cmake" -- DESTINATION lib/cmake/qtadvanceddocking -+install(EXPORT qt-advanced-docking-systemConfig -+ NAMESPACE qt-advanced-docking-system:: -+ DESTINATION share/qt-advanced-docking-system - ) - - target_include_directories(qtadvanceddocking PUBLIC diff --git a/ports/qt-advanced-docking-system/hardcode_version.patch b/ports/qt-advanced-docking-system/hardcode_version.patch index 4428316f49b243..339d878dac6ec9 100644 --- a/ports/qt-advanced-docking-system/hardcode_version.patch +++ b/ports/qt-advanced-docking-system/hardcode_version.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 94fdb8d..0455d0a 100644 +index 94fdb8d..6febea2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,14 +1,10 @@ +@@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.5) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) -include(GetGitRevisionDescription) @@ -15,8 +15,4 @@ index 94fdb8d..0455d0a 100644 +set(VERSION_SHORT "3.6.1") project(QtADS LANGUAGES CXX VERSION ${VERSION_SHORT}) option(BUILD_STATIC "Build the static library" OFF) --option(BUILD_EXAMPLES "Build the examples" ON) -+option(BUILD_EXAMPLES "Build the examples" OFF) - if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") - set(ads_PlatformDir "x86") - else() + 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 6935f2df48238c..c151987f01be38 100644 --- a/ports/qt-advanced-docking-system/portfile.cmake +++ b/ports/qt-advanced-docking-system/portfile.cmake @@ -22,4 +22,4 @@ file(INSTALL ${SOURCE_PATH}/gnu-lgpl-v2.1.md DESTINATION ${CURRENT_PACKAGES_DIR} file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/license) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/qtadvanceddocking TARGET_PATH share/qtadvanceddocking) From 952fbc90242a5e77271f2ffc277a77e930d72469 Mon Sep 17 00:00:00 2001 From: Stijn Herfst Date: Fri, 4 Sep 2020 15:35:33 +0200 Subject: [PATCH 3/6] fix qt5-x11extras linux 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 ee94ca56a82d86..f4e6e8e27cfc4c 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.6.1 -Build-Depends: qt5-base[core], zlib, bzip2 +Build-Depends: qt5-base[core], qt5-x11extras (linux), 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 From 182e0f5ce3c34024e23e056076e9d516c1a228ec Mon Sep 17 00:00:00 2001 From: Stijn Herfst Date: Sun, 6 Sep 2020 23:28:48 +0200 Subject: [PATCH 4/6] add dependency for osx --- 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 f4e6e8e27cfc4c..a62e59bb162cd7 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.6.1 -Build-Depends: qt5-base[core], qt5-x11extras (linux), zlib, bzip2 +Build-Depends: qt5-base[core], qt5-x11extras (linux || osx), 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 From 0afe6636ddccc278acc26df5f5541d0c0dec6fe0 Mon Sep 17 00:00:00 2001 From: Stijn Herfst Date: Wed, 9 Sep 2020 22:12:40 +0200 Subject: [PATCH 5/6] make requested changes --- ports/qt-advanced-docking-system/CONTROL | 2 +- ports/qt-advanced-docking-system/hardcode_version.patch | 3 +-- ports/qt-advanced-docking-system/portfile.cmake | 4 +++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ports/qt-advanced-docking-system/CONTROL b/ports/qt-advanced-docking-system/CONTROL index a62e59bb162cd7..75304a47f16e8d 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.6.1 -Build-Depends: qt5-base[core], qt5-x11extras (linux || osx), zlib, bzip2 +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/hardcode_version.patch b/ports/qt-advanced-docking-system/hardcode_version.patch index 339d878dac6ec9..f5fc9caf8329b7 100644 --- a/ports/qt-advanced-docking-system/hardcode_version.patch +++ b/ports/qt-advanced-docking-system/hardcode_version.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 94fdb8d..6febea2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,11 +1,7 @@ +@@ -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) @@ -12,7 +12,6 @@ index 94fdb8d..6febea2 100644 -string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${GitTagVersion}") -set(VERSION_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") + -+set(VERSION_SHORT "3.6.1") 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 c151987f01be38..415aabdcee26d0 100644 --- a/ports/qt-advanced-docking-system/portfile.cmake +++ b/ports/qt-advanced-docking-system/portfile.cmake @@ -12,7 +12,9 @@ vcpkg_from_github( 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() From 6b9694a2bb0866f26ebc20f5fc961c93d459a7fb Mon Sep 17 00:00:00 2001 From: Stijn Herfst Date: Thu, 10 Sep 2020 00:03:08 +0200 Subject: [PATCH 6/6] change hash --- ports/qt-advanced-docking-system/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt-advanced-docking-system/portfile.cmake b/ports/qt-advanced-docking-system/portfile.cmake index 415aabdcee26d0..690f1ea3751b58 100644 --- a/ports/qt-advanced-docking-system/portfile.cmake +++ b/ports/qt-advanced-docking-system/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO githubuser0xFFFF/Qt-Advanced-Docking-System REF 6846c9614602f21c51057a32d759a51eba1fc4d9 - SHA512 35d27002a678a2117fdd9e46e0cc94b9d8435f9b43149fb7a3b6f6389e04b1e7f3a94b64e3077d8f80c408f861e335d9f5d4facda08b47d25b60bf6ba7ceda01 + SHA512 1ea130bf5bf2a567ec5510f450c1de74abeaab36258cb28585539a266889326e40c4912bf52b66dfced47e54b6fe0947211b9f53789666fe55744da509328edd HEAD_REF master PATCHES hardcode_version.patch