fltk: improve deps (#4235)

* fltk: improve deps

* fix linux deps

* fix deps

* test 1.3.9

* fix libxfixes

* Update xmake.lua

* patch cmake

* limit plat

packages/f/fltk/patches/1.3.9/cmake-fluid.patch

@@ -0,0 +1,20 @@
+diff --git a/CMake/export.cmake b/CMake/export.cmake
+index 6e8bc5d..e1983f3 100644
+--- a/CMake/export.cmake
++++ b/CMake/export.cmake
+@@ -20,6 +20,7 @@
+ #######################################################################
+ 
+ # Set the fluid executable path
++if (FLTK_BUILD_FLUID)
+ if (CMAKE_CROSSCOMPILING)
+   find_file(FLUID_PATH
+     NAMES fluid fluid.exe
+@@ -37,6 +38,7 @@ else ()
+   set (FLTK_FLUID_EXECUTABLE fluid)
+   set (FLUID fluid) # export
+ endif (CMAKE_CROSSCOMPILING)
++endif ()
+ 
+ add_subdirectory(src)
+ 

packages/f/fltk/xmake.lua

@@ -1,15 +1,22 @@
 package("fltk")
-
     set_homepage("https://www.fltk.org")
     set_description("Fast Light Toolkit")
-    set_urls("https://github.com/fltk/fltk/archive/d7985607d6dd8308f104d84c778080731fa23c9a.zip")
-    add_versions("1.4.0", "43d398ab068732cb1debd9a98d124e47c9da6f53cdf3e36f22868a54cca0c371")
-    add_deps("cmake")
 
-    if is_host("linux") then
-        add_configs("pango",   {description = "Use pango for font support", default = false, type = "boolean"})
-        add_configs("xft",     {description = "Use libXft for font support", default = false, type = "boolean"})
+    add_urls("https://www.fltk.org/pub/fltk/$(version)/fltk-$(version)-source.tar.bz2", {alias = "home"})
+    add_urls("https://github.com/fltk/fltk/archive/refs/tags/release-$(version).tar.gz", {alias = "github"})
+    add_urls("https://github.com/fltk/fltk.git")
+
+    add_versions("home:1.3.9", "103441134915402808fd45424d4061778609437e804334434e946cfd26b196c2")
+    add_versions("github:1.3.9", "f30661851a61f1931eaaceb9ef4005584c85cb07fd7ffc38a645172b8e4eb3df")
+
+    add_patches("1.3.9", "patches/1.3.9/cmake-fluid.patch", "06ee1e82a74651a0b4ba4b386e5e5436d8b95584330d02a8a2c53351210a9127")
+
+    if is_plat("linux") then
+        add_configs("pango", {description = "Use pango for font support", default = false, type = "boolean"})
+        add_configs("xft", {description = "Use libXft for font support", default = false, type = "boolean"})
     end
+    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")
@@ -18,13 +25,19 @@ package("fltk")
     elseif is_plat("android") then
         add_syslinks("android")
         add_syslinks("dl")
-    else
+    elseif is_plat("linux") then
         add_syslinks("dl", "pthread")
         add_deps("libx11", "libxext", "libxinerama", "libxcursor", "libxrender", "libxfixes", "fontconfig") 
     end
 
+    add_deps("cmake")
+    add_deps("zlib", "libpng", "libjpeg")
+
     on_load(function (package)
-        if is_plat("linux") then
+        if package:is_plat("linux") then
+            if package:version() and package:version():eq("1.3.9") then
+                assert(package:config("fluid"), "Unsupported fluid on linux")
+            end
             if package:config("pango") then 
                 package:add("deps", "pango-1.0", "pangoxft-1.0", "gobject-2.0", "cairo", "pangocairo-1.0")
             end
@@ -34,30 +47,26 @@ package("fltk")
         end
     end)
 
-    on_install("macosx", "windows", "mingw", "linux", "android", function (package)
-        local configs = {}
+    on_install("windows|x86", "windows|x64", "linux", "macosx", "mingw", "msys", function (package)
+        for _, file in ipairs(os.files("**.cxx")) do
+            io.replace(file, "<libpng/png.h>", "<png.h>", {plain = true})
+        end
+
+        local configs = {
+            "-DFLTK_BUILD_TEST=OFF",
+            "-DFLTK_BUILD_EXAMPLES=OFF",
+            "-DOPTION_USE_SYSTEM_LIBPNG=ON",
+            "-DOPTION_USE_SYSTEM_ZLIB=ON",
+            "-DOPTION_USE_SYSTEM_LIBJPEG=ON"
+        }
+        table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
         table.insert(configs, "-DOPTION_BUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
-        table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
-        table.insert(configs, "-DFLTK_BUILD_TEST=OFF")
+        table.insert(configs, "-DFLTK_MSVC_RUNTIME_DLL=" .. (package:has_runtime("MD") and "ON" or "OFF"))
+        table.insert(configs, "-DFLTK_BUILD_FLUID=" .. (package:config("fluid") and "ON" or "OFF"))
+        table.insert(configs, "-DFLTK_BUILD_FORMS=" .. (package:config("forms") and "ON" or "OFF"))
         if package:is_plat("linux") then
-            table.insert(configs, "-DOPTION_USE_SYSTEM_LIBPNG=OFF")
-            table.insert(configs, "-DOPTION_USE_SYSTEM_ZLIB=OFF")
-            table.insert(configs, "-DOPTION_USE_SYSTEM_LIBJPEG=OFF")
-            if package:config("pango") then 
-                table.insert(configs, "-DOPTION_USE_PANGO=ON")
-            else 
-                table.insert(configs, "-DOPTION_USE_PANGO=OFF")
-            end 
-            if package:config("xft") then 
-                table.insert(configs, "-DOPTION_USE_XFT=ON")
-            else 
-                table.insert(configs, "-DOPTION_USE_XFT=OFF")
-            end
-        end
-        if package:is_plat("android") then
-            table.insert(configs, "-DOPTION_USE_SYSTEM_LIBPNG=OFF")
-            table.insert(configs, "-DOPTION_USE_SYSTEM_ZLIB=OFF")
-            table.insert(configs, "-DOPTION_USE_SYSTEM_LIBJPEG=OFF")
+            table.insert(configs, "-DOPTION_USE_PANGO=" .. (package:config("pango") and "ON" or "OFF"))
+            table.insert(configs, "-DOPTION_USE_XFT=" .. (package:config("xft") and "ON" or "OFF"))
         end
         import("package.tools.cmake").install(package, configs)
     end)