update

Author: Doekin

packages/f/fltk/xmake.lua

@@ -25,8 +25,8 @@ package("fltk")
     add_configs("fluid", {description = "Build fluid", default = false, type = "boolean"})
     add_configs("forms", {description = "Build forms", default = false, type = "boolean"})
 
-    if is_plat("windows", "mingw") then
-        add_syslinks("ws2_32", "comctl32", "gdi32", "oleaut32", "ole32", "uuid", "shell32", "advapi32", "comdlg32", "winspool", "user32", "kernel32", "odbc32")
+    if is_plat("windows", "mingw", "cygwin", "msys") then
+        add_syslinks("ws2_32", "comctl32", "gdi32", "oleaut32", "ole32", "uuid", "shell32", "advapi32", "comdlg32", "winspool", "user32", "kernel32", "odbc32", "gdiplus")
     elseif is_plat("macosx") then
         add_frameworks("Cocoa")
     elseif is_plat("android") then
@@ -66,10 +66,12 @@ package("fltk")
         end
     end)
 
-    on_install("windows|x86", "windows|x64", "linux", "macosx", "mingw", "msys", function (package)
+    on_install("windows|x86", "windows|x64", "linux", "macosx", "mingw", "cygwin", "msys", function (package)
         for _, file in ipairs(os.files("**.cxx")) do
             io.replace(file, "<libpng/png.h>", "<png.h>", {plain = true})
         end
+        io.replace("CMake/options.cmake", "list(APPEND FLTK_IMAGE_LIBRARIES ${JPEG_LIBRARIES})",
+        "list(APPEND FLTK_IMAGE_LIBRARIES ${JPEG_LIBRARIES})\ninclude_directories(${JPEG_INCLUDE_DIRS})", {plain = true})
 
         local configs = {
             "-DFLTK_BUILD_TEST=OFF",

packages/l/libdecor/xmake.lua

@@ -11,7 +11,7 @@ package("libdecor")
     add_configs("gtk", {description = "Build GTK plugin", default = false, type = "boolean"})
 
     add_deps("meson", "ninja")
-    add_deps("wayland", "wayland-protocols", "cairo")
+    add_deps("wayland", "wayland-protocols", "pango")
 
     on_load(function (package)
         if package:config("dbus") then

packages/p/pango/xmake.lua

@@ -29,7 +29,7 @@ package("pango")
 
     on_install("windows|x64", "windows|x86", "macosx", "linux", function (package)
         import("package.tools.meson")
-        local configs = {"-Dintrospection=disabled", "-Dgtk_doc=false", "-Dfontconfig=enabled"}
+        local configs = {"-Dintrospection=disabled", "-Dgtk_doc=false", "-Dfontconfig=enabled", "-Dcairo=enabled"}
 
         table.insert(configs, "-Ddefault_library=" .. (package:config("shared") and "shared" or "static"))
         io.gsub("meson.build", "subdir%('tests'%)", "")