From 82bd0b66522dbdfcfe6274157bb2eaedd3c8051e Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Fri, 15 Mar 2024 09:43:35 +0100
Subject: Have FLTK use libdecor at version > 0.2.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- it's no longer necessary to take care of the change in the layout of "struct libdecor"
between versions ≤ 0.2.2 and > 0.2.2 of libdecor
- version > 0.2.2 contains MR131, that is, it defines LIBDECOR_WINDOW_STATE_RESIZING
so the hack to emulate it is no longer  necessary
- CMake option FLTK_USE_SYSTEM_LIBDECOR now requires libdecor version > 0.2.2
to be activated, otherwise the bundled libdecor is used
- what will be the libdecor version after 0.2.2 (0.2.3? 0.3.0?) is not known as of today
---
 CMake/options.cmake | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'CMake')

diff --git a/CMake/options.cmake b/CMake/options.cmake
index 3f7369641..f4adee1a0 100644
--- a/CMake/options.cmake
+++ b/CMake/options.cmake
@@ -297,7 +297,7 @@ if(UNIX)
     endif()
     unset(FLTK_GRAPHICS_CAIRO CACHE)
     set(FLTK_GRAPHICS_CAIRO TRUE CACHE BOOL "all drawing to X11 windows uses Cairo")
-    option(FLTK_USE_SYSTEM_LIBDECOR "use libdecor from the system" ON)
+    option(FLTK_USE_SYSTEM_LIBDECOR "use libdecor from the system" OFF)
     set(USE_SYSTEM_LIBDECOR 1)
     unset(FLTK_USE_XRENDER CACHE)
     unset(FLTK_USE_XINERAMA CACHE)
@@ -333,9 +333,9 @@ if(UNIX)
     unset(FLTK_USE_PANGO CACHE)
     set(FLTK_USE_PANGO TRUE CACHE BOOL "use lib Pango")
     if(FLTK_USE_SYSTEM_LIBDECOR)
-      pkg_check_modules(SYSTEM_LIBDECOR libdecor-0>=0.2.0 QUIET)
+      pkg_check_modules(SYSTEM_LIBDECOR libdecor-0>0.2.2 QUIET)
       if(NOT SYSTEM_LIBDECOR_FOUND)
-        message(STATUS "Warning: system libdecor doesn't satisfy version >= 0.2.0,")
+        message(STATUS "Warning: system libdecor doesn't satisfy version > 0.2.2,")
         message(STATUS "         using bundled libdecor library instead.")
         set(USE_SYSTEM_LIBDECOR 0)
       else()
@@ -355,10 +355,6 @@ if(UNIX)
       set(FLTK_USE_LIBDECOR_GTK ON)
     else()
       option(FLTK_USE_LIBDECOR_GTK "Allow to use libdecor's GTK plugin" ON)
-      # Temporarily, while built-in and system struct libdecor differ.
-      # Later, the version of the system libdecor will be required to have same
-      # struct libdecor as the built-in libdecor.
-      set(CMAKE_ENABLE_EXPORTS 1)
     endif(USE_SYSTEM_LIBDECOR)
 
     if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "FreeBSD")
-- 
cgit v1.2.3