aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/sqlclient/pkg-plist1
-rw-r--r--devel/gnustep-make/Makefile5
-rw-r--r--devel/gnustep/Makefile2
-rw-r--r--devel/performance/pkg-plist1
-rw-r--r--lang/gnustep-base/Makefile7
-rw-r--r--lang/gnustep-base/distinfo4
-rw-r--r--lang/gnustep-base/files/objc-common.g.patch11
-rw-r--r--lang/gnustep-base/pkg-plist63
-rw-r--r--x11-toolkits/gnustep-back/Makefile5
-rw-r--r--x11-toolkits/gnustep-back/distinfo4
-rw-r--r--x11-toolkits/gnustep-gui/Makefile3
-rw-r--r--x11-toolkits/gnustep-gui/distinfo4
-rw-r--r--x11-toolkits/gnustep-gui/pkg-plist35
-rw-r--r--x11-toolkits/gtoolkit/files/patch-GTKMain.h13
-rw-r--r--x11-toolkits/gtoolkit/files/patch-GToolKit.m18
15 files changed, 101 insertions, 75 deletions
diff --git a/databases/sqlclient/pkg-plist b/databases/sqlclient/pkg-plist
index 5605abf9ee15..0995db50164c 100644
--- a/databases/sqlclient/pkg-plist
+++ b/databases/sqlclient/pkg-plist
@@ -25,6 +25,7 @@ GNUstep/Local/Library/Bundles/SQLClient/SQLite_libs.bundle/stamp.make
GNUstep/Local/Library/Documentation/SQLClient/SQLClient.gsdoc
GNUstep/Local/Library/Documentation/SQLClient/SQLClient.html
GNUstep/Local/Library/Documentation/SQLClient/SQLClient.igsdoc
+%%GNUSTEP_DEVEL%%GNUstep/Local/Library/Documentation/SQLClient/OrderedSymbolDeclarations.plist
GNUstep/Local/Library/Documentation/SQLClient/dependencies
GNUstep/Local/Library/Headers/SQLClient/SQLClient.h
GNUstep/Local/Library/Libraries/libSQLClient.so
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 8828f0470b08..ac7965003e81 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnustep-make
PORTVERSION= 2.4.0
+PORTREVISION= 1
CATEGORIES= devel gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP}
MASTER_SITE_SUBDIR= core
@@ -27,10 +28,6 @@ CONFIGURE_ARGS+= --with-thread-lib="${PTHREAD_LIBS}"
CONFIGURE_ARGS+= --with-config-file=${GNUSTEP_PREFIX}/GNUstep.conf
GNU_CONFIGURE_PREFIX= ${GNUSTEP_PREFIX}
-.if defined(GNUSTEP_WITH_BASE_GCC)
-GNUSTEP_WITHOUT_LIBOBJC= yes
-.endif
-
post-patch:
${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|' \
${WRKSRC}/configure
diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile
index 4c55d82c7243..c4372efdec48 100644
--- a/devel/gnustep/Makefile
+++ b/devel/gnustep/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnustep
.if defined(WITH_GNUSTEP_DEVEL)
-PORTVERSION= 1.21.0
+PORTVERSION= 1.22.0
.else
PORTVERSION= 1.19.3
.endif
diff --git a/devel/performance/pkg-plist b/devel/performance/pkg-plist
index f70e25ed8cf8..631c897c9699 100644
--- a/devel/performance/pkg-plist
+++ b/devel/performance/pkg-plist
@@ -12,6 +12,7 @@ GNUstep/Local/Library/Documentation/Performance/GSThroughput.gsdoc
GNUstep/Local/Library/Documentation/Performance/GSThroughput.html
GNUstep/Local/Library/Documentation/Performance/GSTicker.gsdoc
GNUstep/Local/Library/Documentation/Performance/GSTicker.html
+%%GNUSTEP_DEVEL%%GNUstep/Local/Library/Documentation/Performance/OrderedSymbolDeclarations.plist
GNUstep/Local/Library/Documentation/Performance/Performance.igsdoc
GNUstep/Local/Library/Documentation/Performance/dependencies
GNUstep/Local/Library/Headers/Performance/GSCache.h
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index b5f43e8fceef..707146884075 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -7,8 +7,7 @@
PORTNAME= gnustep-base
.if defined(WITH_GNUSTEP_DEVEL)
-PORTVERSION= 1.21.1
-PORTREVISION= 2
+PORTVERSION= 1.22.0
.else
PORTVERSION= 1.19.3
PORTREVISION= 4
@@ -56,9 +55,7 @@ ETCDIR= ${LOCALBASE}/etc
.if !defined(WITHOUT_GNUSTEP_FAKEMAIN)
CONFIGURE_ARGS+= --enable-fake-main
.endif
-.if defined(WITH_GNUSTEP_DEVEL)
-EXTRA_PATCHES+= ${FILESDIR}/objc-common.g.patch
-.else
+.if !defined(WITH_GNUSTEP_DEVEL)
EXTRA_PATCHES+= ${FILESDIR}/config.objc.m.patch
.endif
diff --git a/lang/gnustep-base/distinfo b/lang/gnustep-base/distinfo
index b2adc3ad72d6..a1faaed78c2f 100644
--- a/lang/gnustep-base/distinfo
+++ b/lang/gnustep-base/distinfo
@@ -1,4 +1,4 @@
SHA256 (gnustep-base-1.19.3.tar.gz) = e804922a6717b6341b5182b19bac022ef2314f3cb2b00f62a0c43b65a5f40bd8
SIZE (gnustep-base-1.19.3.tar.gz) = 2612479
-SHA256 (gnustep-base-1.21.1.tar.gz) = da80bc24f602ff01eff0699acf842859edcab213ad8a25490fa9fa19349fa9e5
-SIZE (gnustep-base-1.21.1.tar.gz) = 2616458
+SHA256 (gnustep-base-1.22.0.tar.gz) = ebb86cdcf194891194079506b2e08bd09df7d5be5413cbbfa521d4ea76a77b3a
+SIZE (gnustep-base-1.22.0.tar.gz) = 2880760
diff --git a/lang/gnustep-base/files/objc-common.g.patch b/lang/gnustep-base/files/objc-common.g.patch
deleted file mode 100644
index 33dff88e86e2..000000000000
--- a/lang/gnustep-base/files/objc-common.g.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/objc-common.g.orig 2010-02-15 10:35:20.000000000 +0100
-+++ config/objc-common.g 2010-11-12 15:19:46.000000000 +0100
-@@ -5,7 +5,7 @@
-
- #include <objc/Object.h>
-
--#ifndef NeXT_RUNTIME
-+#if !defined(NeXT_RUNTIME) && !defined(__GNUSTEP_RUNTIME__)
- #include <objc/NXConstStr.h>
- @implementation NXConstantString
- - (const char*) cString
diff --git a/lang/gnustep-base/pkg-plist b/lang/gnustep-base/pkg-plist
index 188b8f1b1878..6774b4153922 100644
--- a/lang/gnustep-base/pkg-plist
+++ b/lang/gnustep-base/pkg-plist
@@ -28,6 +28,7 @@ GNUstep/System/Library/Headers/Foundation/NSAutoreleasePool.h
GNUstep/System/Library/Headers/Foundation/NSBundle.h
GNUstep/System/Library/Headers/Foundation/NSByteOrder.h
GNUstep/System/Library/Headers/Foundation/NSCache.h
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/Foundation/NSCalendar.h
GNUstep/System/Library/Headers/Foundation/NSCalendarDate.h
GNUstep/System/Library/Headers/Foundation/NSCharacterSet.h
GNUstep/System/Library/Headers/Foundation/NSClassDescription.h
@@ -65,6 +66,7 @@ GNUstep/System/Library/Headers/Foundation/NSInvocation.h
GNUstep/System/Library/Headers/Foundation/NSKeyValueCoding.h
GNUstep/System/Library/Headers/Foundation/NSKeyValueObserving.h
GNUstep/System/Library/Headers/Foundation/NSKeyedArchiver.h
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/Foundation/NSLocale.h
GNUstep/System/Library/Headers/Foundation/NSLock.h
GNUstep/System/Library/Headers/Foundation/NSMapTable.h
GNUstep/System/Library/Headers/Foundation/NSMethodSignature.h
@@ -89,6 +91,7 @@ GNUstep/System/Library/Headers/Foundation/NSPropertyList.h
GNUstep/System/Library/Headers/Foundation/NSProtocolChecker.h
GNUstep/System/Library/Headers/Foundation/NSProxy.h
GNUstep/System/Library/Headers/Foundation/NSRange.h
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/Foundation/NSRegularExpression.h
GNUstep/System/Library/Headers/Foundation/NSRunLoop.h
GNUstep/System/Library/Headers/Foundation/NSScanner.h
GNUstep/System/Library/Headers/Foundation/NSSerialization.h
@@ -98,6 +101,7 @@ GNUstep/System/Library/Headers/Foundation/NSSpellServer.h
GNUstep/System/Library/Headers/Foundation/NSStream.h
GNUstep/System/Library/Headers/Foundation/NSString.h
GNUstep/System/Library/Headers/Foundation/NSTask.h
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/Foundation/NSTextCheckingResult.h
GNUstep/System/Library/Headers/Foundation/NSThread.h
GNUstep/System/Library/Headers/Foundation/NSTimeZone.h
GNUstep/System/Library/Headers/Foundation/NSTimer.h
@@ -140,6 +144,7 @@ GNUstep/System/Library/Headers/GNUstepBase/GSIMap.h
GNUstep/System/Library/Headers/GNUstepBase/GSLocale.h
GNUstep/System/Library/Headers/GNUstepBase/GSLock.h
GNUstep/System/Library/Headers/GNUstepBase/GSMime.h
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepBase/NSNetServices+GNUstepBase.h
GNUstep/System/Library/Headers/GNUstepBase/GSObjCRuntime.h
GNUstep/System/Library/Headers/GNUstepBase/GSUnion.h
GNUstep/System/Library/Headers/GNUstepBase/GSVersionMacros.h
@@ -168,45 +173,27 @@ GNUstep/System/Library/Headers/GNUstepBase/Unicode.h
GNUstep/System/Library/Headers/GNUstepBase/preface.h
%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/ObjectiveC2/Availability.h
%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/ObjectiveC2/blocks_runtime.h
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/ObjectiveC2/capabilities.h
%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/ObjectiveC2/runtime.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/Additions.h
-GNUstep/System/Library/Headers/gnustep/base/GCObject.h
-GNUstep/System/Library/Headers/gnustep/base/GNUstep.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/GSBlocks.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GCObject.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GNUstep.h
%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSCategories.h
-GNUstep/System/Library/Headers/gnustep/base/GSFileHandle.h
-GNUstep/System/Library/Headers/gnustep/base/GSFunctions.h
-GNUstep/System/Library/Headers/gnustep/base/GSIArray.h
-GNUstep/System/Library/Headers/gnustep/base/GSIMap.h
-GNUstep/System/Library/Headers/gnustep/base/GSLocale.h
-GNUstep/System/Library/Headers/gnustep/base/GSLock.h
-GNUstep/System/Library/Headers/gnustep/base/GSMime.h
-GNUstep/System/Library/Headers/gnustep/base/GSObjCRuntime.h
-GNUstep/System/Library/Headers/gnustep/base/GSUnion.h
-GNUstep/System/Library/Headers/gnustep/base/GSVersionMacros.h
-GNUstep/System/Library/Headers/gnustep/base/GSXML.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSArray+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSAttributedString+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSBundle+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSCalendarDate+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSData+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSDebug+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSFileHandle+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSLock+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSMutableString+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSNumber+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSObject+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSProcessInfo+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSStream+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSString+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSTask+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSThread+GNUstepBase.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/base/NSURL+GNUstepBase.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSFileHandle.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSFunctions.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSIArray.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSIMap.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSLocale.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSLock.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSMime.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSObjCRuntime.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSUnion.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSVersionMacros.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/GSXML.h
%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/NSTask+GS.h
-GNUstep/System/Library/Headers/gnustep/base/Unicode.h
-GNUstep/System/Library/Headers/gnustep/base/behavior.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/Unicode.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/behavior.h
%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/objc-gnu2next.h
-GNUstep/System/Library/Headers/gnustep/base/preface.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/base/preface.h
GNUstep/System/Library/Headers/gnustep/unicode/caseconv.h
GNUstep/System/Library/Headers/gnustep/unicode/cop.h
GNUstep/System/Library/Headers/gnustep/unicode/cyrillic.h
@@ -229,6 +216,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Italian
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Korean
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Locale.aliases
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Locale.canonical
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Locale.encodings
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Russian
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Languages/Slovak
@@ -400,6 +388,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Mendoza
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Menominee
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Merida
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Metlakatla
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Mexico_City
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Miquelon
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Moncton
@@ -412,6 +401,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Nipigon
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Nome
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Noronha
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/North_Dakota/Beulah
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/North_Dakota/Center
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/North_Dakota/New_Salem
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Panama
@@ -438,6 +428,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Sao_Paulo
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Scoresbysund
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Shiprock
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Sitka
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/St_Barthelemy
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/St_Johns
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/St_Kitts
@@ -783,6 +774,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Apia
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Auckland
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Chatham
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Chuuk
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Easter
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Efate
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Enderbury
@@ -808,6 +800,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Pago_Pago
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Palau
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Pitcairn
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Pohnpei
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Ponape
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Port_Moresby
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Rarotonga
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index 1ae71fa9db14..534ee4da601f 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnustep-back
.if defined(WITH_GNUSTEP_DEVEL)
-PORTVERSION= 0.19.0
+PORTVERSION= 0.20.0
.else
PORTVERSION= 0.17.1
PORTREVISION= 3
@@ -86,9 +86,6 @@ CONFLICTS?= gunstep-back-xdps-0.* gunstep-back-art-0.* gunstep-back-cairo-0.*
.include <bsd.port.pre.mk>
-TARGLIB!= (cd ${PORTSDIR}/${GNUSTEP_OBJC_PORT} && make -V TARGLIB)
-
-ADDITIONAL_LDFLAGS+= -L${TARGLIB}
MAKE_FLAGS+= messages=yes
PLIST_SUB+= BACKVERSION=${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1}
diff --git a/x11-toolkits/gnustep-back/distinfo b/x11-toolkits/gnustep-back/distinfo
index 6e3b8d43c0c6..ffb10d88b02b 100644
--- a/x11-toolkits/gnustep-back/distinfo
+++ b/x11-toolkits/gnustep-back/distinfo
@@ -1,4 +1,4 @@
SHA256 (gnustep-back-0.17.1.tar.gz) = fff8b84b2e6ab3fb722f1e11c8e2285a60bbddd80233f08345918ae6a885541d
SIZE (gnustep-back-0.17.1.tar.gz) = 891002
-SHA256 (gnustep-back-0.19.0.tar.gz) = b4ff8812aab49e0151fa742a8f952b7319a3a08b2492e66c14408917fd7c37ab
-SIZE (gnustep-back-0.19.0.tar.gz) = 901388
+SHA256 (gnustep-back-0.20.0.tar.gz) = b0d8964aace6e45463c1ddfa35c35e2825e0f9478299149fab197cf77c96c18e
+SIZE (gnustep-back-0.20.0.tar.gz) = 918467
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 5070f19ee064..3d46e2637e78 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -7,8 +7,7 @@
PORTNAME= gnustep-gui
.if defined(WITH_GNUSTEP_DEVEL)
-PORTVERSION= 0.19.0
-PORTREVISION= 1
+PORTVERSION= 0.20.0
.else
PORTVERSION= 0.17.1
PORTREVISION= 2
diff --git a/x11-toolkits/gnustep-gui/distinfo b/x11-toolkits/gnustep-gui/distinfo
index 5388f07c4434..79da63f40764 100644
--- a/x11-toolkits/gnustep-gui/distinfo
+++ b/x11-toolkits/gnustep-gui/distinfo
@@ -1,4 +1,4 @@
SHA256 (gnustep-gui-0.17.1.tar.gz) = b4dd99a84c833e135a7975be84927abb840c30dc3daba10714f6ac5a48930ac9
SIZE (gnustep-gui-0.17.1.tar.gz) = 1917258
-SHA256 (gnustep-gui-0.19.0.tar.gz) = 3b62f5e6eef1be3d2d187aebc727422420781ff80e92d87624b5108cc29c33a2
-SIZE (gnustep-gui-0.19.0.tar.gz) = 2520946
+SHA256 (gnustep-gui-0.20.0.tar.gz) = 26f28951f07c0abb5439f468b60a6726168c510ae3579cd075e6a9c5bab73f5a
+SIZE (gnustep-gui-0.20.0.tar.gz) = 2648224
diff --git a/x11-toolkits/gnustep-gui/pkg-plist b/x11-toolkits/gnustep-gui/pkg-plist
index d55f9c160648..3973c120cf0b 100644
--- a/x11-toolkits/gnustep-gui/pkg-plist
+++ b/x11-toolkits/gnustep-gui/pkg-plist
@@ -41,8 +41,8 @@ GNUstep/System/Library/ColorPickers/WheelPicker.bundle/WheelPicker
GNUstep/System/Library/ColorPickers/WheelPicker.bundle/stamp.make
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/ClassesTOC.gsdoc
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/ClassesTOC.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/ConstantsTOC.gsdoc
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/ConstantsTOC.html
+%%GNUSTEP_STABLE%%%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/ConstantsTOC.gsdoc
+%%GNUSTEP_STABLE%%%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/ConstantsTOC.html
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/Functions.gsdoc
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/Functions.html
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/FunctionsTOC.gsdoc
@@ -60,6 +60,7 @@ GNUstep/System/Library/ColorPickers/WheelPicker.bundle/stamp.make
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/GuiAdditions.html
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/GuiAdditions.igsdoc
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/MainIndex.html
+%%GNUSTEP_DEVEL%%%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/OrderedSymbolDeclarations.plist
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/TypesAndConstants.gsdoc
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/TypesAndConstants.html
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/TypesTOC.gsdoc
@@ -291,6 +292,7 @@ GNUstep/System/Library/ColorPickers/WheelPicker.bundle/stamp.make
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/NSWindowController.html
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/NSWorkspace.gsdoc
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/NSWorkspace.html
+%%GNUSTEP_DEVEL%%%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/OrderedSymbolDeclarations.plist
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/ProtocolsTOC.gsdoc
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/ProtocolsTOC.html
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/TypesAndConstants.gsdoc
@@ -330,9 +332,10 @@ GNUstep/System/Library/Headers/AppKit/GSDisplayServer.h
GNUstep/System/Library/Headers/AppKit/GSDragView.h
GNUstep/System/Library/Headers/AppKit/GSEPSPrintOperation.h
GNUstep/System/Library/Headers/AppKit/GSFontInfo.h
-GNUstep/System/Library/Headers/AppKit/GSFusedSilica.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/AppKit/GSFusedSilica.h
GNUstep/System/Library/Headers/AppKit/GSGormLoading.h
GNUstep/System/Library/Headers/AppKit/GSHbox.h
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/AppKit/GSHelpAttachment.h
GNUstep/System/Library/Headers/AppKit/GSHelpManagerPanel.h
GNUstep/System/Library/Headers/AppKit/GSHorizontalTypesetter.h
GNUstep/System/Library/Headers/AppKit/GSInfoPanel.h
@@ -361,6 +364,7 @@ GNUstep/System/Library/Headers/AppKit/GSTypesetter.h
GNUstep/System/Library/Headers/AppKit/GSVbox.h
GNUstep/System/Library/Headers/AppKit/GSVersion.h
%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/AppKit/GSWindowDecorationView.h
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/AppKit/GSXibLoading.h
GNUstep/System/Library/Headers/AppKit/IMConnectors.h
GNUstep/System/Library/Headers/AppKit/IMCustomObject.h
GNUstep/System/Library/Headers/AppKit/IMLoading.h
@@ -502,6 +506,7 @@ GNUstep/System/Library/Headers/AppKit/NSToolbarItemGroup.h
GNUstep/System/Library/Headers/AppKit/NSUserDefaultsController.h
GNUstep/System/Library/Headers/AppKit/NSUserInterfaceValidation.h
GNUstep/System/Library/Headers/AppKit/NSView.h
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/AppKit/NSViewController.h
GNUstep/System/Library/Headers/AppKit/NSWindow.h
GNUstep/System/Library/Headers/AppKit/NSWindowController.h
GNUstep/System/Library/Headers/AppKit/NSWorkspace.h
@@ -514,9 +519,10 @@ GNUstep/System/Library/Headers/GNUstepGUI/GSDisplayServer.h
GNUstep/System/Library/Headers/GNUstepGUI/GSDragView.h
GNUstep/System/Library/Headers/GNUstepGUI/GSEPSPrintOperation.h
GNUstep/System/Library/Headers/GNUstepGUI/GSFontInfo.h
-GNUstep/System/Library/Headers/GNUstepGUI/GSFusedSilica.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/GNUstepGUI/GSFusedSilica.h
GNUstep/System/Library/Headers/GNUstepGUI/GSGormLoading.h
GNUstep/System/Library/Headers/GNUstepGUI/GSHbox.h
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepGUI/GSHelpAttachment.h
GNUstep/System/Library/Headers/GNUstepGUI/GSHelpManagerPanel.h
GNUstep/System/Library/Headers/GNUstepGUI/GSHorizontalTypesetter.h
GNUstep/System/Library/Headers/GNUstepGUI/GSInfoPanel.h
@@ -545,6 +551,7 @@ GNUstep/System/Library/Headers/GNUstepGUI/GSTypesetter.h
GNUstep/System/Library/Headers/GNUstepGUI/GSVbox.h
GNUstep/System/Library/Headers/GNUstepGUI/GSVersion.h
%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepGUI/GSWindowDecorationView.h
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepGUI/GSXibLoading.h
GNUstep/System/Library/Headers/GNUstepGUI/IMConnectors.h
GNUstep/System/Library/Headers/GNUstepGUI/IMCustomObject.h
GNUstep/System/Library/Headers/GNUstepGUI/IMLoading.h
@@ -555,9 +562,10 @@ GNUstep/System/Library/Headers/gnustep/gui/GSDisplayServer.h
GNUstep/System/Library/Headers/gnustep/gui/GSDragView.h
GNUstep/System/Library/Headers/gnustep/gui/GSEPSPrintOperation.h
GNUstep/System/Library/Headers/gnustep/gui/GSFontInfo.h
-GNUstep/System/Library/Headers/gnustep/gui/GSFusedSilica.h
+%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/gui/GSFusedSilica.h
GNUstep/System/Library/Headers/gnustep/gui/GSGormLoading.h
GNUstep/System/Library/Headers/gnustep/gui/GSHbox.h
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/gui/GSHelpAttachment.h
GNUstep/System/Library/Headers/gnustep/gui/GSHelpManagerPanel.h
GNUstep/System/Library/Headers/gnustep/gui/GSHorizontalTypesetter.h
GNUstep/System/Library/Headers/gnustep/gui/GSInfoPanel.h
@@ -586,6 +594,7 @@ GNUstep/System/Library/Headers/gnustep/gui/GSTypesetter.h
GNUstep/System/Library/Headers/gnustep/gui/GSVbox.h
GNUstep/System/Library/Headers/gnustep/gui/GSVersion.h
%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/gui/GSWindowDecorationView.h
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/gui/GSXibLoading.h
GNUstep/System/Library/Headers/gnustep/gui/IMConnectors.h
GNUstep/System/Library/Headers/gnustep/gui/IMCustomObject.h
GNUstep/System/Library/Headers/gnustep/gui/IMLoading.h
@@ -621,19 +630,27 @@ GNUstep/System/Library/Images/common_ClosedHandCursor.tiff
GNUstep/System/Library/Images/common_ColorSwatch.tiff
GNUstep/System/Library/Images/common_ComboBoxEllipsis.tiff
GNUstep/System/Library/Images/common_DecimalTabStop.tiff
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_Desktop.tiff
GNUstep/System/Library/Images/common_Diamond.tiff
GNUstep/System/Library/Images/common_Dimple.tiff
%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_DimpleHoriz.tiff
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_DocsFolder.tiff
GNUstep/System/Library/Images/common_DownArrowSmall.tiff
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_DownloadFolder.tiff
GNUstep/System/Library/Images/common_Folder.tiff
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_GSFolder.tiff
GNUstep/System/Library/Images/common_HelpCursor.tiff
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_HelpLink.tiff
GNUstep/System/Library/Images/common_Home.tiff
GNUstep/System/Library/Images/common_HomeDirectory.tiff
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_ImageFolder.tiff
GNUstep/System/Library/Images/common_LeftTabStop.tiff
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_LibraryFolder.tiff
GNUstep/System/Library/Images/common_MiniWindowTile.tiff
GNUstep/System/Library/Images/common_Miniaturize.tiff
GNUstep/System/Library/Images/common_MiniaturizeH.tiff
GNUstep/System/Library/Images/common_Mount.tiff
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_MusicFolder.tiff
GNUstep/System/Library/Images/common_Nibble.tiff
GNUstep/System/Library/Images/common_OpenHandCursor.tiff
GNUstep/System/Library/Images/common_Printer.tiff
@@ -706,6 +723,9 @@ GNUstep/System/Library/KeyBindings/DefaultKeyBindings.dict
GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSDataLinkPanel.gorm/data.classes
GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSDataLinkPanel.gorm/data.info
GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSDataLinkPanel.gorm/objects.gorm
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSFindPanel.gorm/data.classes
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSFindPanel.gorm/data.info
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSFindPanel.gorm/objects.gorm
GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSPageLayout.gorm/data.classes
GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSPageLayout.gorm/data.info
GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSPageLayout.gorm/objects.gorm
@@ -727,6 +747,9 @@ GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/
%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.classes
%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.info
%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSDataLinkPanel.gorm/objects.gorm
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSFindPanel.gorm/data.classes
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSFindPanel.gorm/data.info
+%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSFindPanel.gorm/objects.gorm
%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPageLayout.gorm/data.classes
%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPageLayout.gorm/data.info
%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPageLayout.gorm/objects.gorm
@@ -778,6 +801,7 @@ GNUstep/System/Tools/set_show_service
%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSSpellPanel.gorm
%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPrintPanel.gorm
%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPageLayout.gorm
+%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSFindPanel.gorm
%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSDataLinkPanel.gorm
%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj
@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Lojban.lproj
@@ -789,6 +813,7 @@ GNUstep/System/Tools/set_show_service
@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSSpellPanel.gorm
@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSPrintPanel.gorm
@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSPageLayout.gorm
+@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSFindPanel.gorm
@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSDataLinkPanel.gorm
@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj
@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources
diff --git a/x11-toolkits/gtoolkit/files/patch-GTKMain.h b/x11-toolkits/gtoolkit/files/patch-GTKMain.h
new file mode 100644
index 000000000000..56c2e067eac4
--- /dev/null
+++ b/x11-toolkits/gtoolkit/files/patch-GTKMain.h
@@ -0,0 +1,13 @@
+--- GTKMain.h.orig 2002-02-21 16:43:49.000000000 +0100
++++ GTKMain.h 2011-04-15 20:17:34.000000000 +0200
+@@ -31,8 +31,8 @@
+ - (void) mainQuit;
+ - (gint) mainIteration;
+ - (gint) mainIterationDo:(gboolean) blocking;
+-- (gint) true;
+-- (gint) false;
++- (gint) val_true;
++- (gint) val_false;
+ - (void) grabAdd:(GTKWidget *) widget;
+ - (GTKWidget*) grabGetCurrent;
+ - (void) grabRemove:(GTKWidget *) widget;
diff --git a/x11-toolkits/gtoolkit/files/patch-GToolKit.m b/x11-toolkits/gtoolkit/files/patch-GToolKit.m
index 1f202e7111af..e6b424035831 100644
--- a/x11-toolkits/gtoolkit/files/patch-GToolKit.m
+++ b/x11-toolkits/gtoolkit/files/patch-GToolKit.m
@@ -1,5 +1,5 @@
---- GToolKit.m.orig Thu Feb 21 16:43:52 2002
-+++ GToolKit.m Wed Dec 25 11:12:44 2002
+--- GToolKit.m.orig 2002-02-21 16:43:52.000000000 +0100
++++ GToolKit.m 2011-04-15 20:17:16.000000000 +0200
@@ -2550,6 +2550,17 @@
#include <GToolKit/GTKWidget.h>
#include <GToolKit/GTKAccelGroup.h>
@@ -35,6 +35,20 @@
static void item_forward_signal (gpointer data, guint action, GtkWidget *widget)
+@@ -3134,11 +3135,11 @@
+ {
+ return gtk_main_iteration_do( blocking);
+ }
+-- (gint) true
++- (gint) val_true
+ {
+ return gtk_true();
+ }
+-- (gint) false
++- (gint) val_false
+ {
+ return gtk_false();
+ }
@@ -6376,6 +6377,10 @@
#include <GToolKit/GTKWidget.h>
#include <GToolKit/GTKAccelGroup.h>