Patch to fix linuxfb build



Hi,

while updating cooker packages, I found linuxfb backend build is broken
in gtk+ 2.4.0.

The attached patch fixes the problem (well, I'm not 100% confident with
the _gdk_windowing_window_destroy_foreign part).

Permission to commit to CVS ? 
-- 
Frederic Crozat <fcrozat mandrakesoft com>
Mandrakesoft
--- gtk+-2.4.0/gdk/linux-fb/gdkfont-fb.c.linuxfb	2004-03-06 19:54:34.000000000 +0100
+++ gtk+-2.4.0/gdk/linux-fb/gdkfont-fb.c	2004-04-02 18:12:57.584440579 +0200
@@ -34,7 +34,8 @@
 
 #include <pango/pango.h>
 
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 #if !defined(FREETYPE_MAJOR) || FREETYPE_MAJOR != 2
 #error "We need Freetype 2.0"
 #endif
--- gtk+-2.4.0/gdk/linux-fb/gdkprivate-fb.h.linuxfb	2003-05-27 23:20:58.000000000 +0200
+++ gtk+-2.4.0/gdk/linux-fb/gdkprivate-fb.h	2004-04-02 18:12:57.585440589 +0200
@@ -38,7 +38,8 @@
 #include "gdkregion-generic.h"
 #include <linux/fb.h>
 #include <stdio.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 #define GDK_TYPE_DRAWABLE_IMPL_FBDATA (gdk_drawable_impl_fb_get_type ())
 #define GDK_DRAWABLE_IMPL_FBDATA(win) ((GdkDrawableFBData *)((GdkWindowObject *)(win))->impl)
--- gtk+-2.4.0/gdk/linux-fb/gdkwindow-fb.c.linuxfb	2004-03-06 19:54:35.000000000 +0100
+++ gtk+-2.4.0/gdk/linux-fb/gdkwindow-fb.c	2004-04-02 18:29:26.573044524 +0200
@@ -1440,7 +1440,7 @@
 }
 
 void
-gdk_window_set_background (const GdkWindow *window,
+gdk_window_set_background (GdkWindow *window,
 			   const GdkColor  *color)
 {
   GdkWindowObject *private = (GdkWindowObject *)window;
@@ -2342,3 +2342,9 @@
 
   return (GdkWindow*) (anid);
 }
+
+void
+_gdk_windowing_window_destroy_foreign (GdkWindow *window)
+{
+  _gdk_windowing_window_destroy (window, TRUE, TRUE);
+}
--- gtk+-2.4.0/gdk/linux-fb/gdkdrawable-fb2.c.linuxfb	2004-03-06 19:54:34.000000000 +0100
+++ gtk+-2.4.0/gdk/linux-fb/gdkdrawable-fb2.c	2004-04-02 18:12:57.587440608 +0200
@@ -5,7 +5,8 @@
 #include <gdkregion-generic.h>
 
 #include <pango/pangoft2.h>
-#include <freetype/ftglyph.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 #ifndef g_alloca
 #define g_alloca alloca


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]