diff options
| author | codicodi <rob.ceglinski@gmail.com> | 2017-04-09 11:15:32 +0200 |
|---|---|---|
| committer | codicodi <rob.ceglinski@gmail.com> | 2017-04-09 11:15:32 +0200 |
| commit | 0af686a9f79f6f6a4620c283cb8e0ba2a8db19e6 (patch) | |
| tree | 4cadb560c8e8546819929176060e2cf3bceda4b8 | |
| parent | c33589ac27dc85371d579a38c0ef6d636ebbdd31 (diff) | |
| download | vcpkg-0af686a9f79f6f6a4620c283cb8e0ba2a8db19e6.tar.gz vcpkg-0af686a9f79f6f6a4620c283cb8e0ba2a8db19e6.zip | |
[glib] update to 2.52.1
| -rw-r--r-- | ports/glib/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ports/glib/CONTROL | 2 | ||||
| -rw-r--r-- | ports/glib/cmake/install_headers.cmake | 1 | ||||
| -rw-r--r-- | ports/glib/portfile.cmake | 6 |
4 files changed, 8 insertions, 7 deletions
diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt index 67f0ba10f..40763e8cd 100644 --- a/ports/glib/CMakeLists.txt +++ b/ports/glib/CMakeLists.txt @@ -60,7 +60,7 @@ macro(extract_vcproj_sources VC_PROJECT OUT_VAR) endmacro() # main module -extract_vcproj_sources(build/win32/vs14/glib.vcxproj GLIB_SOURCES) +extract_vcproj_sources(win32/vs14/glib.vcxproj GLIB_SOURCES) list(APPEND GLIB_SOURCES glib/libcharset/localcharset.c) # modified internal version with prefixed symbols add_library(glib ${GLIB_SOURCES}) target_compile_definitions(glib PRIVATE USE_SYSTEM_PCRE ${GLIB_EXPORT_MACRO} GLIB_COMPILATION G_LOG_DOMAIN="GLib" LIBDIR) @@ -77,7 +77,7 @@ target_include_directories(gthread PRIVATE ${LIBINTL_INCLUDE_DIR}) list(APPEND GLIB_TARGETS gthread) # gobject -extract_vcproj_sources(build/win32/vs14/gobject.vcxproj GOBJECT_SOURCES) +extract_vcproj_sources(win32/vs14/gobject.vcxproj GOBJECT_SOURCES) add_library(gobject ${GOBJECT_SOURCES}) target_compile_definitions(gobject PRIVATE GOBJECT_COMPILATION ${GLIB_EXPORT_MACRO} G_LOG_DOMAIN="GLib-GObject") target_link_libraries(gobject gthread glib ${FFI_LIBRARY}) @@ -92,7 +92,7 @@ target_include_directories(gmodule PRIVATE ${LIBINTL_INCLUDE_DIR}) list(APPEND GLIB_TARGETS gmodule) # gio -extract_vcproj_sources(build/win32/vs14/gio.vcxproj GIO_SOURCES) +extract_vcproj_sources(win32/vs14/gio.vcxproj GIO_SOURCES) add_library(gio ${GIO_SOURCES}) target_compile_definitions(gio PRIVATE GIO_COMPILATION ${GLIB_EXPORT_MACRO} G_LOG_DOMAIN="GLib-GIO") target_link_libraries(gio glib gmodule gobject ws2_32 shlwapi dnsapi iphlpapi ${ZLIB_LIBRARIES}) diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index f34cb6c6b..99f98362c 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -1,4 +1,4 @@ Source: glib -Version: 2.50.3 +Version: 2.52.1 Description: Portable, general-purpose utility library. Build-Depends: zlib, pcre, libffi, gettext, libiconv diff --git a/ports/glib/cmake/install_headers.cmake b/ports/glib/cmake/install_headers.cmake index e94a12e49..0cfc207a4 100644 --- a/ports/glib/cmake/install_headers.cmake +++ b/ports/glib/cmake/install_headers.cmake @@ -76,6 +76,7 @@ install(FILES glib/gtypes.h DESTINATION include/glib) install(FILES glib/gunicode.h DESTINATION include/glib) install(FILES glib/gurifuncs.h DESTINATION include/glib) install(FILES glib/gutils.h DESTINATION include/glib) +install(FILES glib/guuid.h DESTINATION include/glib) install(FILES glib/gvarianttype.h DESTINATION include/glib) install(FILES glib/gvariant.h DESTINATION include/glib) install(FILES glib/gversion.h DESTINATION include/glib) diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index a3de1f33f..51f8b0b30 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -10,12 +10,12 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() include(vcpkg_common_functions) -set(GLIB_VERSION 2.50.3) +set(GLIB_VERSION 2.52.1) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glib-${GLIB_VERSION}) vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/gnome/sources/glib/2.50/glib-${GLIB_VERSION}.tar.xz" + URLS "https://ftp.gnome.org/pub/gnome/sources/glib/2.52/glib-${GLIB_VERSION}.tar.xz" FILENAME "glib-${GLIB_VERSION}.tar.xz" - SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af) + SHA512 6f0475b4ee1078867671a79b1751674926ba1caa872cec3896e2830c61c3cde67972afa9f2d606a2b6705e9846222462b003c6e966a9b63982f3fc3fb58c4d37) vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( |