diff options
| author | angelmixu <salemixu@gmail.com> | 2020-06-05 21:09:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-05 12:09:14 -0700 |
| commit | f3c92f82d6d28f48d3df0c5a8c228e1f4298a7ff (patch) | |
| tree | fad80b7cc3ce30365e6959d5b8f40926faab9b21 | |
| parent | ec7c7afbe7576598a75a33d6c1d6162dcbc3fe27 (diff) | |
| download | vcpkg-f3c92f82d6d28f48d3df0c5a8c228e1f4298a7ff.tar.gz vcpkg-f3c92f82d6d28f48d3df0c5a8c228e1f4298a7ff.zip | |
[librsvg] Fix for macOS (#11722)
* fix librsvg
* fix for linux dependencies
* fix for linux dependencies (retry)
* increase control port version
Co-authored-by: Angel Sánchez <angelsanchez@inedit.com>
| -rw-r--r-- | ports/librsvg/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | ports/librsvg/CONTROL | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ports/librsvg/CMakeLists.txt b/ports/librsvg/CMakeLists.txt index 749d3132b..b3b3ca892 100644 --- a/ports/librsvg/CMakeLists.txt +++ b/ports/librsvg/CMakeLists.txt @@ -5,11 +5,19 @@ find_package(unofficial-cairo CONFIG REQUIRED) find_package(unofficial-libcroco CONFIG REQUIRED) find_package(unofficial-glib CONFIG REQUIRED) find_package(LibXml2 REQUIRED) -find_library(PANGO_LIB pango-1.0) -find_library(PANGO_CAIRO_LIB pangocairo-1.0) if(CMAKE_SYSTEM_NAME MATCHES "Windows") + find_library(PANGO_LIB pango-1.0) + find_library(PANGO_CAIRO_LIB pangocairo-1.0) find_library(GDK_PIXBUF_LIB gdk_pixbuf-2.0) +elseif(CMAKE_SYSTEM_NAME MATCHES "Linux") + find_library(PANGO_LIB pango-1.0) + find_library(PANGO_CAIRO_LIB pangocairo-1.0) + find_library(GDK_PIXBUF_LIB gdk_pixbuf-2) else() + find_library(PANGO_LIB pango-1) + find_library(PANGO_CAIRO_LIB pangocairo-1) + find_library(PANGO_FT2_LIB pangoft2-1) + find_library(FONTCONFIG_LIB fontconfig) find_library(GDK_PIXBUF_LIB gdk_pixbuf-2) endif() @@ -112,6 +120,8 @@ target_link_libraries(rsvg-2.40 PRIVATE ${PANGO_LIB} ${PANGO_CAIRO_LIB} ${GDK_PIXBUF_LIB} + ${PANGO_FT2_LIB} + ${FONTCONFIG_LIB} ) target_link_libraries(pixbufloader-svg PRIVATE rsvg-2.40 diff --git a/ports/librsvg/CONTROL b/ports/librsvg/CONTROL index 3a250b8d4..ec60e76f1 100644 --- a/ports/librsvg/CONTROL +++ b/ports/librsvg/CONTROL @@ -1,4 +1,4 @@ Source: librsvg
-Version: 2.40.20
+Version: 2.40.20-1
Description: A small library to render Scalable Vector Graphics (SVG)
Build-Depends: cairo, pango, gdk-pixbuf, libcroco
\ No newline at end of file |