diff options
| author | MichaĆ Janiszewski <janisozaur@users.noreply.github.com> | 2019-11-03 23:10:24 +0100 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-11-03 14:10:24 -0800 |
| commit | 46bfec7eb9295e1caf013532c63be5485002a769 (patch) | |
| tree | 5f9692245228a1d42863352d2b3b79bc913831d7 | |
| parent | 08e74979df124d9360343751cefcae615c2ec5ed (diff) | |
| download | vcpkg-46bfec7eb9295e1caf013532c63be5485002a769.tar.gz vcpkg-46bfec7eb9295e1caf013532c63be5485002a769.zip | |
[pango] Add missing link library (#8745)
Gdi32 is used by pango, but not linked to. This works on x86, but not on
ARM.
| -rw-r--r-- | ports/pango/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ports/pango/CONTROL | 10 | ||||
| -rw-r--r-- | ports/pango/portfile.cmake | 58 |
3 files changed, 35 insertions, 35 deletions
diff --git a/ports/pango/CMakeLists.txt b/ports/pango/CMakeLists.txt index f0e6d85e7..a505a5b65 100644 --- a/ports/pango/CMakeLists.txt +++ b/ports/pango/CMakeLists.txt @@ -118,7 +118,7 @@ pango_add_module(pangowin32 pango/pangowin32-fontcache.c pango/pangowin32-fontmap.c pango/pangowin32-shape.c) -target_link_libraries(pangowin32 usp10 pango) +target_link_libraries(pangowin32 usp10 pango gdi32) endif() pango_add_module(pangoft2 diff --git a/ports/pango/CONTROL b/ports/pango/CONTROL index c221c1e37..62220dbef 100644 --- a/ports/pango/CONTROL +++ b/ports/pango/CONTROL @@ -1,5 +1,5 @@ -Source: pango
-Version: 1.40.11-4
-Homepage: https://ftp.gnome.org/pub/GNOME/sources/pango/
-Description: Text and font handling library.
-Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz[glib] (!(windows&static))
+Source: pango +Version: 1.40.11-5 +Homepage: https://ftp.gnome.org/pub/GNOME/sources/pango/ +Description: Text and font handling library. +Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz[glib] (!(windows&static)) diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index 926efd98d..699343fdc 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -1,29 +1,29 @@ -include(vcpkg_common_functions)
-
-set(PANGO_VERSION 1.40.11)
-vcpkg_download_distfile(ARCHIVE
- URLS "http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-${PANGO_VERSION}.tar.xz"
- FILENAME "pango-${PANGO_VERSION}.tar.xz"
- SHA512 e4ac40f8da9c326e1e4dfaf4b1d2070601b17f88f5a12991a9a8bbc58bb08640404e2a794a5c68c5ebb2e7e80d9c186d4b26cd417bb63a23f024ef8a38bb152a)
-
-vcpkg_extract_source_archive_ex(
- OUT_SOURCE_PATH SOURCE_PATH
- ARCHIVE ${ARCHIVE}
- REF ${PANGO_VERSION}
- PATCHES 0001-fix-static-symbols-export.diff
-)
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.unix DESTINATION ${SOURCE_PATH})
-
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
- OPTIONS_DEBUG
- -DPANGO_SKIP_HEADERS=ON
-)
-
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/pango)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/pango/COPYING ${CURRENT_PACKAGES_DIR}/share/pango/copyright)
+include(vcpkg_common_functions) + +set(PANGO_VERSION 1.40.11) +vcpkg_download_distfile(ARCHIVE + URLS "http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-${PANGO_VERSION}.tar.xz" + FILENAME "pango-${PANGO_VERSION}.tar.xz" + SHA512 e4ac40f8da9c326e1e4dfaf4b1d2070601b17f88f5a12991a9a8bbc58bb08640404e2a794a5c68c5ebb2e7e80d9c186d4b26cd417bb63a23f024ef8a38bb152a) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${PANGO_VERSION} + PATCHES 0001-fix-static-symbols-export.diff +) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.unix DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DPANGO_SKIP_HEADERS=ON +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/pango) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/pango/COPYING ${CURRENT_PACKAGES_DIR}/share/pango/copyright) |
