From 70e7124cc485b943b911b0aae8ae30b4cbce9583 Mon Sep 17 00:00:00 2001 From: JackBoosY <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 30 May 2019 03:45:57 +0800 Subject: [pango/gtk]Fix build error C2001. (#6671) --- ports/gtk/CMakeLists.txt | 5 +++++ ports/gtk/CONTROL | 2 +- ports/pango/CMakeLists.txt | 5 +++++ ports/pango/CONTROL | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ports/gtk/CMakeLists.txt b/ports/gtk/CMakeLists.txt index 22e30b1a7..9c265c7e5 100644 --- a/ports/gtk/CMakeLists.txt +++ b/ports/gtk/CMakeLists.txt @@ -12,6 +12,11 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug) set(CAIRO_LIB_SUFFIX d) endif() +if (WIN32) + # Set utf-8 charset to avoid compile error C2001 + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8") +endif() + # find dependencies # glib find_path(GLIB_INCLUDE_DIR glib.h) diff --git a/ports/gtk/CONTROL b/ports/gtk/CONTROL index c470f8ac8..ac0d4764f 100644 --- a/ports/gtk/CONTROL +++ b/ports/gtk/CONTROL @@ -1,4 +1,4 @@ Source: gtk -Version: 3.22.19-2 +Version: 3.22.19-3 Description: Portable library for creating graphical user interfaces. Build-Depends: glib, atk, gdk-pixbuf, pango, cairo, libepoxy, gettext diff --git a/ports/pango/CMakeLists.txt b/ports/pango/CMakeLists.txt index cc21d3eee..f0e6d85e7 100644 --- a/ports/pango/CMakeLists.txt +++ b/ports/pango/CMakeLists.txt @@ -11,6 +11,11 @@ else() configure_file(./config.h.unix ${CMAKE_CURRENT_BINARY_DIR}/config.h COPYONLY) endif() +if (WIN32) + # Set utf-8 charset to avoid compile error C2001 + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8") +endif() + add_definitions(-DHAVE_CONFIG_H) include_directories(. ./pango ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/ports/pango/CONTROL b/ports/pango/CONTROL index 9b176290b..f58bf18ec 100644 --- a/ports/pango/CONTROL +++ b/ports/pango/CONTROL @@ -1,4 +1,4 @@ Source: pango -Version: 1.40.11-3 +Version: 1.40.11-4 Description: Text and font handling library. Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz[glib] (!windows-static) -- cgit v1.2.3 From dc42151505367ffed6ce1f1744df4b1c1ec1cf7a Mon Sep 17 00:00:00 2001 From: myd7349 Date: Thu, 30 May 2019 05:24:41 +0800 Subject: [WIP][cjson] Add new port (#6081) * [cjson] Add new port * [cjson] Fix cmake targets path * [cjson] Bump version info --- ports/cjson/CONTROL | 6 ++++ ports/cjson/fix-install-path.patch | 34 ++++++++++++++++++++ ports/cjson/portfile.cmake | 63 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+) create mode 100644 ports/cjson/CONTROL create mode 100644 ports/cjson/fix-install-path.patch create mode 100644 ports/cjson/portfile.cmake diff --git a/ports/cjson/CONTROL b/ports/cjson/CONTROL new file mode 100644 index 000000000..7029313e3 --- /dev/null +++ b/ports/cjson/CONTROL @@ -0,0 +1,6 @@ +Source: cjson +Version: 1.7.10-1 +Description: Ultralightweight JSON parser in ANSI C + +Feature: utils +Description: Enable building the cJSON_Utils library diff --git a/ports/cjson/fix-install-path.patch b/ports/cjson/fix-install-path.patch new file mode 100644 index 000000000..96a65d996 --- /dev/null +++ b/ports/cjson/fix-install-path.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 033a882..6e2b2e4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -149,7 +149,13 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson.pc.in" + + install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson") + install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") +-install(TARGETS "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" EXPORT "${CJSON_LIB}") ++install(TARGETS "${CJSON_LIB}" ++ EXPORT "${CJSON_LIB}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" ++ INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}" ++) + if (BUILD_SHARED_AND_STATIC_LIBS) + install(TARGETS "${CJSON_LIB}-static" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}") + endif() +@@ -186,7 +192,13 @@ if(ENABLE_CJSON_UTILS) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson_utils.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" @ONLY) + +- install(TARGETS "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" EXPORT "${CJSON_UTILS_LIB}") ++ install(TARGETS "${CJSON_UTILS_LIB}" ++ EXPORT "${CJSON_UTILS_LIB}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" ++ INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}" ++ ) + if (BUILD_SHARED_AND_STATIC_LIBS) + install(TARGETS "${CJSON_UTILS_LIB}-static" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}") + endif() diff --git a/ports/cjson/portfile.cmake b/ports/cjson/portfile.cmake new file mode 100644 index 000000000..7db22d9ae --- /dev/null +++ b/ports/cjson/portfile.cmake @@ -0,0 +1,63 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DaveGamble/cJSON + REF v1.7.10 + SHA512 f8d7c9fe798b51ec3c69cabe4124d2f6372f0e6d282285e3ca951c58c971a9a520d87550530d750ff7f8055c0b6ff566f237b9af9eb345cf4f4fc4ff8c910740 + HEAD_REF master + PATCHES + fix-install-path.patch +) + +if("utils" IN_LIST FEATURES) + set(ENABLE_CJSON_UTILS ON) +else() + set(ENABLE_CJSON_UTILS OFF) +endif() + +if(CMAKE_HOST_WIN32) + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_PUBLIC_SYMBOLS) +else() + set(ENABLE_PUBLIC_SYMBOLS OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_SHARED_AND_STATIC_LIBS=OFF + -DCJSON_OVERRIDE_BUILD_SHARED_LIBS=OFF + -DENABLE_PUBLIC_SYMBOLS=${ENABLE_PUBLIC_SYMBOLS} + -DENABLE_TARGET_EXPORT=ON # Export CMake config files + -DENABLE_CJSON_UTILS=${ENABLE_CJSON_UTILS} + -DENABLE_CJSON_TEST=OFF + -DENABLE_FUZZING=OFF +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cJSON) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share +) + +file(READ ${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h _contents) +if(ENABLE_PUBLIC_SYMBOLS) + string(REPLACE "defined(CJSON_HIDE_SYMBOLS)" "0 /* defined(CJSON_HIDE_SYMBOLS) */" _contents "${_contents}") + string(REPLACE "defined(CJSON_EXPORT_SYMBOLS)" "0 /* defined(CJSON_EXPORT_SYMBOLS) */" _contents "${_contents}") + string(REPLACE "defined(CJSON_IMPORT_SYMBOLS)" "1 /* defined(CJSON_IMPORT_SYMBOLS) */" _contents "${_contents}") +else() + string(REPLACE "defined(CJSON_HIDE_SYMBOLS)" "1 /* defined(CJSON_HIDE_SYMBOLS) */" _contents "${_contents}") +endif() +file(WRITE ${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h "${_contents}") + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +# CMake integration test +vcpkg_test_cmake(PACKAGE_NAME ${PORT}) -- cgit v1.2.3 From 8f0af187d2030c05fceefdbf88f7fee172a717ba Mon Sep 17 00:00:00 2001 From: MikeGitb Date: Wed, 29 May 2019 23:31:29 +0200 Subject: [benchmark] Fix Ref and Hash (#6675) Ref is missing the patch number (resulting in an invalid download url) and the hash doesn't fit either. --- ports/benchmark/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/benchmark/portfile.cmake b/ports/benchmark/portfile.cmake index bdc564ada..76cdfb437 100644 --- a/ports/benchmark/portfile.cmake +++ b/ports/benchmark/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/benchmark - REF v1.5 - SHA512 a57122340c4f9a8e434ec70098916aef7c49d5d8312a30e4753f54bacc1099b146698b66c12f9ef116f7cadc93c604809a905c0e259aecf63aa2553390a1b609 + REF v1.5.0 + SHA512 a0df9aa3d03f676e302c76d83b436de36eea0a8517ab50a8f5a11c74ccc68a1f5128fa02474901002d8e6b5a4d290ef0272a798ff4670eab3e2d78dc86bb6cd3 HEAD_REF master ) -- cgit v1.2.3 From 69d360520460fe6f58b59adc709d526f9a9be248 Mon Sep 17 00:00:00 2001 From: eao197 Date: Thu, 30 May 2019 00:34:54 +0300 Subject: RESTinio updated to v.0.4.9.1 (#6669) --- ports/restinio/CONTROL | 2 +- ports/restinio/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/restinio/CONTROL b/ports/restinio/CONTROL index 1444f330f..db9057456 100644 --- a/ports/restinio/CONTROL +++ b/ports/restinio/CONTROL @@ -1,4 +1,4 @@ Source: restinio -Version: 0.4.9 +Version: 0.4.9.1 Description: A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests. Build-Depends: asio, fmt, http-parser diff --git a/ports/restinio/portfile.cmake b/ports/restinio/portfile.cmake index fa8e0c587..cbb9315fb 100644 --- a/ports/restinio/portfile.cmake +++ b/ports/restinio/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO sobjectizerteam/restinio-0.4 - REF v.0.4.9 - SHA512 a839d3178d89e954bd47a40c7468e1ab2b34786c0122897620d9d8cff36e9d2c50b5e93d0774f7bdba8a17f91ea7dc2730135a6cdcb76aad5d8f5079ee1d9fdd + REF v.0.4.9.1 + SHA512 e1bd27c08331b2994ce1be140502c9d7166cc997fd79f4380ea3400106f11a2cad25c72b9d0a0b2bf11c15ce9f895522e7aea41a5f2620e30752eded78869a62 ) vcpkg_configure_cmake( -- cgit v1.2.3