diff options
| author | 李洋阳 <w703710691d@163.com> | 2021-07-27 07:42:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 16:42:48 -0700 |
| commit | f6e78c3d87b17d7e9cbbae69902501c7e7870ac9 (patch) | |
| tree | f731c47f016e7045e98673dbdb99d3984dd35523 | |
| parent | f503c5d38456a99ab3864ddd065ffb9743cccefa (diff) | |
| download | vcpkg-f6e78c3d87b17d7e9cbbae69902501c7e7870ac9.tar.gz vcpkg-f6e78c3d87b17d7e9cbbae69902501c7e7870ac9.zip | |
[duilib] Enable unicode define (#17745)
* duilib enable unicode define
* duilib version modify git-tree
* update duilib version files
* update duilib control and version files
* modify duilib cmake tab to space
* duilib remove unnecessary space char
* duilib update version file
* Update versions/baseline.json
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update ports/duilib/CONTROL
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update versions/d-/duilib.json
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* fix duilib version file
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
| -rw-r--r-- | ports/duilib/CONTROL | 4 | ||||
| -rw-r--r-- | ports/duilib/enable-unicode-for-vcpkg.patch | 15 | ||||
| -rw-r--r-- | ports/duilib/portfile.cmake | 7 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/d-/duilib.json | 5 |
5 files changed, 29 insertions, 6 deletions
diff --git a/ports/duilib/CONTROL b/ports/duilib/CONTROL index cb4c7ed3f..be7173359 100644 --- a/ports/duilib/CONTROL +++ b/ports/duilib/CONTROL @@ -1,3 +1,5 @@ Source: duilib
-Version: 2019-4-28-2
+Version: 2019-4-28
+Port-Version: 3
Description: Duilib is a free open source DirectUI interface library under Windows. It is widely accepted by major Internet companies due to its simple and easy to expand design and stable and efficient implementation. It is widely used in IM, video client, stock market software, navigation software, and mobile phone assistive software. Duilib is still evolving, and will continue to improve in many aspects such as documentation, examples, animations, and rendering engines.
+Homepage: https://github.com/duilib/duilib
diff --git a/ports/duilib/enable-unicode-for-vcpkg.patch b/ports/duilib/enable-unicode-for-vcpkg.patch new file mode 100644 index 000000000..1d0aa02da --- /dev/null +++ b/ports/duilib/enable-unicode-for-vcpkg.patch @@ -0,0 +1,15 @@ +diff --git a/DuiLib/CMakeLists.txt b/DuiLib/CMakeLists.txt +index 835d430..b178984 100644 +--- a/DuiLib/CMakeLists.txt ++++ b/DuiLib/CMakeLists.txt +@@ -2,6 +2,9 @@ + #Author Qi Gao(monkgau@gmail.com) + #Created: 2012/09/16 + ++#if use vcpkg to build, need to add extra unicode definitions ++add_definitions(-DUNICODE -D_UNICODE) ++ + aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} Root_src) + aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/Control Control_src) + aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/Core Core_src) + diff --git a/ports/duilib/portfile.cmake b/ports/duilib/portfile.cmake index e4153b133..272691914 100644 --- a/ports/duilib/portfile.cmake +++ b/ports/duilib/portfile.cmake @@ -1,14 +1,15 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO duilib/duilib
- REF d7f3a331a0fc6ba48429cd9e5c427570cc73bc35
- SHA512 6381cac467d42e4811859411a5fa620e52075622e8fbec38a6ab320c33bc7d6fdddc809c150d6a10cc40c55a651345bda9387432898d24957b6ab0f5c4b5391c
+ REF d7f3a331a0fc6ba48429cd9e5c427570cc73bc35
+ SHA512 6381cac467d42e4811859411a5fa620e52075622e8fbec38a6ab320c33bc7d6fdddc809c150d6a10cc40c55a651345bda9387432898d24957b6ab0f5c4b5391c
HEAD_REF master
PATCHES
"fix-post-build-errors.patch"
"fix-arm-build.patch"
"fix-encoding.patch"
"enable-static.patch"
+ "enable-unicode-for-vcpkg.patch"
)
vcpkg_configure_cmake(
@@ -33,4 +34,4 @@ else() file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
endif()
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/duilib RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/versions/baseline.json b/versions/baseline.json index ff4f8eb60..559b59b85 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1777,8 +1777,8 @@ "port-version": 0 }, "duilib": { - "baseline": "2019-4-28-2", - "port-version": 0 + "baseline": "2019-4-28", + "port-version": 3 }, "duktape": { "baseline": "2.5.0", diff --git a/versions/d-/duilib.json b/versions/d-/duilib.json index ca3a95a02..9faceb990 100644 --- a/versions/d-/duilib.json +++ b/versions/d-/duilib.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "58b8c9eb93832387ea6efc1ae1071395cd4a22d2", + "version-string": "2019-4-28", + "port-version": 3 + }, + { "git-tree": "d1a36d9e38313306f28b94d238e120deabfec9ea", "version-string": "2019-4-28-2", "port-version": 0 |