Make this compile with gcc-3.

Adjust PLIST to reflect (not so) new gnustep hierarchy.
While at it, convert to buildlink3.
Bump PKGREVISION.
This commit is contained in:
rh 2004-04-17 00:26:48 +00:00
parent 22f5f4bfcd
commit 5ded55713e
6 changed files with 205 additions and 121 deletions

View file

@ -1,14 +1,15 @@
# $NetBSD: Makefile,v 1.6 2004/03/26 02:27:59 wiz Exp $
# $NetBSD: Makefile,v 1.7 2004/04/17 00:26:48 rh Exp $
#
.include "Makefile.common"
PKGREVISION= 4
PKGREVISION= 5
COMMENT= Objective-C interface to the GTK+ widget set
BUILD_DIRS= ${WRKSRC}/GToolKit
.include "../../x11/gtk/buildlink2.mk"
.include "../../x11/gnustep-back/buildlink2.mk"
.include "../../devel/libglade/buildlink2.mk"
.include "../../mk/pthread.buildlink2.mk"
.include "../../x11/gtk/buildlink3.mk"
.include "../../x11/gnustep-back/buildlink3.mk"
.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/gnustep-make/gnustep.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,17 +1,15 @@
# $NetBSD: Makefile.common,v 1.8 2004/02/14 17:21:56 jlam Exp $
# $NetBSD: Makefile.common,v 1.9 2004/04/17 00:26:48 rh Exp $
#
DISTNAME= gtoolkit-0.9.5
PKGREVISION= 1
CATEGORIES?= x11
MASTER_SITES?= ftp://ftp.inf.uos.de/pub/elmar/gtk/objc-gtoolkit/
MAINTAINER?= tech-pkg@NetBSD.org
HOMEPAGE?= http://www.informatik.uni-osnabrueck.de/elmar/projects/gtoolkit/
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
USE_GNU_TOOLS+= make
USE_X11= YES
USE_LIBTOOL= YES
USE_BUILDLINK3= yes
USE_X11= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS+= --with-gnustep
GNUSTEP_MAKEFILE= Makefile.gnustep

View file

@ -1,107 +1,107 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/09 05:19:28 rh Exp $
share/GNUstep/Local/Headers/GToolKit/GTK.h
share/GNUstep/Local/Headers/GToolKit/GTKAccelGroup.h
share/GNUstep/Local/Headers/GToolKit/GTKAccelLabel.h
share/GNUstep/Local/Headers/GToolKit/GTKAction.h
share/GNUstep/Local/Headers/GToolKit/GTKAdjustment.h
share/GNUstep/Local/Headers/GToolKit/GTKAlignment.h
share/GNUstep/Local/Headers/GToolKit/GTKApplication.h
share/GNUstep/Local/Headers/GToolKit/GTKArrow.h
share/GNUstep/Local/Headers/GToolKit/GTKAspectFrame.h
share/GNUstep/Local/Headers/GToolKit/GTKBin.h
share/GNUstep/Local/Headers/GToolKit/GTKBox.h
share/GNUstep/Local/Headers/GToolKit/GTKButton.h
share/GNUstep/Local/Headers/GToolKit/GTKButtonBox.h
share/GNUstep/Local/Headers/GToolKit/GTKCList.h
share/GNUstep/Local/Headers/GToolKit/GTKCTree.h
share/GNUstep/Local/Headers/GToolKit/GTKCalendar.h
share/GNUstep/Local/Headers/GToolKit/GTKCheckButton.h
share/GNUstep/Local/Headers/GToolKit/GTKCheckMenuItem.h
share/GNUstep/Local/Headers/GToolKit/GTKColorSelection.h
share/GNUstep/Local/Headers/GToolKit/GTKColorSelectionDialog.h
share/GNUstep/Local/Headers/GToolKit/GTKCombo.h
share/GNUstep/Local/Headers/GToolKit/GTKContainer.h
share/GNUstep/Local/Headers/GToolKit/GTKCurve.h
share/GNUstep/Local/Headers/GToolKit/GTKData.h
share/GNUstep/Local/Headers/GToolKit/GTKDialog.h
share/GNUstep/Local/Headers/GToolKit/GTKDrawingArea.h
share/GNUstep/Local/Headers/GToolKit/GTKEditable.h
share/GNUstep/Local/Headers/GToolKit/GTKEntry.h
share/GNUstep/Local/Headers/GToolKit/GTKEventBox.h
share/GNUstep/Local/Headers/GToolKit/GTKFileSelection.h
share/GNUstep/Local/Headers/GToolKit/GTKFixed.h
share/GNUstep/Local/Headers/GToolKit/GTKFontSelection.h
share/GNUstep/Local/Headers/GToolKit/GTKFontSelectionDialog.h
share/GNUstep/Local/Headers/GToolKit/GTKFrame.h
share/GNUstep/Local/Headers/GToolKit/GTKGammaCurve.h
share/GNUstep/Local/Headers/GToolKit/GTKGladeXML.h
share/GNUstep/Local/Headers/GToolKit/GTKHBox.h
share/GNUstep/Local/Headers/GToolKit/GTKHButtonBox.h
share/GNUstep/Local/Headers/GToolKit/GTKHPaned.h
share/GNUstep/Local/Headers/GToolKit/GTKHRuler.h
share/GNUstep/Local/Headers/GToolKit/GTKHScale.h
share/GNUstep/Local/Headers/GToolKit/GTKHScrollbar.h
share/GNUstep/Local/Headers/GToolKit/GTKHSeparator.h
share/GNUstep/Local/Headers/GToolKit/GTKHandleBox.h
share/GNUstep/Local/Headers/GToolKit/GTKImage.h
share/GNUstep/Local/Headers/GToolKit/GTKInputDialog.h
share/GNUstep/Local/Headers/GToolKit/GTKInvisible.h
share/GNUstep/Local/Headers/GToolKit/GTKItem.h
share/GNUstep/Local/Headers/GToolKit/GTKItemFactory.h
share/GNUstep/Local/Headers/GToolKit/GTKLabel.h
share/GNUstep/Local/Headers/GToolKit/GTKLayout.h
share/GNUstep/Local/Headers/GToolKit/GTKList.h
share/GNUstep/Local/Headers/GToolKit/GTKListItem.h
share/GNUstep/Local/Headers/GToolKit/GTKMain.h
share/GNUstep/Local/Headers/GToolKit/GTKMenu.h
share/GNUstep/Local/Headers/GToolKit/GTKMenuBar.h
share/GNUstep/Local/Headers/GToolKit/GTKMenuFactory.h
share/GNUstep/Local/Headers/GToolKit/GTKMenuItem.h
share/GNUstep/Local/Headers/GToolKit/GTKMenuShell.h
share/GNUstep/Local/Headers/GToolKit/GTKMisc.h
share/GNUstep/Local/Headers/GToolKit/GTKNotebook.h
share/GNUstep/Local/Headers/GToolKit/GTKObject.h
share/GNUstep/Local/Headers/GToolKit/GTKOptionMenu.h
share/GNUstep/Local/Headers/GToolKit/GTKPacker.h
share/GNUstep/Local/Headers/GToolKit/GTKPaned.h
share/GNUstep/Local/Headers/GToolKit/GTKPixmap.h
share/GNUstep/Local/Headers/GToolKit/GTKPlug.h
share/GNUstep/Local/Headers/GToolKit/GTKPreview.h
share/GNUstep/Local/Headers/GToolKit/GTKProgress.h
share/GNUstep/Local/Headers/GToolKit/GTKProgressBar.h
share/GNUstep/Local/Headers/GToolKit/GTKRadioButton.h
share/GNUstep/Local/Headers/GToolKit/GTKRadioMenuItem.h
share/GNUstep/Local/Headers/GToolKit/GTKRange.h
share/GNUstep/Local/Headers/GToolKit/GTKRuler.h
share/GNUstep/Local/Headers/GToolKit/GTKScale.h
share/GNUstep/Local/Headers/GToolKit/GTKScrollbar.h
share/GNUstep/Local/Headers/GToolKit/GTKScrolledWindow.h
share/GNUstep/Local/Headers/GToolKit/GTKSeparator.h
share/GNUstep/Local/Headers/GToolKit/GTKSocket.h
share/GNUstep/Local/Headers/GToolKit/GTKSpinButton.h
share/GNUstep/Local/Headers/GToolKit/GTKStatusbar.h
share/GNUstep/Local/Headers/GToolKit/GTKStyle.h
share/GNUstep/Local/Headers/GToolKit/GTKTable.h
share/GNUstep/Local/Headers/GToolKit/GTKTearoffMenuItem.h
share/GNUstep/Local/Headers/GToolKit/GTKText.h
share/GNUstep/Local/Headers/GToolKit/GTKTipsQuery.h
share/GNUstep/Local/Headers/GToolKit/GTKToggleButton.h
share/GNUstep/Local/Headers/GToolKit/GTKToolbar.h
share/GNUstep/Local/Headers/GToolKit/GTKTooltips.h
share/GNUstep/Local/Headers/GToolKit/GTKTree.h
share/GNUstep/Local/Headers/GToolKit/GTKTreeItem.h
share/GNUstep/Local/Headers/GToolKit/GTKVBox.h
share/GNUstep/Local/Headers/GToolKit/GTKVButtonBox.h
share/GNUstep/Local/Headers/GToolKit/GTKVPaned.h
share/GNUstep/Local/Headers/GToolKit/GTKVRuler.h
share/GNUstep/Local/Headers/GToolKit/GTKVScale.h
share/GNUstep/Local/Headers/GToolKit/GTKVScrollbar.h
share/GNUstep/Local/Headers/GToolKit/GTKVSeparator.h
share/GNUstep/Local/Headers/GToolKit/GTKViewport.h
share/GNUstep/Local/Headers/GToolKit/GTKWidget.h
share/GNUstep/Local/Headers/GToolKit/GTKWindow.h
share/GNUstep/Local/Headers/GToolKit/GToolKit.h
share/GNUstep/Local/Libraries/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/libGToolKit.so
share/GNUstep/Local/Libraries/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/libGToolKit.so.${PKGVERSION}
share/GNUstep/System/Makefiles/gtk-tool.make
@dirrm share/GNUstep/Local/Headers/GToolKit
@comment $NetBSD: PLIST,v 1.2 2004/04/17 00:26:48 rh Exp $
share/GNUstep/Local/Library/Headers/GToolKit/GTK.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKAccelGroup.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKAccelLabel.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKAction.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKAdjustment.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKAlignment.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKApplication.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKArrow.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKAspectFrame.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKBin.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKBox.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKButton.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKButtonBox.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKCList.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKCTree.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKCalendar.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKCheckButton.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKCheckMenuItem.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKColorSelection.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKColorSelectionDialog.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKCombo.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKContainer.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKCurve.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKData.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKDialog.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKDrawingArea.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKEditable.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKEntry.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKEventBox.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKFileSelection.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKFixed.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKFontSelection.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKFontSelectionDialog.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKFrame.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKGammaCurve.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKGladeXML.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKHBox.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKHButtonBox.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKHPaned.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKHRuler.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKHScale.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKHScrollbar.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKHSeparator.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKHandleBox.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKImage.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKInputDialog.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKInvisible.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKItem.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKItemFactory.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKLabel.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKLayout.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKList.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKListItem.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKMain.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKMenu.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKMenuBar.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKMenuFactory.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKMenuItem.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKMenuShell.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKMisc.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKNotebook.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKObject.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKOptionMenu.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKPacker.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKPaned.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKPixmap.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKPlug.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKPreview.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKProgress.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKProgressBar.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKRadioButton.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKRadioMenuItem.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKRange.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKRuler.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKScale.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKScrollbar.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKScrolledWindow.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKSeparator.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKSocket.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKSpinButton.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKStatusbar.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKStyle.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKTable.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKTearoffMenuItem.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKText.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKTipsQuery.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKToggleButton.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKToolbar.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKTooltips.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKTree.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKTreeItem.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKVBox.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKVButtonBox.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKVPaned.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKVRuler.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKVScale.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKVScrollbar.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKVSeparator.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKViewport.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKWidget.h
share/GNUstep/Local/Library/Headers/GToolKit/GTKWindow.h
share/GNUstep/Local/Library/Headers/GToolKit/GToolKit.h
share/GNUstep/Local/Library/Libraries/libGToolKit.so
share/GNUstep/Local/Library/Libraries/libGToolKit.so.${PKGVERSION}
share/GNUstep/System/Library/Makefiles/gtk-tool.make
@dirrm share/GNUstep/Local/Library/Headers/GToolKit

View file

@ -0,0 +1,22 @@
# $NetBSD: buildlink3.mk,v 1.1 2004/04/17 00:26:48 rh Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTOOLKIT_BUILDLINK3_MK:= ${GTOOLKIT_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gtoolkit
.endif
BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtoolkit}
BUILDLINK_PACKAGES+= gtoolkit
.if !empty(GTOOLKIT_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.gtoolkit+= gtoolkit>=0.9.5nb2
BUILDLINK_PKGSRCDIR.gtoolkit?= ../../x11/gtoolkit
.endif # GTOOLKIT_BUILDLINK3_MK
.include "../../x11/gtk/buildlink3.mk"
.include "../../x11/gnustep-back/buildlink3.mk"
.include "../../devel/libglade/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}

View file

@ -1,4 +1,5 @@
$NetBSD: distinfo,v 1.1.1.1 2002/11/09 05:19:28 rh Exp $
$NetBSD: distinfo,v 1.2 2004/04/17 00:26:48 rh Exp $
SHA1 (gtoolkit-0.9.5.tar.gz) = 8e1acfec076637983dd2875ce124c0001a4a9077
Size (gtoolkit-0.9.5.tar.gz) = 385203 bytes
SHA1 (patch-aa) = 60b3a30cfa621e236e61bbbf3a09d99d715388f1

View file

@ -0,0 +1,62 @@
$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";