Attachment #82501 for bug #118004

View | Details | Raw Unified | Return to bug 118004
Collapse All | Expand All




USE_LDCONFIG=	yes
ONLY_FOR_ARCHS=	i386

.include <bsd.port.pre.mk>

.if ${OSVERSION} >= 700042
BROKEN=		Does not compile with GCC 4.2
.endif

post-patch:
	@${REINPLACE_CMD} -e '/@INSTALL@/s/$$INSTALL/${INSTALL}/' \
		${WRKSRC}/libyahoo/configure

.include <bsd.port.mk>

Added Link Here

(-)files/patch-gtkyahoo.c (+10 lines)
1	--- gtkyahoo.c.orig 2007-11-12 15:21:19.000000000 +0100
2	+++ gtkyahoo.c 2007-11-12 15:21:22.000000000 +0100
3	@@ -1456,6 +1456,7 @@
4	int setgeom = 0;
5	int curarg = 1;
6	GtkAllocation initial_geometry;
7	+ initial_geometry.x = initial_geometry.y = initial_geometry.width = initial_geometry.height = 0;
8
9	DBG_Open(NULL);
10




--- libyahoo/libyahoo.c.orig	2007-11-12 15:12:19.000000000 +0100
+++ libyahoo/libyahoo.c	2007-11-12 15:13:33.000000000 +0100
@@ -746,15 +746,15 @@
 static char *yahoo_urlencode(const char *instr)
 {
 	register int ipos, bpos;	//input str pos., buffer pos.
-	static unsigned char *str = NULL;
+	static char *str = NULL;
 	int len = strlen(instr);
 	int tmp;
 
 	//attempt to reuse buffer
 	if (NULL == str)
-		str = (unsigned char *) malloc(3 * len + 1);
+		str = malloc(3 * len + 1);
 	else
-		str = (unsigned char *) realloc(str, 3 * len + 1);
+		str = realloc(str, 3 * len + 1);
 
 	//malloc, realloc failed ?
 	if (errno == ENOMEM)
@@ -791,7 +791,7 @@
 
 	//free extra alloc'ed mem.
 	tmp = strlen(str);
-	str = (unsigned char *) realloc(str, tmp + 1);
+	str = realloc(str, tmp + 1);
 
 	return (str);
 }

Lines 4-11 Link Here

(-)pkg-plist (-2 / +1 lines)
4	include/libyahoo/libyahoo-debug.h	4	include/libyahoo/libyahoo-debug.h
5	include/libyahoo/libyahoo-proto.h	5	include/libyahoo/libyahoo-proto.h
6	lib/libyahoo.a	6	lib/libyahoo.a
7	lib/libyahoo.so	7	lib/libyahoo.so.0.0
8	lib/libyahoo.so.0
9	lib/libyahoo.la	8	lib/libyahoo.la
10	libexec/gtkyahoo-sound-handler	9	libexec/gtkyahoo-sound-handler
11	%%DATADIR%%/sample.gtkyahoorc	10	%%DATADIR%%/sample.gtkyahoorc

Return to bug 118004

Lines 22-35 Link Here

(-)Makefile (-7 / +1 lines)
22	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
23	ONLY_FOR_ARCHS= i386	23	ONLY_FOR_ARCHS= i386
24		24
25	.include <bsd.port.pre.mk>
26
27	.if ${OSVERSION} >= 700042
28	BROKEN= Does not compile with GCC 4.2
29	.endif
30
31	post-patch:	25	post-patch:
32	@${REINPLACE_CMD} -e '/@INSTALL@/s/$$INSTALL/${INSTALL}/' \	26	@${REINPLACE_CMD} -e '/@INSTALL@/s/$$INSTALL/${INSTALL}/' \
33	${WRKSRC}/libyahoo/configure	27	${WRKSRC}/libyahoo/configure
34		28
35	.include <bsd.port.post.mk>	29	.include <bsd.port.mk>

Added Link Here

(-)files/patch-libyahoo_libyahoo.c (+30 lines)
1	--- libyahoo/libyahoo.c.orig 2007-11-12 15:12:19.000000000 +0100
2	+++ libyahoo/libyahoo.c 2007-11-12 15:13:33.000000000 +0100
3	@@ -746,15 +746,15 @@
4	static char yahoo_urlencode(const char instr)
5	{
6	register int ipos, bpos; //input str pos., buffer pos.
7	- static unsigned char *str = NULL;
8	+ static char *str = NULL;
9	int len = strlen(instr);
10	int tmp;
11
12	//attempt to reuse buffer
13	if (NULL == str)
14	- str = (unsigned char ) malloc(3 len + 1);
15	+ str = malloc(3 * len + 1);
16	else
17	- str = (unsigned char ) realloc(str, 3 len + 1);
18	+ str = realloc(str, 3 * len + 1);
19
20	//malloc, realloc failed ?
21	if (errno == ENOMEM)
22	@@ -791,7 +791,7 @@
23
24	//free extra alloc'ed mem.
25	tmp = strlen(str);
26	- str = (unsigned char *) realloc(str, tmp + 1);
27	+ str = realloc(str, tmp + 1);
28
29	return (str);
30	}