Bug 180748 - [PATCH] Fix for lang/ofc provided
Summary: [PATCH] Fix for lang/ofc provided
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Vanilla I. Shu
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-07-23 00:40 UTC by John Marino
Modified: 2013-07-28 05:30 UTC (History)
0 users

See Also:

Attachments
file.diff (2.11 KB, patch)
2013-07-23 00:40 UTC, John Marino 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description John Marino 2013-07-23 00:40:00 UTC 
lang/ofc is does not work with zlib 1.2.7 and higher.  Now that FreeBSD (and DragonFly) come with zlib 1.2.8, lang/ofc no longer builds.

Add the two attached patches to restore the build by fixing zlib interface.
Passes 4X redports with these patches:

https://redports.org/buildarchive/20130722221400-45212/

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-07-23 00:40:10 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->vanilla

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-07-28 05:20:40 UTC 
Author: vanilla
Date: Sun Jul 28 04:20:32 2013
New Revision: 323810
URL: http://svnweb.freebsd.org/changeset/ports/323810

Log:
  1: Fix build with newer zlib [1]
  2: switch to gcc46.
  
  PR:		ports/180748
  Submitted by:	John Marino <freebsd at marino.st> [1]

Added:
  head/lang/ofc/files/patch-ofc_DGZipFile.h   (contents, props changed)
  head/lang/ofc/files/patch-ofc_DGZipFile.m   (contents, props changed)
Modified:
  head/lang/ofc/Makefile

Modified: head/lang/ofc/Makefile
==============================================================================
--- head/lang/ofc/Makefile	Sat Jul 27 22:50:01 2013	(r323809)
+++ head/lang/ofc/Makefile	Sun Jul 28 04:20:32 2013	(r323810)
@@ -18,7 +18,7 @@ LIB_DEPENDS=	expat:${PORTSDIR}/textproc/
 PROJECTHOST=	${PORTNAME}
 USE_SDL=	sdl
 USE_AUTOTOOLS=	libtool
-USES=	pathfix
+USES=		pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 ${PTHREAD_CFLAGS}
@@ -38,7 +38,7 @@ LIB_DEPENDS+=	gmp:${PORTSDIR}/math/gmp
 
 .if ${OSVERSION} >= 900000
 # needs libobjc
-GCCSUFFIX=42
+GCCSUFFIX=	46
 CC=		gcc${GCCSUFFIX}
 CXX=		g++${GCCSUFFIX}
 OFC_GCC_PORT?=	lang/gcc${GCCSUFFIX}

Added: head/lang/ofc/files/patch-ofc_DGZipFile.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/ofc/files/patch-ofc_DGZipFile.h	Sun Jul 28 04:20:32 2013	(r323810)
@@ -0,0 +1,19 @@
+--- ofc/DGZipFile.h.orig	2008-08-02 15:15:11.000000000 +0000
++++ ofc/DGZipFile.h
+@@ -46,6 +46,7 @@
+ #endif
+ 
+ #ifdef HAVE_DGZIPFILE
++#include <zlib.h>
+ 
+ // the seek origins
+ #define DGZ_SEEK_SET  (0)    // Seek from the start of the file
+@@ -114,7 +115,7 @@
+ @interface DGZipFile : Object <DTextReadable,DTextWritable,DDataReadable,DDataWritable>
+ {
+ @private
+-  void           *_file;    // the file pointer
++  gzFile          _file;    // the file pointer
+ }
+ 
+ #endif

Added: head/lang/ofc/files/patch-ofc_DGZipFile.m
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/ofc/files/patch-ofc_DGZipFile.m	Sun Jul 28 04:20:32 2013	(r323810)
@@ -0,0 +1,22 @@
+--- ofc/DGZipFile.m.orig	2008-08-02 05:58:14.000000000 +0000
++++ ofc/DGZipFile.m
+@@ -31,10 +31,6 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-#ifdef HAVE_DGZIPFILE
+-#include <zlib.h>
+-#endif
+-
+ #include "ofc/DDatable.h"
+ 
+ 
+@@ -123,7 +119,7 @@
+ @interface DGZipFile : Object <DTextReadable,DTextWritable,DDataReadable,DDataWritable>
+ {
+ @private
+-  void           *_file;    // the file pointer
++  gzFile          _file;    // the file pointer
+ }
+ 
+ #endif
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Vanilla I. Shu freebsd_committer freebsd_triage 2013-07-28 05:24:37 UTC 
State Changed
From-To: open->closed

Committed, thanks.