cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix to build with gcc-2.95

Browse Source 
feedback from landry@, jasper@, sthen@
OK sthen@
This commit is contained in:
sebastia 2011-06-24 10:51:48 +00:00
parent 3728e4a4d7
commit 5acfd868bd
21 changed files with 327 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/gnustep/back/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.26 2011/05/09 11:15:13 sebastia Exp $
# $OpenBSD: Makefile,v 1.27 2011/06/24 10:51:48 sebastia Exp $
COMMENT= GNUstep gui backend
V = 0.20.1
DISTNAME= gnustep-back-${V}
REVISION = 0
CATEGORIES= devel

16
x11/gnustep/back/patches/patch-Headers_cairo_CairoFaceInfo_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-Headers_cairo_CairoFaceInfo_h,v 1.1 2011/06/24 10:51:48 sebastia Exp $
protect id
--- Headers/cairo/CairoFaceInfo.h.orig Mon Jun 20 09:20:56 2011
+++ Headers/cairo/CairoFaceInfo.h Mon Jun 20 09:55:51 2011
@@ -34,7 +34,9 @@
#include <Foundation/Foundation.h>
#include <ft2build.h>
#include FT_FREETYPE_H
+#define id cairo_id
#include <cairo-ft.h>
+#undef id
@interface CairoFaceInfo : NSObject
{

16
x11/gnustep/back/patches/patch-Headers_cairo_CairoFontEnumerator_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-Headers_cairo_CairoFontEnumerator_h,v 1.1 2011/06/24 10:51:48 sebastia Exp $
protect id
--- Headers/cairo/CairoFontEnumerator.h.orig Mon Jun 20 09:41:53 2011
+++ Headers/cairo/CairoFontEnumerator.h Mon Jun 20 10:14:04 2011
@@ -30,7 +30,9 @@
#include <GNUstepGUI/GSFontInfo.h>
#include <cairo.h>
+#define id cairo_id
#include <fontconfig/fontconfig.h>
+#undef id
#include "cairo/CairoFaceInfo.h"
@interface CairoFontEnumerator : GSFontEnumerator

29
x11/gnustep/back/patches/patch-Source_cairo_CairoGState_m Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-Source_cairo_CairoGState_m,v 1.1 2011/06/24 10:51:48 sebastia Exp $
fix to build with gcc-2.95
--- Source/cairo/CairoGState.m.orig Mon Jun 20 09:24:13 2011
+++ Source/cairo/CairoGState.m Mon Jun 20 09:37:17 2011
@@ -417,8 +417,8 @@ static float floatToUserSpace(NSAffineTransform *ctm,
{
if (_ct)
{
- GS_BEGINITEMBUF(chars, length + 1, char);
device_color_t c;
+ GS_BEGINITEMBUF(chars, length + 1, char);
c = strokeColor;
gsColorToRGB(&c);
@@ -599,9 +599,10 @@ static float floatToUserSpace(NSAffineTransform *ctm,
{
if (_ct)
{
- GS_BEGINITEMBUF(dpat, size, double);
- double doffset = (double)floatFromUserSpace(ctm, foffset);
+ double doffset;
int i;
+ GS_BEGINITEMBUF(dpat, size, double);
+ doffset = (double)floatFromUserSpace(ctm, foffset);
i = size;
while (i)

6
x11/gnustep/gnumail/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.13 2011/05/15 13:03:26 sebastia Exp $
# $OpenBSD: Makefile,v 1.14 2011/06/24 10:53:18 sebastia Exp $
COMMENT= GNUstep mail application
DISTNAME= GNUMail-1.2.0pre3
REVISION = 8
REVISION = 9
SHARED_LIBS= GNUMail 2.0 # .1.2
CATEGORIES= mail
@ -26,6 +26,8 @@ BUNDLES= Account Advanced Clock Colors Compose Emoticon Fonts \
post-extract:
@rm ${WRKSRC}/Framework/GNUMail/MailWindowController.m.orig
perl -pi -e 's/\x0d/\x0a/g' ${WRKSRC}/Framework/GNUMail/EditWindowToolbar.m \
${WRKSRC}/Framework/GNUMail/MailboxManagerToolbar.m
pre-configure:
.for i in ${BUNDLES}

19
x11/gnustep/gnumail/patches/patch-Bundles_Filtering_FilteringViewController_m Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-Bundles_Filtering_FilteringViewController_m,v 1.1 2011/06/24 10:53:18 sebastia Exp $
fix to build with gcc-2.95
--- Bundles/Filtering/FilteringViewController.m.orig Wed Jun 22 12:50:28 2011
+++ Bundles/Filtering/FilteringViewController.m Wed Jun 22 12:50:54 2011
@@ -507,10 +507,10 @@ static NSArray *draggedFilters;
- (NSNumber *) editFilter: (NSNumber *) theIndex
{
Filter *aFilter;
-
+ FilterEditorWindowController *filterEditorWindowController;
+
aFilter = [filterManager filterAtIndex: [theIndex intValue]];
- FilterEditorWindowController *filterEditorWindowController;
filterEditorWindowController = [[FilterEditorWindowController alloc]
initWithWindowNibName: @"FilterEditorWindow"];

15
x11/gnustep/gnumail/patches/patch-Framework_GNUMail_PreferencesWindowController_m Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-Framework_GNUMail_PreferencesWindowController_m,v 1.1 2011/06/24 10:53:18 sebastia Exp $
fix to build with gcc-2.95
--- Framework/GNUMail/PreferencesWindowController.m.orig Wed Jun 22 09:17:03 2011
+++ Framework/GNUMail/PreferencesWindowController.m Wed Jun 22 09:17:13 2011
@@ -29,7 +29,7 @@
#include "NSBundle+Extensions.h"
#include "NSUserDefaults+Extensions.h"
-#include "GNUMailBundle.h">
+#include "GNUMailBundle.h"
#include "PreferencesModule.h"
#ifndef MACOSX

4
x11/gnustep/gworkspace/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.14 2011/05/18 13:08:25 sebastia Exp $
# $OpenBSD: Makefile,v 1.15 2011/06/24 10:54:51 sebastia Exp $
COMMENT= GNUstep workspace manager
DISTNAME= gworkspace-0.8.8
REVISION= 8
REVISION = 9
CATEGORIES= x11

14
x11/gnustep/gworkspace/patches/patch-GWMetadata_MDKit_MDKQueryManager_m Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-GWMetadata_MDKit_MDKQueryManager_m,v 1.1 2011/06/24 10:54:51 sebastia Exp $
fix to build with gcc-2.95
--- GWMetadata/MDKit/MDKQueryManager.m.orig Wed Jun 22 13:20:15 2011
+++ GWMetadata/MDKit/MDKQueryManager.m Wed Jun 22 13:20:22 2011
@@ -23,7 +23,6 @@
*/
#include <AppKit/AppKit.h>
-#include <GNUstepBase/NSTask+GS.h>
#include "MDKQueryManager.h"
#include "MDKFSFilter.h"
#include "FSNode.h"

16
x11/gnustep/gworkspace/patches/patch-GWMetadata_MDKit_SQLite_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-GWMetadata_MDKit_SQLite_h,v 1.1 2011/06/24 10:54:51 sebastia Exp $
fix to build with gcc-2.95
--- GWMetadata/MDKit/SQLite.h.orig Wed Jun 22 12:49:23 2011
+++ GWMetadata/MDKit/SQLite.h Wed Jun 22 12:49:42 2011
@@ -26,7 +26,9 @@
#define SQLITE_H
#include <Foundation/Foundation.h>
+#define id sqlite_id
#include <sqlite3.h>
+#undef id
@class SQLitePreparedStatement;

14
x11/gnustep/gworkspace/patches/patch-GWMetadata_Preferences_MDIndexing_m Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-GWMetadata_Preferences_MDIndexing_m,v 1.1 2011/06/24 10:54:51 sebastia Exp $
fix to build with gcc-2.95
--- GWMetadata/Preferences/MDIndexing.m.orig Wed Jun 22 15:10:45 2011
+++ GWMetadata/Preferences/MDIndexing.m Wed Jun 22 15:10:53 2011
@@ -23,7 +23,6 @@
*/
#include <AppKit/AppKit.h>
-#include <GNUstepBase/NSTask+GS.h>
#include "MDIndexing.h"
#include "CategoriesEditor.h"
#include "StartAppWin.h"

16
x11/gnustep/gworkspace/patches/patch-GWMetadata_gmds_gmds_sqlite_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-GWMetadata_gmds_gmds_sqlite_h,v 1.1 2011/06/24 10:54:51 sebastia Exp $
fix to build with gcc-2.95
--- GWMetadata/gmds/gmds/sqlite.h.orig Wed Jun 22 14:02:54 2011
+++ GWMetadata/gmds/gmds/sqlite.h Wed Jun 22 14:03:14 2011
@@ -26,7 +26,9 @@
#define SQLITE_H
#include <Foundation/Foundation.h>
+#define id sqlite_id
#include <sqlite3.h>
+#undef id
sqlite3 *opendbAtPath(NSString *path);

14
x11/gnustep/gworkspace/patches/patch-GWMetadata_gmds_mdextractor_updater_m Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-GWMetadata_gmds_mdextractor_updater_m,v 1.1 2011/06/24 10:54:51 sebastia Exp $
fix to build with gcc-2.95
--- GWMetadata/gmds/mdextractor/updater.m.orig Wed Jun 22 14:33:37 2011
+++ GWMetadata/gmds/mdextractor/updater.m Wed Jun 22 14:33:44 2011
@@ -23,7 +23,6 @@
*/
#include <Foundation/Foundation.h>
-#include <GNUstepBase/NSTask+GS.h>
#include <AppKit/AppKit.h>
#include <sys/types.h>
#include <sys/stat.h>

3
x11/gnustep/mpdcon/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2011/05/15 13:03:26 sebastia Exp $
# $OpenBSD: Makefile,v 1.3 2011/06/24 10:55:54 sebastia Exp $
COMMENT = GNUstep client for Music Player Daemon
DISTNAME = MPDCon-1.1.99
REVISION = 0
HOMEPAGE = http://sourceforge.net/projects/mpdcon/
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mpdcon/}

20
x11/gnustep/mpdcon/patches/patch-CollectionController_m Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-CollectionController_m,v 1.1 2011/06/24 10:55:54 sebastia Exp $
fix to build with gcc-2.95
--- CollectionController.m.orig Wed Jun 22 17:14:16 2011
+++ CollectionController.m Wed Jun 22 17:14:58 2011
@@ -361,11 +361,10 @@ objectValueForTableColumn: (NSTableColumn *)tableColum
- (void) _getAllAlbumsForArtistAt: (int)row
{
- RELEASE(allAlbums);
-
NSMutableSet *tmpAlbums = [[NSMutableSet alloc] init];
-
int i;
+ RELEASE(allAlbums);
+
for (i = 0; i < [filteredTracks count]; i++)
{

44
x11/gnustep/mpdcon/patches/patch-PlayView_m Normal file
View File

@ -0,0 +1,44 @@
$OpenBSD: patch-PlayView_m,v 1.1 2011/06/24 10:55:54 sebastia Exp $
fix to build with gcc-2.95
--- PlayView.m.orig Wed Jun 22 17:07:51 2011
+++ PlayView.m Wed Jun 22 17:08:57 2011
@@ -70,7 +70,7 @@
- (void) drawRect: (NSRect)rect
{
- NSRect myBounds;
+ NSRect myBounds, strokeRect;
NSData *colorData;
NSColor *displayColor;
@@ -108,7 +108,7 @@
[NSBezierPath fillRect: myBounds];
[[NSColor blackColor] set];
- NSRect strokeRect = NSMakeRect(myBounds.origin.x, myBounds.origin.y+1, myBounds.size.width-1, myBounds.size.height-1);
+ strokeRect = NSMakeRect(myBounds.origin.x, myBounds.origin.y+1, myBounds.size.width-1, myBounds.size.height-1);
[NSBezierPath strokeRect: strokeRect];
if (displayEnabled)
@@ -429,6 +429,8 @@
NSMutableDictionary *attributes;
NSFont *theFont;
+ NSString *timeString;
+ NSSize timeSize;
myBounds = [self bounds];
@@ -439,8 +441,8 @@
[attributes setObject: theFont forKey: NSFontAttributeName];
- NSString *timeString = [self _getTime];
- NSSize timeSize = [timeString sizeWithAttributes: attributes];
+ timeString = [self _getTime];
+ timeSize = [timeString sizeWithAttributes: attributes];
[timeString drawAtPoint: NSMakePoint(myBounds.size.width-timeSize.width-2
, 60)
withAttributes: attributes];

4
x11/gnustep/pantomime/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.9 2011/05/15 13:03:26 sebastia Exp $
# $OpenBSD: Makefile,v 1.10 2011/06/24 10:56:41 sebastia Exp $
COMMENT= framework to major mail protocols
DISTNAME= Pantomime-1.2.0pre3
REVISION= 4
REVISION = 5
SHARED_LIBS= Pantomime 1.2 # .1.2
CATEGORIES= mail

23
x11/gnustep/pantomime/patches/patch-Framework_Pantomime_CWIMAPCacheManager_m Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-Framework_Pantomime_CWIMAPCacheManager_m,v 1.1 2011/06/24 10:56:41 sebastia Exp $
fix to build with gcc-2.95
--- Framework/Pantomime/CWIMAPCacheManager.m.orig Tue Jun 21 18:54:50 2011
+++ Framework/Pantomime/CWIMAPCacheManager.m Tue Jun 21 18:55:25 2011
@@ -362,6 +362,7 @@ static unsigned short version = 1;
for (i = 0; i < _count; i++)
{
+ unsigned int uid;
//NSLog(@"===========");
len = read_unsigned_int(_fd);
//NSLog(@"i = %d len = %d", i, len);
@@ -371,7 +372,7 @@ static unsigned short version = 1;
// We write the rest of the record into the memory
if (read(_fd, (buf+total_length+4), len-4) < 0) { NSLog(@"read failed"); abort(); }
- unsigned int uid = read_unsigned_int_memory(buf+total_length+12);
+ uid = read_unsigned_int_memory(buf+total_length+12);
if ([self messageWithUID: uid])
{

4
x11/gnustep/pdfkit/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.4 2011/05/15 13:03:26 sebastia Exp $
# $OpenBSD: Makefile,v 1.5 2011/06/24 10:58:02 sebastia Exp $
COMMENT = framework for accessing and rendering PDF content
REVISION = 1
REVISION = 2
DISTNAME = PDFKit-0.9
SHARED_LIBS += PDFKit 0.0

18
x11/gnustep/pdfkit/patches/patch-PDFDocument_m Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-PDFDocument_m,v 1.1 2011/06/24 10:58:02 sebastia Exp $
fix build with gcc-2.95
--- PDFDocument.m.orig Wed Jun 22 09:04:04 2011
+++ PDFDocument.m Wed Jun 22 09:04:29 2011
@@ -188,9 +188,10 @@ static NSMutableDictionary *documentInfo = nil;
- (NSString*)metaData
{
+ const char* data;
NSAssert(![pdfDocRef isNULL], @"no document");
- const char* data = PDFDoc_getMetaData([pdfDocRef pointer]);
+ data = PDFDoc_getMetaData([pdfDocRef pointer]);
return (data != NULL ?
[[[NSString alloc] initWithCString: data] autorelease]
:

39
x11/gnustep/pdfkit/patches/patch-xpdf_bridge_CountingRef_h Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-xpdf_bridge_CountingRef_h,v 1.1 2011/06/24 10:58:02 sebastia Exp $
Fix build with gcc-2.95
--- xpdf/bridge/CountingRef.h.orig Wed Jun 22 08:45:17 2011
+++ xpdf/bridge/CountingRef.h Wed Jun 22 09:03:56 2011
@@ -21,9 +21,17 @@
#include <Foundation/NSObject.h>
-@protocol CountingRefDelegate;
+@class CountingRef;
/**
+ * Delegate for CountingRef's.
+ */
+@protocol CountingRefDelegate
+- (void) freePointerForReference: (CountingRef*)aReference;
+@end
+
+
+/**
* A ref-counting wrapper for pointers. When the
* get's the dealloc message, the associated pointer
* will be free'd using the CountingRef's delegate.
@@ -45,13 +53,4 @@
- (BOOL) isNULL;
@end
-
-
-/**
- * Delegate for CountingRef's.
- */
-@protocol CountingRefDelegate
-- (void) freePointerForReference: (CountingRef*)aReference;
-@end
-
#endif