From 7445bb85f0fe343d385951ae9b3f137747907eff Mon Sep 17 00:00:00 2001 From: HrOokami Date: Mon, 7 Dec 2020 00:33:35 +0300 Subject: [PATCH 1/4] Installing ATK .pc files --- ports/atk/CMakeLists.txt | 9 +++++++++ ports/atk/portfile.cmake | 2 ++ 2 files changed, 11 insertions(+) diff --git a/ports/atk/CMakeLists.txt b/ports/atk/CMakeLists.txt index e26d8649e41a1c..468624c33bae1d 100644 --- a/ports/atk/CMakeLists.txt +++ b/ports/atk/CMakeLists.txt @@ -142,3 +142,12 @@ message(STATUS " " ${LIBINTL_LIBRARY}) foreach(GL ${GLIB_LIBRARIES}) message(STATUS " " ${GL}) endforeach() + +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix ${CMAKE_INSTALL_PREFIX}) +set(libdir ${CMAKE_INSTALL_PREFIX}/lib) +set(includedir ${CMAKE_INSTALL_PREFIX}/include) +set(ATK_API_VERSION 1) + +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/atk.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/atk.pc" @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/atk.pc" DESTINATION lib/pkgconfig) \ No newline at end of file diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index 34f6391410e8da..82b9ebea8da328 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -32,4 +32,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 8f0ede192c290c66236b037c553389e4b0679d16 Mon Sep 17 00:00:00 2001 From: HrOokami Date: Mon, 7 Dec 2020 08:39:07 +0300 Subject: [PATCH 2/4] Updating atk CMakeLists.txt --- ports/atk/{CMakeLists.txt => CMakeLists.txt.in} | 8 ++++---- ports/atk/portfile.cmake | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) rename ports/atk/{CMakeLists.txt => CMakeLists.txt.in} (96%) diff --git a/ports/atk/CMakeLists.txt b/ports/atk/CMakeLists.txt.in similarity index 96% rename from ports/atk/CMakeLists.txt rename to ports/atk/CMakeLists.txt.in index 468624c33bae1d..c2f2d61c1b6334 100644 --- a/ports/atk/CMakeLists.txt +++ b/ports/atk/CMakeLists.txt.in @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.0) project(atk C) -set(ATK_LIB_SUFFIX 1.0) -set(ATK_DLL_SUFFIX 1) -set(GLIB_LIB_VERSION 2.0) +set(ATK_LIB_SUFFIX @ATK_LIB_SUFFIX@) +set(ATK_DLL_SUFFIX @ATK_DLL_SUFFIX@) +set(GLIB_LIB_VERSION @GLIB_LIB_VERSION@) if(BUILD_SHARED_LIBS) set(ATK_EXPORT_MACRO DLL_EXPORT) @@ -147,7 +147,7 @@ set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix ${CMAKE_INSTALL_PREFIX}) set(libdir ${CMAKE_INSTALL_PREFIX}/lib) set(includedir ${CMAKE_INSTALL_PREFIX}/include) -set(ATK_API_VERSION 1) +set(ATK_API_VERSION @ATK_API_VERSION@) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/atk.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/atk.pc" @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/atk.pc" DESTINATION lib/pkgconfig) \ No newline at end of file diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index a97863a998141f..ed3c3f15f06949 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -15,7 +15,11 @@ vcpkg_extract_source_archive_ex( fix-linux-config.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +set(ATK_LIB_SUFFIX 2.0) +set(ATK_DLL_SUFFIX 2) +set(GLIB_LIB_VERSION 2.0) +set(ATK_API_VERSION 2) +configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in" "${SOURCE_PATH}/CMakeLists.txt" @ONLY) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} From 855c13ef429f7dcc247a0ee578ab7833ed4cf75d Mon Sep 17 00:00:00 2001 From: HrOokami Date: Mon, 7 Dec 2020 10:04:27 +0300 Subject: [PATCH 3/4] ATK: Updating port-version, win32 fix --- ports/atk/CONTROL | 1 + ports/atk/portfile.cmake | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/atk/CONTROL b/ports/atk/CONTROL index bcfc01d1655faa..686e7fe6e5afcd 100644 --- a/ports/atk/CONTROL +++ b/ports/atk/CONTROL @@ -1,5 +1,6 @@ Source: atk Version: 2.24.0-5 +Port-Version: 1 Homepage: https://developer.gnome.org/atk/ Description: GNOME Accessibility Toolkit Build-Depends: glib, gettext diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index ed3c3f15f06949..f4b4050dcebdd9 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -18,7 +18,11 @@ vcpkg_extract_source_archive_ex( set(ATK_LIB_SUFFIX 2.0) set(ATK_DLL_SUFFIX 2) set(GLIB_LIB_VERSION 2.0) -set(ATK_API_VERSION 2) +if (WIN32) + set(ATK_API_VERSION ${ATK_LIB_SUFFIX}) +else() + set(ATK_API_VERSION ${ATK_DLL_SUFFIX}) +endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in" "${SOURCE_PATH}/CMakeLists.txt" @ONLY) vcpkg_configure_cmake( From 6937c3209034aa187fbbd85ef436b5a915776ec3 Mon Sep 17 00:00:00 2001 From: HrOokami Date: Mon, 7 Dec 2020 12:35:15 +0300 Subject: [PATCH 4/4] Fixing atk API version --- ports/atk/CMakeLists.txt.in | 2 ++ ports/atk/portfile.cmake | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ports/atk/CMakeLists.txt.in b/ports/atk/CMakeLists.txt.in index c2f2d61c1b6334..d8b84882369d99 100644 --- a/ports/atk/CMakeLists.txt.in +++ b/ports/atk/CMakeLists.txt.in @@ -148,6 +148,8 @@ set(exec_prefix ${CMAKE_INSTALL_PREFIX}) set(libdir ${CMAKE_INSTALL_PREFIX}/lib) set(includedir ${CMAKE_INSTALL_PREFIX}/include) set(ATK_API_VERSION @ATK_API_VERSION@) +set(VERSION @ATK_VERSION@) +set(GLIB_PACKAGES "glib-${GLIB_LIB_VERSION} gobject-${GLIB_LIB_VERSION} gmodule-${GLIB_LIB_VERSION}") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/atk.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/atk.pc" @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/atk.pc" DESTINATION lib/pkgconfig) \ No newline at end of file diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index f4b4050dcebdd9..916b5095bca53d 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -15,8 +15,10 @@ vcpkg_extract_source_archive_ex( fix-linux-config.patch ) -set(ATK_LIB_SUFFIX 2.0) -set(ATK_DLL_SUFFIX 2) +# Here are used API version of library, not the version of library itself +set(ATK_LIB_SUFFIX 1.0) +set(ATK_DLL_SUFFIX 1) + set(GLIB_LIB_VERSION 2.0) if (WIN32) set(ATK_API_VERSION ${ATK_LIB_SUFFIX})