From owner-freebsd-ports  Sat Sep 21  2:50: 8 2002
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D588337B401
	for <freebsd-ports@hub.freebsd.org>; Sat, 21 Sep 2002 02:50:05 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7273F43E88
	for <freebsd-ports@hub.freebsd.org>; Sat, 21 Sep 2002 02:50:03 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L9o3Co015314
	for <freebsd-ports@freefall.freebsd.org>; Sat, 21 Sep 2002 02:50:03 -0700 (PDT)
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L9o3p4015313;
	Sat, 21 Sep 2002 02:50:03 -0700 (PDT)
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 7138137B401; Sat, 21 Sep 2002 02:46:25 -0700 (PDT)
Received: from topaz.mdcc.cx (topaz.mdcc.cx [212.204.230.141])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 10B5143E6E; Sat, 21 Sep 2002 02:46:25 -0700 (PDT)
	(envelope-from edwin@mavetju.org)
Received: from k7.mavetju (topaz.mdcc.cx [212.204.230.141])
	by topaz.mdcc.cx (Postfix) with ESMTP
	id 6B0442B67B; Sat, 21 Sep 2002 11:46:22 +0200 (CEST)
Received: by k7.mavetju (Postfix, from userid 1001)
	id 74ACD6A7124; Sat, 21 Sep 2002 19:46:17 +1000 (EST)
Message-Id: <20020921094617.74ACD6A7124@k7.mavetju>
Date: Sat, 21 Sep 2002 19:46:17 +1000 (EST)
From: Edwin Groothuis <edwin@mavetju.org>
Reply-To: Edwin Groothuis <edwin@mavetju.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: gnome@FreeBSD.org
X-Send-Pr-Version: 3.113
Subject: ports/43157: [patch] unbreak x11/gnomecore for <4.6
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         43157
>Category:       ports
>Synopsis:       [patch] unbreak x11/gnomecore for <4.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 21 02:50:02 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Edwin Groothuis
>Release:        FreeBSD 4.5-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 4.5-RELEASE FreeBSD 4.5-RELEASE #4: Sat Sep 14 10:41:50 EST 2002 edwin@k7.mavetju:/usr/src/sys/compile/k7 i386


>Description:

Since the upgrade to gnomecore-1.4.2, it won't compile anymore under
FreeBSD 4.5. Reason? it's using langinfo.h

>How-To-Repeat:

obvious

>Fix:

- When running <4.6, apply the attached patch
  (4.5-panel::gnome-panel-screenshot.c)

- Apply this patch to Makefile

--- Makefile.old	Sat Sep 21 19:05:57 2002
+++ Makefile	Sat Sep 21 19:33:38 2002
@@ -37,8 +37,14 @@
 		session-properties-capplet.1 
 MAN5=		default.session.5
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 460000
+EXTRA_PATCHES	+= ${FILESDIR}/4.5-panel::gnome-panel-screenshot.c
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>


*** 4.5-panel::gnome-panel-screenshot.c:

--- panel/gnome-panel-screenshot.c.old	Sat Sep 21 19:11:55 2002
+++ panel/gnome-panel-screenshot.c	Sat Sep 21 19:04:23 2002
@@ -53,7 +53,7 @@
 #include <libart_lgpl/art_rgb_affine.h>
 
 #include <stdio.h>
-#include <langinfo.h>
+/*#include <langinfo.h> */
 
 /* How far down the window tree will we search when looking for top-level
  * windows? Some window managers doubly-reparent the client, so account
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message