From 01b10260c558587b6520bd458d3f9b2ec6e70ce4 Mon Sep 17 00:00:00 2001 From: angelmixu Date: Wed, 3 Jun 2020 07:34:47 +0200 Subject: [PATCH] [gdk-pixbuf] GdkPixbuf fix for building on macOS (#11721) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix for building on macOS * increase control port version Co-authored-by: Angel Sánchez --- ports/gdk-pixbuf/CMakeLists.txt | 9 +++++---- ports/gdk-pixbuf/CONTROL | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ports/gdk-pixbuf/CMakeLists.txt b/ports/gdk-pixbuf/CMakeLists.txt index b370a19174..cdc5c3fb80 100644 --- a/ports/gdk-pixbuf/CMakeLists.txt +++ b/ports/gdk-pixbuf/CMakeLists.txt @@ -12,9 +12,10 @@ find_package(PNG REQUIRED) find_package(unofficial-glib CONFIG REQUIRED) find_path(GLIB_INCLUDE_DIR glib.h) +find_package(unofficial-gettext CONFIG REQUIRED) +find_path(LIBINTL_INCLUDE_DIR libintl.h) + if(WIN32) - find_package(unofficial-gettext CONFIG REQUIRED) - find_path(LIBINTL_INCLUDE_DIR libintl.h) configure_file(${CMAKE_SOURCE_DIR}/config.h.win32 ${CMAKE_SOURCE_DIR}/config.h COPYONLY) else() configure_file(${CMAKE_SOURCE_DIR}/config.h.linux ${CMAKE_SOURCE_DIR}/config.h COPYONLY) @@ -68,12 +69,12 @@ target_include_directories(gdk-pixbuf PRIVATE ${LIBINTL_INCLUDE_DIR}) set(LIBS - unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject + unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject unofficial::gettext::libintl ${ZLIB_LIBRARIES} ${PNG_LIBRARIES} ) if(WIN32) - list(APPEND LIBS Gdiplus ole32 unofficial::gettext::libintl) + list(APPEND LIBS Gdiplus ole32) else() list(APPEND LIBS m) endif() diff --git a/ports/gdk-pixbuf/CONTROL b/ports/gdk-pixbuf/CONTROL index 369cd0d50d..229973bc88 100644 --- a/ports/gdk-pixbuf/CONTROL +++ b/ports/gdk-pixbuf/CONTROL @@ -1,5 +1,5 @@ Source: gdk-pixbuf -Version: 2.36.9-4 +Version: 2.36.9-5 Homepage: https://developer.gnome.org/gdk-pixbuf/ Description: Image loading library. Build-Depends: gettext, zlib, libpng, glib