[vcpkg baseline][gdk-pixbuf] Fix build error on windows (#17528)

Co-authored-by: nicole mazzuca <[email protected]>
microsoft · Apr 28, 2021 · e01bb32 · e01bb32
1 parent b9cd2a7
commit e01bb32
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 2 deletions.
diff --git a/ports/gdk-pixbuf/fix_build_error_windows.patch b/ports/gdk-pixbuf/fix_build_error_windows.patch
@@ -0,0 +1,21 @@
+diff --git a/meson.build b/meson.build
+index b39c55d..4b050c7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -89,8 +89,14 @@ if cc.has_function('round', dependencies: mathlib_dep)
+   gdk_pixbuf_conf.set('HAVE_ROUND', 1)
+ endif
+
+-if cc.has_function('lrint', dependencies: mathlib_dep)
+-  gdk_pixbuf_conf.set('HAVE_LRINT', 1)
++if cc.get_id() == 'msvc'
++    if cc.has_function('lrint', dependencies: mathlib_dep, args: '-Oi-')
++        gdk_pixbuf_conf.set('HAVE_LRINT', 1)
++    endif
++else
++    if cc.has_function('lrint', dependencies: mathlib_dep)
++      gdk_pixbuf_conf.set('HAVE_LRINT', 1)
++    endif
+ endif
+
+ if cc.has_function('bind_textdomain_codeset', prefix: '#include <libintl.h>')
diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake
@@ -10,7 +10,9 @@ vcpkg_download_distfile(ARCHIVE
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
-    PATCHES fix_build.patch
+    PATCHES
+        fix_build.patch
+        fix_build_error_windows.patch
 )
 if(VCPKG_TARGET_IS_WINDOWS)
     #list(APPEND OPTIONS -Dnative_windows_loaders=true) # Use Windows system components to handle BMP, EMF, GIF, ICO, JPEG, TIFF and WMF images, overriding jpeg and tiff.  To build this into gdk-pixbuf, pass in windows" with the other loaders to build in or use "all" with the builtin_loaders option

diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "gdk-pixbuf",
   "version": "2.42.2",
+  "port-version": 1,
   "description": "Image loading library.",
   "homepage": "https://developer.gnome.org/gdk-pixbuf/",
   "dependencies": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2170,7 +2170,7 @@
     },
     "gdk-pixbuf": {
       "baseline": "2.42.2",
-      "port-version": 0
+      "port-version": 1
     },
     "genann": {
       "baseline": "2019-07-10",

diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f90cd0dd11fd312fe803519706f422a9207336d0",
+      "version": "2.42.2",
+      "port-version": 1
+    },
     {
       "git-tree": "609b77f244ec0d76aac5616cd8654dfcbc608297",
       "version": "2.42.2",