pkgsrc/x11/gtoolkit/patches/patch-aa
rh 5ded55713e Make this compile with gcc-3.
Adjust PLIST to reflect (not so) new gnustep hierarchy.
While at it, convert to buildlink3.
Bump PKGREVISION.
2004-04-17 00:26:48 +00:00

62 lines
1.6 KiB
Text

$NetBSD: patch-aa,v 1.1 2004/04/17 00:26:48 rh Exp $
--- GToolKit/GToolKit.m.orig 2002-02-22 01:43:52.000000000 +1000
+++ GToolKit/GToolKit.m
@@ -2550,6 +2550,17 @@
#include <GToolKit/GTKWidget.h>
#include <GToolKit/GTKAccelGroup.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <Foundation/NSAutoreleasePool.h>
+#if defined (DEBUG) && defined (HAVE_OBJC_OBJC_API_H)
+#include <objc/objc-api.h>
+#endif
+
@implementation GTKItemFactory
+ (GtkType) getType
{
@@ -2651,17 +2662,6 @@
{
gtk_item_factory_set_translate_func(gtk, func , data , notify);
}
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <Foundation/NSAutoreleasePool.h>
-#if defined (DEBUG) && defined (HAVE_OBJC_OBJC_API_H)
-#include <objc/objc-api.h>
-#endif
-
static void item_forward_signal (gpointer data, guint action, GtkWidget *widget)
{
@@ -6376,6 +6376,10 @@ static void destroy_notify (GTKObject *s
#include <GToolKit/GTKWidget.h>
#include <GToolKit/GTKAccelGroup.h>
+#include <gtk/gtksignal.h>
+#include <Foundation/NSAutoreleasePool.h>
+#include <Foundation/NSNotification.h>
+
@implementation GTKWindow
+ (GtkType) getType
{
@@ -6437,10 +6441,6 @@ static void destroy_notify (GTKObject *s
{
gtk_window_set_modal(gtk, modal);
}
-#include <gtk/gtksignal.h>
-#include <Foundation/NSAutoreleasePool.h>
-#include <Foundation/NSNotification.h>
-
NSString *GTKWindowDidBecomeMainNotification = @"GTKWindowDidBecomeMain";
NSString *GTKWindowDidResignMainNotification = @"GTKWindowDidResignMain";