Fix for gtkmm_demowindow.cc getc_unlocked

mlt · mlt · commit 0e883dc85ded · 2015-04-27T14:14:35.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,8 +34,6 @@ GET(${ATKMM_DIR_URL}/${ATKMM_DIR}.tar.xz)
 GET(${CAIROMM_DIR_URL}/${CAIROMM_DIR}.tar.gz)
 GET(${GLIBMM_DIR_URL}/${GLIBMM_DIR}.tar.xz)
 GET(${GTKMM_DIR_URL}/${GTKMM_DIR}.tar.xz)
-execute_process(COMMAND patch -p0 -i ${CMAKE_CURRENT_SOURCE_DIR}/patches/gtkmm_demowindow_cc.patch
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${GTKMM_DIR})
 GET(${PANGOMM_DIR_URL}/${PANGOMM_DIR}.tar.xz)
 GET(${SIGC_DIR_URL}/${SIGC_DIR}.tar.xz)
 GET(${XMLMM_DIR_URL}/${XMLMM_DIR}.tar.xz)
diff --git a/gtkmm/demos/gtk-demo/CMakeLists.txt b/gtkmm/demos/gtk-demo/CMakeLists.txt
@@ -28,6 +28,8 @@ main.cc
 textwidget.cc
 )
 
+add_definitions(-DHAVE_GETC_UNLOCKED -Dgetc_unlocked=getc)
+
 add_executable(gtkmm3-demo ${GTKMMDEMO_SRCS} )
 
 target_link_libraries(gtkmm3-demo gtkmm-${GTKMM_VERSION} gdkmm-${GTKMM_VERSION} glibmm-${GLIBMM_VERSION} giomm-${GLIBMM_VERSION} atkmm-${ATKMM_VERSION} pangomm-${PANGOMM_VERSION} sigc-${SIGC_VERSION} cairomm-${CAIROMM_VERSION} ) #gtk-${GtkApiVersion})
diff --git a/patches/gtkmm_demowindow_cc.patch b/patches/gtkmm_demowindow_cc.patch

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ main.cc`
`28`	`28`	`textwidget.cc`
`29`	`29`	`)`
`30`	`30`
	`31`	`+add_definitions(-DHAVE_GETC_UNLOCKED -Dgetc_unlocked=getc)`
	`32`	`+`
`31`	`33`	`add_executable(gtkmm3-demo ${GTKMMDEMO_SRCS} )`
`32`	`34`
`33`	`35`	`target_link_libraries(gtkmm3-demo gtkmm-${GTKMM_VERSION} gdkmm-${GTKMM_VERSION} glibmm-${GLIBMM_VERSION} giomm-${GLIBMM_VERSION} atkmm-${ATKMM_VERSION} pangomm-${PANGOMM_VERSION} sigc-${SIGC_VERSION} cairomm-${CAIROMM_VERSION} ) #gtk-${GtkApiVersion})`