File 0001-Fix-build-error-on-linux-not-finding-panel... of Package mingw32-python3

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-build-error-on-linux-not-finding-panel.h.patch of Package mingw32-python3 (Revision cbc7dc771a80d7dd9d72eb71f9d6da71)

Currently displaying revision cbc7dc771a80d7dd9d72eb71f9d6da71 , Show latest

From 8b8ba91887e41f371c7cbdbf1d9ca6058fbc2d89 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Tue, 30 Aug 2022 12:19:46 +0200
Subject: [PATCH 01/12] Fix build error on linux not finding <panel.h>

../Python-3.9.10/Modules/_curses_panel.c:17 wants <panel.h>, but
find_package(Curses) returns /usr/include as include dir, which doesn't
match the expected path, which is /usr/include/ncurses.

To get this working this patch is and specifing
-DCURSES_INCLUDE_DIR=/usr/include/ncurses on cmake command line is
required.
---
 cmake/ConfigureChecks.cmake     | 1 +
 cmake/extensions/CMakeLists.txt | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index a57ee83..e600a16 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -31,6 +31,7 @@ if(USE_SYSTEM_Curses)
         find_library(GPM_LIBRARY NAMES gpm)
     endif()
 endif()
+message(STATUS "CURSES_INCLUDE_DIRS=${CURSES_INCLUDE_DIRS}")
 message(STATUS "CURSES_LIBRARIES=${CURSES_LIBRARIES}")
 message(STATUS "PANEL_LIBRARIES=${PANEL_LIBRARIES}")
 if(WITH_STATIC_DEPENDENCIES)
diff --git a/cmake/extensions/CMakeLists.txt b/cmake/extensions/CMakeLists.txt
index a66b833..5c66802 100644
--- a/cmake/extensions/CMakeLists.txt
+++ b/cmake/extensions/CMakeLists.txt
@@ -679,11 +679,13 @@ add_python_extension(_curses_panel
     REQUIRES ${curses_common_REQUIRES} PANEL_LIBRARIES "HAVE_PANEL_H OR HAVE_NCURSES_PANEL_H"
     SOURCES _curses_panel.c
     LIBRARIES ${curses_common_LIBRARIES} ${PANEL_LIBRARIES}
+    INCLUDEDIRS ${CURSES_INCLUDE_DIR}
 )
 add_python_extension(_curses
     REQUIRES ${curses_common_REQUIRES}
     SOURCES _cursesmodule.c
     LIBRARIES ${curses_common_LIBRARIES}
+    INCLUDEDIRS ${CURSES_INCLUDE_DIR}
 )
 set(dbm2_SOURCES dbmmodule.c)
 set(dbm3_SOURCES _dbmmodule.c)
-- 
2.35.3

Places

File 0001-Fix-build-error-on-linux-not-finding-panel.h.patch of Package mingw32-python3 (Revision cbc7dc771a80d7dd9d72eb71f9d6da71)

Places