From 092239fb78271f3c145f4adba01fe0a6c2fff3ff Mon Sep 17 00:00:00 2001
From: nox <nox@FreeBSD.org>
Date: Thu, 6 Aug 2009 16:41:35 +0000
Subject: - Limit the stack size for Google Earth.  Linux glibc threading
 behaves slightly differently with a smaller stack size and Google Earth (like
 the Flash plugins) relies on this behaviour. [1] - Bump PORTREVISION.

Reported by:	scf [1]
---
 astro/google-earth/Makefile              |  6 ++++--
 astro/google-earth/files/patch-stacksize | 10 ++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 astro/google-earth/files/patch-stacksize

(limited to 'astro/google-earth')

diff --git a/astro/google-earth/Makefile b/astro/google-earth/Makefile
index a7b9b1b96c96..9b107074d6ef 100644
--- a/astro/google-earth/Makefile
+++ b/astro/google-earth/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	google-earth
 PORTVERSION=	5.0.11733.9347
+PORTREVISION=	1
 CATEGORIES=	astro deskutils geography
 MASTER_SITES=	http://dl.google.com/earth/client/current/
 DISTNAME=	GoogleEarthLinux
@@ -45,7 +46,7 @@ do-extract:
 	@cd ${WRKSRC} && ${TAR} xf googleearth-data.tar && ${RM} -f googleearth-data.tar
 	@cd ${WRKSRC} && ${TAR} xf googleearth-linux-x86.tar && ${RM} -f googleearth-linux-x86.tar
 
-do-patch:
+pre-patch:
 	@${REINPLACE_CMD} -i "" -e 's|^# Set the home.*|GOOGLEEARTH_DATA_PATH=${DATADIR}|' ${WRKSRC}/bin/googleearth
 	@${REINPLACE_CMD} -i "" -e "s|^# Let's boogie.*|rm -f \$${HOME}/.googleearth/instance-running-lock|" ${WRKSRC}/bin/googleearth
 	@${REINPLACE_CMD} -i "" -e 's/^TMPPATH.*/exit 0/' ${WRKSRC}/postinstall.sh
@@ -54,7 +55,8 @@ do-patch:
 
 do-build:
 	@${SETENV} SETUP_INSTALLPATH=${DATADIR} ${WRKSRC}/postinstall.sh
-	@cd ${WRKSRC} && ${RM} -rf setup.* preuninstall.sh postinstall.sh
+	@cd ${WRKSRC} && ${RM} -rf setup.* preuninstall.sh postinstall.sh \
+		bin/googleearth.orig
 
 pre-su-install:
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
diff --git a/astro/google-earth/files/patch-stacksize b/astro/google-earth/files/patch-stacksize
new file mode 100644
index 000000000000..1927d545a67e
--- /dev/null
+++ b/astro/google-earth/files/patch-stacksize
@@ -0,0 +1,10 @@
+Index: bin/googleearth
+@@ -34,6 +34,8 @@
+     dirname $fullpath
+ }
+ 
++ulimit -s 32768 2>/dev/null
++
+ GOOGLEEARTH_DATA_PATH=/usr/local/share/google-earth
+ if [ "${GOOGLEEARTH_DATA_PATH}" = "" ]; then
+     GOOGLEEARTH_DATA_PATH="`FindPath $0`"
-- 
cgit