svn commit: r388647 - in head/games/oolite: . files
Guido Falsi
madpilot at FreeBSD.org
Fri Jun 5 23:26:15 UTC 2015
Author: madpilot
Date: Fri Jun 5 23:26:11 2015
New Revision: 388647
URL: https://svnweb.freebsd.org/changeset/ports/388647
Log:
- Update to 1.82
- Convert to USES gnustep and unbreak
- Regenerate patches to silence portlint warnings
PR: 200496
Submitted by: lightside at gmx.com
Deleted:
head/games/oolite/files/patch-src_Core_Materials_OOPNGTextureLoader.m
head/games/oolite/files/patch-src_Core_OOOXZManager.m
Modified:
head/games/oolite/Makefile
head/games/oolite/distinfo
head/games/oolite/files/patch-deps_mozilla-bug771281
head/games/oolite/files/patch-deps_mozilla_js_src_configure
head/games/oolite/files/patch-deps_mozilla_js_src_configure.in
head/games/oolite/files/patch-deps_mozilla_js_src_jsscript.h
head/games/oolite/files/patch-deps_mozilla_js_src_jsstr.cpp
head/games/oolite/files/patch-src_Core_OOMaths.h
head/games/oolite/files/patch-src_Core_OOPointMaths.h
Modified: head/games/oolite/Makefile
==============================================================================
--- head/games/oolite/Makefile Fri Jun 5 23:20:33 2015 (r388646)
+++ head/games/oolite/Makefile Fri Jun 5 23:26:11 2015 (r388647)
@@ -2,18 +2,15 @@
# $FreeBSD$
PORTNAME= oolite
-PORTVERSION= 1.80
-PORTREVISION= 2
+PORTVERSION= 1.82
CATEGORIES= games gnustep
-MASTER_SITES= http://github.com/OoliteProject/oolite/releases/download/1.80b/
+MASTER_SITES= http://github.com/OoliteProject/oolite/releases/download/1.82/
DISTNAME= ${PORTNAME}-source-${PORTVERSION}
DIST_SUBDIR= oolite
MAINTAINER= ports at FreeBSD.org
COMMENT= Trade and combat space simulator, clone of Elite
-BROKEN= Not converted to USES=gnustep
-
LICENSE= CCBYNCSAv3 GPLv2 ZLIB
LICENSE_COMB= multi
LICENSE_NAME_CCBYNCSAv3= Creative Commons Attribution-NonCommercial-ShareAlike License version 3.0
@@ -28,16 +25,18 @@ LIB_DEPENDS= libespeak.so:${PORTSDIR}/a
libpng.so:${PORTSDIR}/graphics/png \
libminizip.so:${PORTSDIR}/archivers/minizip
-USES= gmake openal:al perl5 python:build tar:bzip2
+USES= gnustep openal:al perl5 python:build tar:bzip2
USE_GL= yes
USE_SDL= sdl
-USE_GNUSTEP= yes
-USE_GNUSTEP_BASE= yes
-USE_GNUSTEP_BUILD= yes
-USE_MAKEFILE= yes
+USE_GNUSTEP= base build
+# Redefine DO_MAKE_BUILD, because current gnustep in USES overrides MAKEFILE
+# without possibility to change it, as it was done in the previous implementation
+DO_MAKE_BUILD= ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g}
ALL_TARGET= release-deployment
USE_PERL5= build
+GNUSTEP_LOCAL_APPS= ${GNUSTEP_LOCAL_ROOT}/Applications
+
SUB_FILES= oolite
SUB_LIST= GNUSTEP_SYSTEM_TOOLS="${GNUSTEP_SYSTEM_TOOLS}"
@@ -55,33 +54,36 @@ OPTIONS_DEFINE= DOCS
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 900014
-BUILD_DEPENDS+= clang34:${PORTSDIR}/lang/clang34
-CC= ${LOCALBASE}/bin/clang34
-CXX= ${LOCALBASE}/bin/clang++34
-CPP= ${LOCALBASE}/bin/clang-cpp34
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900014
+WITH_PORTS_CLANG= yes
.elif exists(${CC})
CCVERSION!= ${CC} --version
COMPILER_VERSION= ${CCVERSION:M[0-9].[0-9]*:C/([0-9]).?/\1/g}
COMPILER_IS_CLANG= ${CCVERSION:Mclang}
-
# Check for LLVM/Clang v3.4.1
.if ${COMPILER_IS_CLANG} && ${COMPILER_VERSION} == 341
-# Force to use optimization for size, because of speed optimization error(s)
+# Use compiler from ports, because of errors
# for ${WRKSRC}/src/Core/Scripting/OOJavaScriptEngine.m file
-ADD_OBJCFLAGS= s|-std=c99|-std=c99 -Os|
+WITH_PORTS_CLANG= yes
.endif
.endif
+.if defined(WITH_PORTS_CLANG)
+BUILD_DEPENDS+= clang34:${PORTSDIR}/lang/clang34
+CC= ${LOCALBASE}/bin/clang34
+CXX= ${LOCALBASE}/bin/clang++34
+CPP= ${LOCALBASE}/bin/clang-cpp34
+.endif
+
post-patch: .SILENT
${REINPLACE_CMD} -e 's/GNUSTEP_USER_ROOT/GNUSTEP_LOCAL_ROOT/ ; \
s/sdl-config/$${SDL_CONFIG}/ ; \
- s|-lstdc++|`$${SDL_CONFIG} --libs` -lstdc++| ; \
+ s|-lstdc++|`$${SDL_CONFIG} --libs` &| ; \
s|:src/Core/MiniZip|| ; \
s|-Isrc/Core/MiniZip|-I$${LOCALBASE}/include/minizip| ; \
s|-lz|-lminizip| ; \
/ioapi.c/d ; /unzip.c/d ; \
- s|/usr/X11R6|$${LOCALBASE}| ; ${ADD_OBJCFLAGS}' \
+ s|/usr/X11R6|$${LOCALBASE}|' \
${WRKSRC}/GNUmakefile
# Conversion needed for unsigned int type for using isfinite function
${REINPLACE_CMD} -e 's|isfinite(uValue)|isfinite((long double)uValue)|' \
@@ -91,11 +93,13 @@ post-patch: .SILENT
${WRKSRC}/src/Core/NSFileManagerOOExtensions.h
do-install:
- cd ${RELEASEDIR} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}
+ (cd ${RELEASEDIR} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
${INSTALL_SCRIPT} ${WRKDIR}/oolite ${STAGEDIR}${PREFIX}/bin
${INSTALL_PROGRAM} ${RELEASEDIR}/oolite ${STAGEDIR}${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/installers/FreeDesktop/oolite.desktop ${STAGEDIR}${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKSRC}/installers/FreeDesktop/oolite-icon.png ${STAGEDIR}${PREFIX}/share/pixmaps
- cd ${WRKSRC}/Doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/installers/FreeDesktop/oolite.desktop \
+ ${STAGEDIR}${PREFIX}/share/applications
+ ${INSTALL_DATA} ${WRKSRC}/installers/FreeDesktop/oolite-icon.png \
+ ${STAGEDIR}${PREFIX}/share/pixmaps
+ (cd ${WRKSRC}/Doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
.include <bsd.port.post.mk>
Modified: head/games/oolite/distinfo
==============================================================================
--- head/games/oolite/distinfo Fri Jun 5 23:20:33 2015 (r388646)
+++ head/games/oolite/distinfo Fri Jun 5 23:26:11 2015 (r388647)
@@ -1,2 +1,2 @@
-SHA256 (oolite/oolite-source-1.80.tar.bz2) = a9bea03435cd7fd05b4519a44345e4ff4857a799aef79913733ddc5d7a537bdf
-SIZE (oolite/oolite-source-1.80.tar.bz2) = 139397592
+SHA256 (oolite/oolite-source-1.82.tar.bz2) = aa7ac77ea3d81d8ee13602f1490aef9cc60434c8083b1b7c8ff8ff9f2a8ca7d8
+SIZE (oolite/oolite-source-1.82.tar.bz2) = 139691456
Modified: head/games/oolite/files/patch-deps_mozilla-bug771281
==============================================================================
--- head/games/oolite/files/patch-deps_mozilla-bug771281 Fri Jun 5 23:20:33 2015 (r388646)
+++ head/games/oolite/files/patch-deps_mozilla-bug771281 Fri Jun 5 23:26:11 2015 (r388647)
@@ -1,6 +1,6 @@
diff -ruN deps.orig/mozilla/js/src/shell/Makefile.in deps/mozilla/js/src/shell/Makefile.in
---- deps.orig/mozilla/js/src/shell/Makefile.in 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/shell/Makefile.in 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/shell/Makefile.in 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/shell/Makefile.in
@@ -47,7 +47,6 @@
PROGRAM = js$(BIN_SUFFIX)
CPPSRCS = \
@@ -10,8 +10,8 @@ diff -ruN deps.orig/mozilla/js/src/shell
DEFINES += -DEXPORT_JS_API
diff -ruN deps.orig/mozilla/js/src/shell/js.cpp deps/mozilla/js/src/shell/js.cpp
---- deps.orig/mozilla/js/src/shell/js.cpp 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/shell/js.cpp 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/shell/js.cpp 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/shell/js.cpp
@@ -91,8 +91,6 @@
#endif /* JSDEBUGGER_C_UI */
#endif /* JSDEBUGGER */
@@ -85,8 +85,8 @@ diff -ruN deps.orig/mozilla/js/src/shell
if (jsdc) {
#ifdef JSDEBUGGER_C_UI
diff -ruN deps.orig/mozilla/js/src/shell/jsworkers.cpp.rej deps/mozilla/js/src/shell/jsworkers.cpp.rej
---- deps.orig/mozilla/js/src/shell/jsworkers.cpp.rej 1970-01-01 03:00:00.000000000 +0300
-+++ deps/mozilla/js/src/shell/jsworkers.cpp.rej 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/shell/jsworkers.cpp.rej 1970-01-01 00:00:00 UTC
++++ deps/mozilla/js/src/shell/jsworkers.cpp.rej
@@ -0,0 +1,1281 @@
+@@ -1,1280 +0,0 @@
+-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -1370,8 +1370,8 @@ diff -ruN deps.orig/mozilla/js/src/shell
+-
+-#endif /* JS_THREADSAFE */
diff -ruN deps.orig/mozilla/js/src/shell/jsworkers.h deps/mozilla/js/src/shell/jsworkers.h
---- deps.orig/mozilla/js/src/shell/jsworkers.h 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/shell/jsworkers.h 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/shell/jsworkers.h 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/shell/jsworkers.h
@@ -1,93 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
@@ -1467,8 +1467,8 @@ diff -ruN deps.orig/mozilla/js/src/shell
-
-#endif /* jsworkers_h___ */
diff -ruN deps.orig/mozilla/js/src/tests/browser.js deps/mozilla/js/src/tests/browser.js
---- deps.orig/mozilla/js/src/tests/browser.js 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/browser.js 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/browser.js 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/browser.js
@@ -767,17 +767,6 @@
document.write(s);
}
@@ -1488,8 +1488,8 @@ diff -ruN deps.orig/mozilla/js/src/tests
{
// gDelayTestDriverEnd is used to
diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/jstests.list deps/mozilla/js/src/tests/js1_8_5/extensions/jstests.list
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/jstests.list 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/jstests.list 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/jstests.list 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/jstests.list
@@ -1,13 +1,6 @@
url-prefix ../../jsreftest.html?test=js1_8_5/extensions/
script typedarray.js
@@ -1505,8 +1505,8 @@ diff -ruN deps.orig/mozilla/js/src/tests
script array-length-protochange.js
script parseInt-octal.js
diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-child.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-child.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-child.js 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-child.js 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-child.js 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-child.js
@@ -1,9 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
@@ -1518,8 +1518,8 @@ diff -ruN deps.orig/mozilla/js/src/tests
- throw new Error("fail");
-}
diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation-child.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation-child.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation-child.js 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation-child.js 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation-child.js 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation-child.js
@@ -1,16 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
@@ -1538,8 +1538,8 @@ diff -ruN deps.orig/mozilla/js/src/tests
- w.postMessage(n - 1 + "");
-}
diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation.js 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation.js 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation.js 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation.js
@@ -1,20 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
@@ -1562,8 +1562,8 @@ diff -ruN deps.orig/mozilla/js/src/tests
- reportCompare(0, 0, " PASSED! Test skipped. Shell workers required.");
-}
diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error.js 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error.js 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error.js 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error.js
@@ -1,21 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
@@ -1587,8 +1587,8 @@ diff -ruN deps.orig/mozilla/js/src/tests
- reportCompare(0, 0, "Test skipped. Shell workers required.");
-}
diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-fib-child.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-fib-child.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-fib-child.js 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-fib-child.js 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-fib-child.js 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-fib-child.js
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
@@ -1618,8 +1618,8 @@ diff -ruN deps.orig/mozilla/js/src/tests
- }
-}
diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-fib.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-fib.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-fib.js 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-fib.js 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-fib.js 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-fib.js
@@ -1,18 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
@@ -1640,8 +1640,8 @@ diff -ruN deps.orig/mozilla/js/src/tests
- reportCompare(0, 0, "Test skipped. Shell workers required.");
-}
diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-init-child.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-init-child.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-init-child.js 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-init-child.js 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-init-child.js 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-init-child.js
@@ -1,8 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
@@ -1652,8 +1652,8 @@ diff -ruN deps.orig/mozilla/js/src/tests
-postMessage('do your worst');
-for (;;) ;
diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-init.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-init.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-init.js 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-init.js 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-init.js 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-init.js
@@ -1,19 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
@@ -1675,8 +1675,8 @@ diff -ruN deps.orig/mozilla/js/src/tests
- reportCompare(0, 0, "Test skipped. Shell workers required.");
-}
diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-simple-child.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-simple-child.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-simple-child.js 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-simple-child.js 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-simple-child.js 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-simple-child.js
@@ -1,8 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
@@ -1687,8 +1687,8 @@ diff -ruN deps.orig/mozilla/js/src/tests
-
-onmessage = function (event) { postMessage(event.data); };
diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-simple.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-simple.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-simple.js 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-simple.js 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-simple.js 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-simple.js
@@ -1,20 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
@@ -1711,8 +1711,8 @@ diff -ruN deps.orig/mozilla/js/src/tests
- reportCompare(0, 0, "Test skipped. Shell workers required.");
-}
diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-child.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-child.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-child.js 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-child.js 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-child.js 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-child.js
@@ -1,13 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
@@ -1728,8 +1728,8 @@ diff -ruN deps.orig/mozilla/js/src/tests
- postMessage("killed");
-};
diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-iloop.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-iloop.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-iloop.js 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-iloop.js 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-iloop.js 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-iloop.js
@@ -1,9 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
@@ -1741,8 +1741,8 @@ diff -ruN deps.orig/mozilla/js/src/tests
-for (;;)
- ;
diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate.js 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate.js 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate.js 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate.js
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
@@ -1782,8 +1782,8 @@ diff -ruN deps.orig/mozilla/js/src/tests
- reportCompare(0, 0, "Test skipped. Shell workers required.");
-}
diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout-child.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout-child.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout-child.js 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout-child.js 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout-child.js 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout-child.js
@@ -1,9 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
@@ -1795,8 +1795,8 @@ diff -ruN deps.orig/mozilla/js/src/tests
-for (;;)
- ;
diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout.js 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout.js 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout.js 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout.js
@@ -1,18 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
@@ -1817,8 +1817,8 @@ diff -ruN deps.orig/mozilla/js/src/tests
- reportCompare(0, 0, "Test skipped. Shell workers and timeout required.");
-}
diff -ruN deps.orig/mozilla/js/src/tests/shell.js deps/mozilla/js/src/tests/shell.js
---- deps.orig/mozilla/js/src/tests/shell.js 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/shell.js 2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/shell.js 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/shell.js
@@ -833,18 +833,6 @@
}
}
Modified: head/games/oolite/files/patch-deps_mozilla_js_src_configure
==============================================================================
--- head/games/oolite/files/patch-deps_mozilla_js_src_configure Fri Jun 5 23:20:33 2015 (r388646)
+++ head/games/oolite/files/patch-deps_mozilla_js_src_configure Fri Jun 5 23:26:11 2015 (r388647)
@@ -1,5 +1,5 @@
---- deps/mozilla/js/src/configure.orig 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/configure 2014-09-24 04:01:12.000000000 +0400
+--- deps/mozilla/js/src/configure.orig 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/configure
@@ -9547,7 +9547,8 @@
echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6
Modified: head/games/oolite/files/patch-deps_mozilla_js_src_configure.in
==============================================================================
--- head/games/oolite/files/patch-deps_mozilla_js_src_configure.in Fri Jun 5 23:20:33 2015 (r388646)
+++ head/games/oolite/files/patch-deps_mozilla_js_src_configure.in Fri Jun 5 23:26:11 2015 (r388647)
@@ -1,5 +1,5 @@
---- deps/mozilla/js/src/configure.in.orig 2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/configure.in 2014-09-23 08:13:19.000000000 +0400
+--- deps/mozilla/js/src/configure.in.orig 2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/configure.in
@@ -3378,7 +3378,8 @@
rm -f conftest.{c,S}
])
Modified: head/games/oolite/files/patch-deps_mozilla_js_src_jsscript.h
==============================================================================
--- head/games/oolite/files/patch-deps_mozilla_js_src_jsscript.h Fri Jun 5 23:20:33 2015 (r388646)
+++ head/games/oolite/files/patch-deps_mozilla_js_src_jsscript.h Fri Jun 5 23:26:11 2015 (r388647)
@@ -5,8 +5,8 @@
# Parent 284ebc48b2cb8e35dc04482ede700e717d8d214f
Bug 662962 - Silence the clang warnings issued because of alignment requirements increase when compiling jsscript.h; r=Waldo
---- deps/mozilla/js/src/jsscript.h.orig 2011-04-01 06:08:36.000000000 +1100
-+++ deps/mozilla/js/src/jsscript.h 2013-05-26 00:23:16.202260566 +1000
+--- deps/mozilla/js/src/jsscript.h.orig 2011-03-31 19:08:36 UTC
++++ deps/mozilla/js/src/jsscript.h
@@ -496,32 +496,32 @@
JSObjectArray *objects() {
Modified: head/games/oolite/files/patch-deps_mozilla_js_src_jsstr.cpp
==============================================================================
--- head/games/oolite/files/patch-deps_mozilla_js_src_jsstr.cpp Fri Jun 5 23:20:33 2015 (r388646)
+++ head/games/oolite/files/patch-deps_mozilla_js_src_jsstr.cpp Fri Jun 5 23:26:11 2015 (r388647)
@@ -5,8 +5,8 @@
# Parent cecc5adfc44068fb6f11b9baa78cb5fddc100b27
Bug 662961 - Silence the clang warnings issued because of alignment requirements increase when compiling jsstr.cpp; r=Waldo
---- deps/mozilla/js/src/jsstr.cpp.orig 2013-05-26 00:44:33.383765764 +1000
-+++ deps/mozilla/js/src/jsstr.cpp 2013-05-26 00:46:35.842211859 +1000
+--- deps/mozilla/js/src/jsstr.cpp.orig 2013-05-25 14:44:33 UTC
++++ deps/mozilla/js/src/jsstr.cpp
@@ -3147,7 +3147,7 @@
*/
#define R(c) { \
Modified: head/games/oolite/files/patch-src_Core_OOMaths.h
==============================================================================
--- head/games/oolite/files/patch-src_Core_OOMaths.h Fri Jun 5 23:20:33 2015 (r388646)
+++ head/games/oolite/files/patch-src_Core_OOMaths.h Fri Jun 5 23:26:11 2015 (r388647)
@@ -1,5 +1,5 @@
---- src/Core/OOMaths.h.orig 2014-06-30 12:50:36.000000000 +0400
-+++ src/Core/OOMaths.h 2014-10-14 07:20:31.000000000 +0400
+--- src/Core/OOMaths.h.orig 2014-06-30 08:50:36 UTC
++++ src/Core/OOMaths.h
@@ -48,7 +48,8 @@
#endif
Modified: head/games/oolite/files/patch-src_Core_OOPointMaths.h
==============================================================================
--- head/games/oolite/files/patch-src_Core_OOPointMaths.h Fri Jun 5 23:20:33 2015 (r388646)
+++ head/games/oolite/files/patch-src_Core_OOPointMaths.h Fri Jun 5 23:26:11 2015 (r388647)
@@ -1,5 +1,5 @@
---- src/Core/OOPointMaths.h.orig 2014-06-30 12:50:36.000000000 +0400
-+++ src/Core/OOPointMaths.h 2014-10-16 13:51:36.000000000 +0400
+--- src/Core/OOPointMaths.h.orig 2014-06-30 08:50:36 UTC
++++ src/Core/OOPointMaths.h
@@ -1,5 +1,6 @@
#import "OOFunctionAttributes.h"
-#include <tgmath.h>
More information about the svn-ports-all
mailing list