From 32bf84f2f58c11d0dc10cf9ca5df0ecf767670a7 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Wed, 8 Jul 2020 03:09:27 -0700
Subject: [PATCH 1/2] [glib/gtk/atk] Install pkgconfig file

---
 ports/atk/CMakeLists.txt  | 12 ++++++++++++
 ports/atk/CONTROL         |  3 ++-
 ports/atk/portfile.cmake  |  4 ++--
 ports/glib/CMakeLists.txt |  2 ++
 ports/gtk/CMakeLists.txt  | 28 +++++++++++++++++++++++++---
 ports/gtk/CONTROL         |  3 ++-
 ports/gtk/portfile.cmake  |  7 +++----
 7 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/ports/atk/CMakeLists.txt b/ports/atk/CMakeLists.txt
index e26d8649e41a1c..a0494d334904e9 100644
--- a/ports/atk/CMakeLists.txt
+++ b/ports/atk/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.0)
 project(atk C)
 
+set(PACKAGE_VERSION 2.24.0)
+set(ATK_API_VERSION 1.0)
 set(ATK_LIB_SUFFIX 1.0)
 set(ATK_DLL_SUFFIX 1)
 set(GLIB_LIB_VERSION 2.0)
@@ -142,3 +144,13 @@ message(STATUS "  " ${LIBINTL_LIBRARY})
 foreach(GL ${GLIB_LIBRARIES})
     message(STATUS "  " ${GL})
 endforeach()
+
+set(VERSION ${PACKAGE_VERSION})
+set(ATK_API_VERSION ${ATK_API_VERSION})
+set(prefix ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix ${CMAKE_INSTALL_PREFIX})
+set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
+set(includedir ${CMAKE_INSTALL_PREFIX}/include)
+
+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)
diff --git a/ports/atk/CONTROL b/ports/atk/CONTROL
index 0fa67bfc5446a5..280ea87880251a 100644
--- a/ports/atk/CONTROL
+++ b/ports/atk/CONTROL
@@ -1,5 +1,6 @@
 Source: atk
-Version: 2.24.0-5
+Version: 2.24.0
+Port-Version: 6
 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 34f6391410e8da..a97863a998141f 100644
--- a/ports/atk/portfile.cmake
+++ b/ports/atk/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 
 set(ATK_VERSION 2.24.0)
@@ -32,4 +30,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)
diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt
index 2315420738622c..9e6f75a6d757a3 100644
--- a/ports/glib/CMakeLists.txt
+++ b/ports/glib/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 project(glib C)
 
+set(PACKAGE_VERSION 2.52.3)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_C_STANDARD 11)
 
@@ -361,6 +362,7 @@ message(STATUS "  " ${CHARSET_LIBRARY})
 message(STATUS "  " ${FFI_LIBRARY})
 message(STATUS "  " ${LIBINTL_LIBRARY})
 
+set(VERSION ${PACKAGE_VERSION})
 set(prefix ${CMAKE_INSTALL_PREFIX})
 set(exec_prefix ${CMAKE_INSTALL_PREFIX})
 set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
diff --git a/ports/gtk/CMakeLists.txt b/ports/gtk/CMakeLists.txt
index 9c265c7e597426..27ce658b5a95fd 100644
--- a/ports/gtk/CMakeLists.txt
+++ b/ports/gtk/CMakeLists.txt
@@ -4,6 +4,8 @@ project(gtk+ C)
 configure_file(config.h.win32 ${CMAKE_CURRENT_SOURCE_DIR}/config.h COPYONLY)
 configure_file(gdk/gdkconfig.h.win32_broadway ${CMAKE_CURRENT_SOURCE_DIR}/gdk/gdkconfig.h COPYONLY)
 
+set(PACKAGE_VERSION 3.22.19)
+set(GTK_API_VERSION 3.0)
 set(GLIB_LIB_SUFFIX 2.0)
 set(PANGO_LIB_SUFFIX 1.0)
 set(ATK_LIB_SUFFIX 1.0)
@@ -83,9 +85,9 @@ add_definitions(
 
 add_definitions(-DG_ENABLE_DEBUG)
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-	add_definitions(-DG_ENABLE_CONSISTENCY_CHECKS)
+    add_definitions(-DG_ENABLE_CONSISTENCY_CHECKS)
 else()
-	add_definitions(-DG_DISABLE_CAST_CHECKS)
+    add_definitions(-DG_DISABLE_CAST_CHECKS)
 endif()
 
 macro(extract_vcproj_sources VC_PROJECT OUT_VAR)
@@ -121,7 +123,7 @@ macro(gtk_add_module MODULE_NAME)
     target_include_directories(${MODULE_NAME} PRIVATE . ./gdk ./gtk ${GTK_REQUIRED_INCLUDE_DIR})
     target_link_libraries(${MODULE_NAME} ${GTK_REQUIRED_LIBRARIES})
     set_target_properties(${MODULE_NAME} PROPERTIES 
-        ARCHIVE_OUTPUT_NAME ${MODULE_NAME}.0)
+        ARCHIVE_OUTPUT_NAME ${MODULE_NAME})
     install(TARGETS ${MODULE_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
 endmacro()
 
@@ -175,3 +177,23 @@ if(NOT GTK_SKIP_HEADERS)
     set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
     include(install_headers)
 endif()
+
+set(VERSION ${PACKAGE_VERSION})
+set(GTK_API_VERSION ${GTK_API_VERSION})
+set(prefix ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix ${CMAKE_INSTALL_PREFIX})
+set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
+set(includedir ${CMAKE_INSTALL_PREFIX}/include)
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gail-3.0.pc.in"  "${CMAKE_CURRENT_BINARY_DIR}/gail-3.0.pc" @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gdk-3.0.pc.in"  "${CMAKE_CURRENT_BINARY_DIR}/gdk-3.0.pc" @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gtk+-3.0.pc.in"  "${CMAKE_CURRENT_BINARY_DIR}/gtk+-3.0.pc" @ONLY)
+
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gail-3.0.pc"
+            "${CMAKE_CURRENT_BINARY_DIR}/gdk-3.0.pc"
+            "${CMAKE_CURRENT_BINARY_DIR}/gtk+-3.0.pc"
+            DESTINATION lib/pkgconfig)
+if(UNIX)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gtk+-unix-print-3.0.pc.in"  "${CMAKE_CURRENT_BINARY_DIR}/gtk+-unix-print-3.0.pc" @ONLY)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gtk+-unix-print-3.0.pc"  DESTINATION lib/pkgconfig)
+endif()
\ No newline at end of file
diff --git a/ports/gtk/CONTROL b/ports/gtk/CONTROL
index 037d87efddd3d2..a03595a932bf0f 100644
--- a/ports/gtk/CONTROL
+++ b/ports/gtk/CONTROL
@@ -1,5 +1,6 @@
 Source: gtk
-Version: 3.22.19-4
+Version: 3.22.19
+Port-Version: 5
 Homepage: https://www.gtk.org/
 Description: Portable library for creating graphical user interfaces.
 Build-Depends: glib, atk, gdk-pixbuf, pango, cairo, libepoxy, gettext
diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake
index d77bee0589f9f0..34ae92b984f872 100644
--- a/ports/gtk/portfile.cmake
+++ b/ports/gtk/portfile.cmake
@@ -1,5 +1,3 @@
-
-include(vcpkg_common_functions)
 set(GTK_VERSION 3.22.19)
 
 vcpkg_download_distfile(ARCHIVE
@@ -39,5 +37,6 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gtk)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/gtk/COPYING ${CURRENT_PACKAGES_DIR}/share/gtk/copyright)
+vcpkg_fixup_pkgconfig()
+
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

From 3dc2c1d9c88f2c61311ab038d5dd77d26978c539 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Wed, 8 Jul 2020 03:13:52 -0700
Subject: [PATCH 2/2] Update glib version

---
 ports/glib/CONTROL | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL
index 14c896e59454cf..a4075d41fdf42f 100644
--- a/ports/glib/CONTROL
+++ b/ports/glib/CONTROL
@@ -1,5 +1,6 @@
 Source: glib
-Version: 2.52.3-14-7
+Version: 2.52.3
+Port-Version: 15
 Homepage: https://developer.gnome.org/glib/
 Description: Portable, general-purpose utility library.
 Build-Depends: zlib, pcre, libffi, gettext, libiconv