callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* New patch, 010_fix-stuc-vs-stub-typo, to replace "stuc" with "stub" in

Browse Source 
gtk/Makefile.am; from HEAD, not commited in the gtk-2-10 branch.
* New patch, 011_directfb-build-fixes-from-head, to backport directfb
  build fixes; from HEAD not commited in the gtk-2-10 branch.  Thanks
  Attilio Fiandrotti for pointing me at the actual log entry.
* Refresh 070_mandatory-relibtoolize accordingly.
This commit is contained in:
Loïc Minier
2006-09-24 09:55:05 +00:00
parent 40809d6bfa
commit 867348fd00
5 changed files with 250 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
debian/patches/011_directfb-build-fixes-from-head.patch vendored Normal file
View File

@ -0,0 +1,61 @@
Index: gtk+2.0-2.10.4/gdk/directfb/gdkcolor-directfb.c
===================================================================
--- gtk+2.0-2.10.4.orig/gdk/directfb/gdkcolor-directfb.c 2006-09-24 11:28:43.000000000 +0200
+++ gtk+2.0-2.10.4/gdk/directfb/gdkcolor-directfb.c 2006-09-24 11:33:24.000000000 +0200
@@ -38,12 +38,10 @@
#include <stdlib.h>
#include <string.h>
+#include "gdkcolor.h"
+#include "gdkinternals.h"
#include "gdkdirectfb.h"
#include "gdkprivate-directfb.h"
-
-#include "gdkinternals.h"
-
-#include "gdkcolor.h"
#include "gdkalias.h"
@@ -618,6 +616,5 @@
private->info[255].ref_count++;
}
-
#define __GDK_COLOR_X11_C__
#include "gdkaliasdef.c"
Index: gtk+2.0-2.10.4/gdk/directfb/gdkwindow-directfb.c
===================================================================
--- gtk+2.0-2.10.4.orig/gdk/directfb/gdkwindow-directfb.c 2006-09-24 11:29:06.000000000 +0200
+++ gtk+2.0-2.10.4/gdk/directfb/gdkwindow-directfb.c 2006-09-24 11:34:19.000000000 +0200
@@ -2990,6 +2990,12 @@
iface->process_updates = gdk_window_impl_directfb_process_updates;
}
+void
+gdk_window_beep (GdkWindow *window)
+{
+ gdk_display_beep (gdk_display_get_default());
+}
+
#define __GDK_WINDOW_X11_C__
#include "gdkaliasdef.c"
Index: gtk+2.0-2.10.4/gdk/directfb/Makefile.am
===================================================================
--- gtk+2.0-2.10.4.orig/gdk/directfb/Makefile.am 2006-09-24 11:29:12.000000000 +0200
+++ gtk+2.0-2.10.4/gdk/directfb/Makefile.am 2006-09-24 11:34:51.000000000 +0200
@@ -4,12 +4,11 @@
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdk-DirectFB\" \
+ -DGDK_COMPILATION \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
-DG_DISABLE_DEPRECATED \
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GDK_DEP_CFLAGS@