[arch-commits] Commit in 0ad/repos (8 files)
Date: Saturday, November 5, 2016 @ 05:20:30 Author: svenstaro Revision: 194674 archrelease: copy trunk to community-i686, community-x86_64 Added: 0ad/repos/community-i686/0ad-gcc6.patch (from rev 194673, 0ad/trunk/0ad-gcc6.patch) 0ad/repos/community-i686/PKGBUILD (from rev 194673, 0ad/trunk/PKGBUILD) 0ad/repos/community-x86_64/0ad-gcc6.patch (from rev 194673, 0ad/trunk/0ad-gcc6.patch) 0ad/repos/community-x86_64/PKGBUILD (from rev 194673, 0ad/trunk/PKGBUILD) Deleted: 0ad/repos/community-i686/0ad-gcc6.patch 0ad/repos/community-i686/PKGBUILD 0ad/repos/community-x86_64/0ad-gcc6.patch 0ad/repos/community-x86_64/PKGBUILD -+ /0ad-gcc6.patch | 62 ++ /PKGBUILD | 128 ++ community-i686/0ad-gcc6.patch | 31 - community-i686/PKGBUILD | 64 --- community-x86_64/0ad-gcc6.patch | 31 - community-x86_64/PKGBUILD | 64 --- 6 files changed, 190 insertions(+), 190 deletions(-) Deleted: community-i686/0ad-gcc6.patch === --- community-i686/0ad-gcc6.patch 2016-11-05 05:20:09 UTC (rev 194673) +++ community-i686/0ad-gcc6.patch 2016-11-05 05:20:30 UTC (rev 194674) @@ -1,31 +0,0 @@ -Index: libraries/source/nvtt/src/src/nvimage/ImageIO.cpp -=== libraries/source/nvtt/src/src/nvimage/ImageIO.cpp (revision 18164) -+++ libraries/source/nvtt/src/src/nvimage/ImageIO.cpp (working copy) -@@ -621,7 +621,7 @@ - png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if (png_ptr == NULL) { - // nvDebug( "*** LoadPNG: Error allocating read buffer in file '%s'.\n", name ); -- return false; -+ return NULL; - } - - // Allocate/initialize a memory block for the image information -@@ -629,7 +629,7 @@ - if (info_ptr == NULL) { - png_destroy_read_struct(_ptr, NULL, NULL); - // nvDebug( "*** LoadPNG: Error allocating image information for '%s'.\n", name ); -- return false; -+ return NULL; - } - - // Set up the error handling -@@ -636,7 +636,7 @@ - if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(_ptr, _ptr, NULL); - // nvDebug( "*** LoadPNG: Error reading png file '%s'.\n", name ); -- return false; -+ return NULL; - } - - // Set up the I/O functions. Copied: 0ad/repos/community-i686/0ad-gcc6.patch (from rev 194673, 0ad/trunk/0ad-gcc6.patch) === --- community-i686/0ad-gcc6.patch (rev 0) +++ community-i686/0ad-gcc6.patch 2016-11-05 05:20:30 UTC (rev 194674) @@ -0,0 +1,31 @@ +Index: libraries/source/nvtt/src/src/nvimage/ImageIO.cpp +=== +--- libraries/source/nvtt/src/src/nvimage/ImageIO.cpp (revision 18164) libraries/source/nvtt/src/src/nvimage/ImageIO.cpp (working copy) +@@ -621,7 +621,7 @@ + png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if (png_ptr == NULL) { + // nvDebug( "*** LoadPNG: Error allocating read buffer in file '%s'.\n", name ); +- return false; ++ return NULL; + } + + // Allocate/initialize a memory block for the image information +@@ -629,7 +629,7 @@ + if (info_ptr == NULL) { + png_destroy_read_struct(_ptr, NULL, NULL); + // nvDebug( "*** LoadPNG: Error allocating image information for '%s'.\n", name ); +- return false; ++ return NULL; + } + + // Set up the error handling +@@ -636,7 +636,7 @@ + if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(_ptr, _ptr, NULL); + // nvDebug( "*** LoadPNG: Error reading png file '%s'.\n", name ); +- return false; ++ return NULL; + } + + // Set up the I/O functions. Deleted: community-i686/PKGBUILD === --- community-i686/PKGBUILD 2016-11-05 05:20:09 UTC (rev 194673) +++ community-i686/PKGBUILD 2016-11-05 05:20:30 UTC (rev 194674) @@ -1,64 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase-# Contributor: t3ddy -# Contributor: Adrián Chaves Fernández (Gallaecio) -pkgname=0ad -pkgver=a20 -_pkgver=0.0.20-alpha -pkgrel=9 -pkgdesc="Cross-platform, 3D and historically-based real-time strategy game" -arch=('i686' 'x86_64') -url="http://play0ad.com/; -license=('GPL2' 'CCPL') -depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis' -
[arch-commits] Commit in 0ad/repos (8 files)
Date: Saturday, November 28, 2015 @ 01:11:06 Author: svenstaro Revision: 147887 archrelease: copy trunk to community-i686, community-x86_64 Added: 0ad/repos/community-i686/PKGBUILD (from rev 147886, 0ad/trunk/PKGBUILD) 0ad/repos/community-x86_64/PKGBUILD (from rev 147886, 0ad/trunk/PKGBUILD) Deleted: 0ad/repos/community-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch 0ad/repos/community-i686/PKGBUILD 0ad/repos/community-i686/miniupnpc14.patch 0ad/repos/community-x86_64/9f24795fa4935aa1adcdea8c1008541011b3964f.patch 0ad/repos/community-x86_64/PKGBUILD 0ad/repos/community-x86_64/miniupnpc14.patch -+ /PKGBUILD | 122 +++ community-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch | 351 -- community-i686/PKGBUILD | 68 - community-i686/miniupnpc14.patch| 15 community-x86_64/9f24795fa4935aa1adcdea8c1008541011b3964f.patch | 351 -- community-x86_64/PKGBUILD | 68 - community-x86_64/miniupnpc14.patch | 15 7 files changed, 122 insertions(+), 868 deletions(-) Deleted: community-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch === --- community-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch 2015-11-28 00:06:01 UTC (rev 147886) +++ community-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch 2015-11-28 00:11:06 UTC (rev 147887) @@ -1,351 +0,0 @@ -From 9f24795fa4935aa1adcdea8c1008541011b3964f Mon Sep 17 00:00:00 2001 -From: leper-Date: Mon, 25 May 2015 01:23:09 + -Subject: [PATCH] Fix SM build with GCC 5.1. - -git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@16673 3db68df2-c116-0410-a063-a993310a9797 - libraries/source/spidermonkey/FixBug1021171.diff | 245 +++ - libraries/source/spidermonkey/FixBug1119228.diff | 65 ++ - libraries/source/spidermonkey/build.sh | 4 + - 3 files changed, 314 insertions(+) - create mode 100644 libraries/source/spidermonkey/FixBug1021171.diff - create mode 100644 libraries/source/spidermonkey/FixBug1119228.diff - -diff --git a/libraries/source/spidermonkey/FixBug1021171.diff b/libraries/source/spidermonkey/FixBug1021171.diff -new file mode 100644 -index 000..b322e44 /dev/null -+++ b/libraries/source/spidermonkey/FixBug1021171.diff -@@ -0,0 +1,245 @@ -+# Based on -+# HG changeset patch -+# User Trevor Saunders -+# Date 1402083090 14400 -+# Node ID fc756706366d983e5d70345cab419fbf72db3d36 -+# Parent 78c20dbe259e808fb58d65731efd4f05e8921820 -+bug 1021171 - don't return nulllptr in functions returning bool r=bz,waldo -+ -+diff --git a/js/src/builtin/TypedObject.cpp b/js/src/builtin/TypedObject.cpp -+--- a/js/src/builtin/TypedObject.cpp - b/js/src/builtin/TypedObject.cpp -+@@ -705,35 +705,35 @@ ArrayMetaTypeDescr::construct(JSContext -+ -+ // Construct a canonical string `new ArrayType()`: -+ StringBuffer contents(cx); -+ contents.append("new ArrayType("); -+ contents.append(>stringRepr()); -+ contents.append(")"); -+ RootedAtom stringRepr(cx, contents.finishAtom()); -+ if (!stringRepr) -+-return nullptr; -++return false; -+ -+ // Extract ArrayType.prototype -+ RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal)); -+ if (!arrayTypePrototype) -+-return nullptr; -++return false; -+ -+ // Create the instance of ArrayType -+ Rooted obj(cx); -+ obj = create(cx, arrayTypePrototype, elementType, -+ stringRepr, 0); -+ if (!obj) -+ return false; -+ -+ // Add `length` property, which is undefined for an unsized array. -+ if (!JSObject::defineProperty(cx, obj, cx->names().length, -+ UndefinedHandleValue, nullptr, nullptr, -+ JSPROP_READONLY | JSPROP_PERMANENT)) -+-return nullptr; -++return false; -+ -+ args.rval().setObject(*obj); -+ return true; -+ } -+ -+ /*static*/ bool -+ UnsizedArrayTypeDescr::dimension(JSContext *cx, unsigned int argc, jsval *vp) -+ { -+@@ -757,30 +757,30 @@ UnsizedArrayTypeDescr::dimension(JSConte -+ int32_t length = args[0].toInt32(); -+ Rooted elementType(cx, >elementType()); -+ -+ // Compute the size. -+ CheckedInt32 size = CheckedInt32(elementType->size()) * length; -+ if (!size.isValid()) { -+ JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, -+ JSMSG_TYPEDOBJECT_TOO_BIG); -+-return nullptr; -++return false; -+ } -+ -+ // Construct a canonical string `new
[arch-commits] Commit in 0ad/repos (8 files)
Date: Monday, November 2, 2015 @ 00:07:07 Author: bpiotrowski Revision: 145492 archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: 0ad/repos/community-staging-i686/ 0ad/repos/community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch (from rev 145491, 0ad/trunk/9f24795fa4935aa1adcdea8c1008541011b3964f.patch) 0ad/repos/community-staging-i686/PKGBUILD (from rev 145491, 0ad/trunk/PKGBUILD) 0ad/repos/community-staging-i686/miniupnpc14.patch (from rev 145491, 0ad/trunk/miniupnpc14.patch) 0ad/repos/community-staging-x86_64/ 0ad/repos/community-staging-x86_64/9f24795fa4935aa1adcdea8c1008541011b3964f.patch (from rev 145491, 0ad/trunk/9f24795fa4935aa1adcdea8c1008541011b3964f.patch) 0ad/repos/community-staging-x86_64/PKGBUILD (from rev 145491, 0ad/trunk/PKGBUILD) 0ad/repos/community-staging-x86_64/miniupnpc14.patch (from rev 145491, 0ad/trunk/miniupnpc14.patch) -+ community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch | 351 ++ community-staging-i686/PKGBUILD | 68 + community-staging-i686/miniupnpc14.patch| 15 community-staging-x86_64/9f24795fa4935aa1adcdea8c1008541011b3964f.patch | 351 ++ community-staging-x86_64/PKGBUILD | 68 + community-staging-x86_64/miniupnpc14.patch | 15 6 files changed, 868 insertions(+) Copied: 0ad/repos/community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch (from rev 145491, 0ad/trunk/9f24795fa4935aa1adcdea8c1008541011b3964f.patch) === --- community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch (rev 0) +++ community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch 2015-11-01 23:07:07 UTC (rev 145492) @@ -0,0 +1,351 @@ +From 9f24795fa4935aa1adcdea8c1008541011b3964f Mon Sep 17 00:00:00 2001 +From: leper+Date: Mon, 25 May 2015 01:23:09 + +Subject: [PATCH] Fix SM build with GCC 5.1. + +git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@16673 3db68df2-c116-0410-a063-a993310a9797 +--- + libraries/source/spidermonkey/FixBug1021171.diff | 245 +++ + libraries/source/spidermonkey/FixBug1119228.diff | 65 ++ + libraries/source/spidermonkey/build.sh | 4 + + 3 files changed, 314 insertions(+) + create mode 100644 libraries/source/spidermonkey/FixBug1021171.diff + create mode 100644 libraries/source/spidermonkey/FixBug1119228.diff + +diff --git a/libraries/source/spidermonkey/FixBug1021171.diff b/libraries/source/spidermonkey/FixBug1021171.diff +new file mode 100644 +index 000..b322e44 +--- /dev/null b/libraries/source/spidermonkey/FixBug1021171.diff +@@ -0,0 +1,245 @@ ++# Based on ++# HG changeset patch ++# User Trevor Saunders ++# Date 1402083090 14400 ++# Node ID fc756706366d983e5d70345cab419fbf72db3d36 ++# Parent 78c20dbe259e808fb58d65731efd4f05e8921820 ++bug 1021171 - don't return nulllptr in functions returning bool r=bz,waldo ++ ++diff --git a/js/src/builtin/TypedObject.cpp b/js/src/builtin/TypedObject.cpp ++--- a/js/src/builtin/TypedObject.cpp + b/js/src/builtin/TypedObject.cpp ++@@ -705,35 +705,35 @@ ArrayMetaTypeDescr::construct(JSContext ++ ++ // Construct a canonical string `new ArrayType()`: ++ StringBuffer contents(cx); ++ contents.append("new ArrayType("); ++ contents.append(>stringRepr()); ++ contents.append(")"); ++ RootedAtom stringRepr(cx, contents.finishAtom()); ++ if (!stringRepr) ++-return nullptr; +++return false; ++ ++ // Extract ArrayType.prototype ++ RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal)); ++ if (!arrayTypePrototype) ++-return nullptr; +++return false; ++ ++ // Create the instance of ArrayType ++ Rooted obj(cx); ++ obj = create(cx, arrayTypePrototype, elementType, ++ stringRepr, 0); ++ if (!obj) ++ return false; ++ ++ // Add `length` property, which is undefined for an unsized array. ++ if (!JSObject::defineProperty(cx, obj, cx->names().length, ++ UndefinedHandleValue, nullptr, nullptr, ++ JSPROP_READONLY | JSPROP_PERMANENT)) ++-return nullptr; +++return false; ++ ++ args.rval().setObject(*obj); ++ return true; ++ } ++ ++ /*static*/ bool ++ UnsizedArrayTypeDescr::dimension(JSContext *cx, unsigned int argc, jsval *vp) ++ { ++@@ -757,30 +757,30 @@ UnsizedArrayTypeDescr::dimension(JSConte ++ int32_t length = args[0].toInt32(); ++ Rooted elementType(cx,
[arch-commits] Commit in 0ad/repos (8 files)
Date: Thursday, October 15, 2015 @ 14:07:22 Author: bluewind Revision: 144125 archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: 0ad/repos/community-staging-i686/ 0ad/repos/community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch (from rev 144124, 0ad/trunk/9f24795fa4935aa1adcdea8c1008541011b3964f.patch) 0ad/repos/community-staging-i686/PKGBUILD (from rev 144124, 0ad/trunk/PKGBUILD) 0ad/repos/community-staging-i686/miniupnpc14.patch (from rev 144124, 0ad/trunk/miniupnpc14.patch) 0ad/repos/community-staging-x86_64/ 0ad/repos/community-staging-x86_64/9f24795fa4935aa1adcdea8c1008541011b3964f.patch (from rev 144124, 0ad/trunk/9f24795fa4935aa1adcdea8c1008541011b3964f.patch) 0ad/repos/community-staging-x86_64/PKGBUILD (from rev 144124, 0ad/trunk/PKGBUILD) 0ad/repos/community-staging-x86_64/miniupnpc14.patch (from rev 144124, 0ad/trunk/miniupnpc14.patch) -+ community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch | 351 ++ community-staging-i686/PKGBUILD | 68 + community-staging-i686/miniupnpc14.patch| 15 community-staging-x86_64/9f24795fa4935aa1adcdea8c1008541011b3964f.patch | 351 ++ community-staging-x86_64/PKGBUILD | 68 + community-staging-x86_64/miniupnpc14.patch | 15 6 files changed, 868 insertions(+) Copied: 0ad/repos/community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch (from rev 144124, 0ad/trunk/9f24795fa4935aa1adcdea8c1008541011b3964f.patch) === --- community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch (rev 0) +++ community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch 2015-10-15 12:07:22 UTC (rev 144125) @@ -0,0 +1,351 @@ +From 9f24795fa4935aa1adcdea8c1008541011b3964f Mon Sep 17 00:00:00 2001 +From: leper+Date: Mon, 25 May 2015 01:23:09 + +Subject: [PATCH] Fix SM build with GCC 5.1. + +git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@16673 3db68df2-c116-0410-a063-a993310a9797 +--- + libraries/source/spidermonkey/FixBug1021171.diff | 245 +++ + libraries/source/spidermonkey/FixBug1119228.diff | 65 ++ + libraries/source/spidermonkey/build.sh | 4 + + 3 files changed, 314 insertions(+) + create mode 100644 libraries/source/spidermonkey/FixBug1021171.diff + create mode 100644 libraries/source/spidermonkey/FixBug1119228.diff + +diff --git a/libraries/source/spidermonkey/FixBug1021171.diff b/libraries/source/spidermonkey/FixBug1021171.diff +new file mode 100644 +index 000..b322e44 +--- /dev/null b/libraries/source/spidermonkey/FixBug1021171.diff +@@ -0,0 +1,245 @@ ++# Based on ++# HG changeset patch ++# User Trevor Saunders ++# Date 1402083090 14400 ++# Node ID fc756706366d983e5d70345cab419fbf72db3d36 ++# Parent 78c20dbe259e808fb58d65731efd4f05e8921820 ++bug 1021171 - don't return nulllptr in functions returning bool r=bz,waldo ++ ++diff --git a/js/src/builtin/TypedObject.cpp b/js/src/builtin/TypedObject.cpp ++--- a/js/src/builtin/TypedObject.cpp + b/js/src/builtin/TypedObject.cpp ++@@ -705,35 +705,35 @@ ArrayMetaTypeDescr::construct(JSContext ++ ++ // Construct a canonical string `new ArrayType()`: ++ StringBuffer contents(cx); ++ contents.append("new ArrayType("); ++ contents.append(>stringRepr()); ++ contents.append(")"); ++ RootedAtom stringRepr(cx, contents.finishAtom()); ++ if (!stringRepr) ++-return nullptr; +++return false; ++ ++ // Extract ArrayType.prototype ++ RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal)); ++ if (!arrayTypePrototype) ++-return nullptr; +++return false; ++ ++ // Create the instance of ArrayType ++ Rooted obj(cx); ++ obj = create(cx, arrayTypePrototype, elementType, ++ stringRepr, 0); ++ if (!obj) ++ return false; ++ ++ // Add `length` property, which is undefined for an unsized array. ++ if (!JSObject::defineProperty(cx, obj, cx->names().length, ++ UndefinedHandleValue, nullptr, nullptr, ++ JSPROP_READONLY | JSPROP_PERMANENT)) ++-return nullptr; +++return false; ++ ++ args.rval().setObject(*obj); ++ return true; ++ } ++ ++ /*static*/ bool ++ UnsizedArrayTypeDescr::dimension(JSContext *cx, unsigned int argc, jsval *vp) ++ { ++@@ -757,30 +757,30 @@ UnsizedArrayTypeDescr::dimension(JSConte ++ int32_t length = args[0].toInt32(); ++ Rooted elementType(cx,
[arch-commits] Commit in 0ad/repos (8 files)
Date: Friday, October 9, 2015 @ 16:39:56 Author: anthraxx Revision: 143502 archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: 0ad/repos/community-staging-i686/ 0ad/repos/community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch (from rev 143501, 0ad/trunk/9f24795fa4935aa1adcdea8c1008541011b3964f.patch) 0ad/repos/community-staging-i686/PKGBUILD (from rev 143501, 0ad/trunk/PKGBUILD) 0ad/repos/community-staging-i686/miniupnpc14.patch (from rev 143501, 0ad/trunk/miniupnpc14.patch) 0ad/repos/community-staging-x86_64/ 0ad/repos/community-staging-x86_64/9f24795fa4935aa1adcdea8c1008541011b3964f.patch (from rev 143501, 0ad/trunk/9f24795fa4935aa1adcdea8c1008541011b3964f.patch) 0ad/repos/community-staging-x86_64/PKGBUILD (from rev 143501, 0ad/trunk/PKGBUILD) 0ad/repos/community-staging-x86_64/miniupnpc14.patch (from rev 143501, 0ad/trunk/miniupnpc14.patch) -+ community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch | 351 ++ community-staging-i686/PKGBUILD | 68 + community-staging-i686/miniupnpc14.patch| 15 community-staging-x86_64/9f24795fa4935aa1adcdea8c1008541011b3964f.patch | 351 ++ community-staging-x86_64/PKGBUILD | 68 + community-staging-x86_64/miniupnpc14.patch | 15 6 files changed, 868 insertions(+) Copied: 0ad/repos/community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch (from rev 143501, 0ad/trunk/9f24795fa4935aa1adcdea8c1008541011b3964f.patch) === --- community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch (rev 0) +++ community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch 2015-10-09 14:39:56 UTC (rev 143502) @@ -0,0 +1,351 @@ +From 9f24795fa4935aa1adcdea8c1008541011b3964f Mon Sep 17 00:00:00 2001 +From: leper+Date: Mon, 25 May 2015 01:23:09 + +Subject: [PATCH] Fix SM build with GCC 5.1. + +git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@16673 3db68df2-c116-0410-a063-a993310a9797 +--- + libraries/source/spidermonkey/FixBug1021171.diff | 245 +++ + libraries/source/spidermonkey/FixBug1119228.diff | 65 ++ + libraries/source/spidermonkey/build.sh | 4 + + 3 files changed, 314 insertions(+) + create mode 100644 libraries/source/spidermonkey/FixBug1021171.diff + create mode 100644 libraries/source/spidermonkey/FixBug1119228.diff + +diff --git a/libraries/source/spidermonkey/FixBug1021171.diff b/libraries/source/spidermonkey/FixBug1021171.diff +new file mode 100644 +index 000..b322e44 +--- /dev/null b/libraries/source/spidermonkey/FixBug1021171.diff +@@ -0,0 +1,245 @@ ++# Based on ++# HG changeset patch ++# User Trevor Saunders ++# Date 1402083090 14400 ++# Node ID fc756706366d983e5d70345cab419fbf72db3d36 ++# Parent 78c20dbe259e808fb58d65731efd4f05e8921820 ++bug 1021171 - don't return nulllptr in functions returning bool r=bz,waldo ++ ++diff --git a/js/src/builtin/TypedObject.cpp b/js/src/builtin/TypedObject.cpp ++--- a/js/src/builtin/TypedObject.cpp + b/js/src/builtin/TypedObject.cpp ++@@ -705,35 +705,35 @@ ArrayMetaTypeDescr::construct(JSContext ++ ++ // Construct a canonical string `new ArrayType()`: ++ StringBuffer contents(cx); ++ contents.append("new ArrayType("); ++ contents.append(>stringRepr()); ++ contents.append(")"); ++ RootedAtom stringRepr(cx, contents.finishAtom()); ++ if (!stringRepr) ++-return nullptr; +++return false; ++ ++ // Extract ArrayType.prototype ++ RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal)); ++ if (!arrayTypePrototype) ++-return nullptr; +++return false; ++ ++ // Create the instance of ArrayType ++ Rooted obj(cx); ++ obj = create(cx, arrayTypePrototype, elementType, ++ stringRepr, 0); ++ if (!obj) ++ return false; ++ ++ // Add `length` property, which is undefined for an unsized array. ++ if (!JSObject::defineProperty(cx, obj, cx->names().length, ++ UndefinedHandleValue, nullptr, nullptr, ++ JSPROP_READONLY | JSPROP_PERMANENT)) ++-return nullptr; +++return false; ++ ++ args.rval().setObject(*obj); ++ return true; ++ } ++ ++ /*static*/ bool ++ UnsizedArrayTypeDescr::dimension(JSContext *cx, unsigned int argc, jsval *vp) ++ { ++@@ -757,30 +757,30 @@ UnsizedArrayTypeDescr::dimension(JSConte ++ int32_t length = args[0].toInt32(); ++ Rooted elementType(cx,
[arch-commits] Commit in 0ad/repos (8 files)
Date: Monday, September 28, 2015 @ 17:47:33 Author: foutrelis Revision: 142082 archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: 0ad/repos/community-staging-i686/ 0ad/repos/community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch (from rev 142081, 0ad/trunk/9f24795fa4935aa1adcdea8c1008541011b3964f.patch) 0ad/repos/community-staging-i686/PKGBUILD (from rev 142081, 0ad/trunk/PKGBUILD) 0ad/repos/community-staging-i686/miniupnpc14.patch (from rev 142081, 0ad/trunk/miniupnpc14.patch) 0ad/repos/community-staging-x86_64/ 0ad/repos/community-staging-x86_64/9f24795fa4935aa1adcdea8c1008541011b3964f.patch (from rev 142081, 0ad/trunk/9f24795fa4935aa1adcdea8c1008541011b3964f.patch) 0ad/repos/community-staging-x86_64/PKGBUILD (from rev 142081, 0ad/trunk/PKGBUILD) 0ad/repos/community-staging-x86_64/miniupnpc14.patch (from rev 142081, 0ad/trunk/miniupnpc14.patch) -+ community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch | 351 ++ community-staging-i686/PKGBUILD | 68 + community-staging-i686/miniupnpc14.patch| 15 community-staging-x86_64/9f24795fa4935aa1adcdea8c1008541011b3964f.patch | 351 ++ community-staging-x86_64/PKGBUILD | 68 + community-staging-x86_64/miniupnpc14.patch | 15 6 files changed, 868 insertions(+) Copied: 0ad/repos/community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch (from rev 142081, 0ad/trunk/9f24795fa4935aa1adcdea8c1008541011b3964f.patch) === --- community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch (rev 0) +++ community-staging-i686/9f24795fa4935aa1adcdea8c1008541011b3964f.patch 2015-09-28 15:47:33 UTC (rev 142082) @@ -0,0 +1,351 @@ +From 9f24795fa4935aa1adcdea8c1008541011b3964f Mon Sep 17 00:00:00 2001 +From: leper+Date: Mon, 25 May 2015 01:23:09 + +Subject: [PATCH] Fix SM build with GCC 5.1. + +git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@16673 3db68df2-c116-0410-a063-a993310a9797 +--- + libraries/source/spidermonkey/FixBug1021171.diff | 245 +++ + libraries/source/spidermonkey/FixBug1119228.diff | 65 ++ + libraries/source/spidermonkey/build.sh | 4 + + 3 files changed, 314 insertions(+) + create mode 100644 libraries/source/spidermonkey/FixBug1021171.diff + create mode 100644 libraries/source/spidermonkey/FixBug1119228.diff + +diff --git a/libraries/source/spidermonkey/FixBug1021171.diff b/libraries/source/spidermonkey/FixBug1021171.diff +new file mode 100644 +index 000..b322e44 +--- /dev/null b/libraries/source/spidermonkey/FixBug1021171.diff +@@ -0,0 +1,245 @@ ++# Based on ++# HG changeset patch ++# User Trevor Saunders ++# Date 1402083090 14400 ++# Node ID fc756706366d983e5d70345cab419fbf72db3d36 ++# Parent 78c20dbe259e808fb58d65731efd4f05e8921820 ++bug 1021171 - don't return nulllptr in functions returning bool r=bz,waldo ++ ++diff --git a/js/src/builtin/TypedObject.cpp b/js/src/builtin/TypedObject.cpp ++--- a/js/src/builtin/TypedObject.cpp + b/js/src/builtin/TypedObject.cpp ++@@ -705,35 +705,35 @@ ArrayMetaTypeDescr::construct(JSContext ++ ++ // Construct a canonical string `new ArrayType()`: ++ StringBuffer contents(cx); ++ contents.append("new ArrayType("); ++ contents.append(>stringRepr()); ++ contents.append(")"); ++ RootedAtom stringRepr(cx, contents.finishAtom()); ++ if (!stringRepr) ++-return nullptr; +++return false; ++ ++ // Extract ArrayType.prototype ++ RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal)); ++ if (!arrayTypePrototype) ++-return nullptr; +++return false; ++ ++ // Create the instance of ArrayType ++ Rooted obj(cx); ++ obj = create(cx, arrayTypePrototype, elementType, ++ stringRepr, 0); ++ if (!obj) ++ return false; ++ ++ // Add `length` property, which is undefined for an unsized array. ++ if (!JSObject::defineProperty(cx, obj, cx->names().length, ++ UndefinedHandleValue, nullptr, nullptr, ++ JSPROP_READONLY | JSPROP_PERMANENT)) ++-return nullptr; +++return false; ++ ++ args.rval().setObject(*obj); ++ return true; ++ } ++ ++ /*static*/ bool ++ UnsizedArrayTypeDescr::dimension(JSContext *cx, unsigned int argc, jsval *vp) ++ { ++@@ -757,30 +757,30 @@ UnsizedArrayTypeDescr::dimension(JSConte ++ int32_t length = args[0].toInt32(); ++ Rooted elementType(cx,
[arch-commits] Commit in 0ad/repos (8 files)
Date: Sunday, February 16, 2014 @ 17:38:12 Author: bpiotrowski Revision: 105861 archrelease: copy trunk to community-i686, community-x86_64 Added: 0ad/repos/community-i686/PKGBUILD (from rev 105860, 0ad/trunk/PKGBUILD) 0ad/repos/community-i686/boost-1.50.patch (from rev 105860, 0ad/trunk/boost-1.50.patch) 0ad/repos/community-x86_64/PKGBUILD (from rev 105860, 0ad/trunk/PKGBUILD) 0ad/repos/community-x86_64/boost-1.50.patch (from rev 105860, 0ad/trunk/boost-1.50.patch) Deleted: 0ad/repos/community-i686/PKGBUILD 0ad/repos/community-i686/boost-1.50.patch 0ad/repos/community-x86_64/PKGBUILD 0ad/repos/community-x86_64/boost-1.50.patch ---+ /PKGBUILD | 98 /boost-1.50.patch | 78 community-i686/PKGBUILD | 43 --- community-i686/boost-1.50.patch | 39 -- community-x86_64/PKGBUILD | 43 --- community-x86_64/boost-1.50.patch | 39 -- 6 files changed, 176 insertions(+), 164 deletions(-) Deleted: community-i686/PKGBUILD === --- community-i686/PKGBUILD 2014-02-16 16:38:04 UTC (rev 105860) +++ community-i686/PKGBUILD 2014-02-16 16:38:12 UTC (rev 105861) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com -# Contributor: t3ddy t3ddy1988 at gmail {dot} com -# Contributor: Adrián Chaves Fernández (Gallaecio) adriyeticha...@gmail.com -pkgname=0ad -pkgver=a15 -_pkgver=0.0.15-alpha -pkgrel=2 -pkgdesc=Cross-platform, 3D and historically-based real-time strategy game -arch=('i686' 'x86_64') -url=http://play0ad.com/; -license=('GPL2' 'CCPL') -depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu' 'gloox' 'miniupnpc' 'libsm') -makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2') -source=(http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz;) -md5sums=('a651d81eb9b31da01e376ddaa597e954') - -build() { - cd $srcdir/$pkgname-$_pkgver/build/workspaces - - unset CPPFLAGS # for le spidermonkey - - ./update-workspaces.sh \ - --with-system-enet \ - --with-system-miniupnpc \ - --bindir=/usr/bin \ - --libdir=/usr/lib/0ad \ - --datadir=/usr/share/${pkgname}/data - - cd $srcdir/$pkgname-$_pkgver/build/workspaces/gcc - - make CONFIG=Release -} - -package() { - install -d ${pkgdir}/usr/{bin,lib/0ad} - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/pyrogenesis ${pkgdir}/usr/bin - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} ${pkgdir}/usr/lib/0ad - - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname} - install -Dm644 ${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop - install -Dm644 ${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png -} Copied: 0ad/repos/community-i686/PKGBUILD (from rev 105860, 0ad/trunk/PKGBUILD) === --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2014-02-16 16:38:12 UTC (rev 105861) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com +# Contributor: t3ddy t3ddy1988 at gmail {dot} com +# Contributor: Adrián Chaves Fernández (Gallaecio) adriyeticha...@gmail.com +pkgname=0ad +pkgver=a15 +_pkgver=0.0.15-alpha +pkgrel=3 +pkgdesc=Cross-platform, 3D and historically-based real-time strategy game +arch=('i686' 'x86_64') +url=http://play0ad.com/; +license=('GPL2' 'CCPL') +depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis' + 'libxml2' 'openal' 'sdl' 'wxgtk2.8' 'zlib' 'libgl' '0ad-data' 'glu' + 'gloox' 'miniupnpc' 'libsm') +makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2') +source=(http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz;) +md5sums=('a651d81eb9b31da01e376ddaa597e954') + +build() { + cd $srcdir/$pkgname-$_pkgver/build/workspaces + + unset CPPFLAGS # for le spidermonkey + + export WX_CONFIG=/usr/bin/wx-config-2.8 + ./update-workspaces.sh \ + --with-system-enet \ + --bindir=/usr/bin \ + --libdir=/usr/lib/0ad \ + --datadir=/usr/share/${pkgname}/data + + cd $srcdir/$pkgname-$_pkgver/build/workspaces/gcc + + make CONFIG=Release +} + +package() { + install -d ${pkgdir}/usr/{bin,lib/0ad} + cd $srcdir/$pkgname-$_pkgver + + install -Dm755 binaries/system/pyrogenesis ${pkgdir}/usr/bin + install -Dm755 binaries/system/*.so{,.1.0} ${pkgdir}/usr/lib/0ad + + install -Dm755 build/resources/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname} + install -Dm644 build/resources/${pkgname}.desktop \ +
[arch-commits] Commit in 0ad/repos (8 files)
Date: Thursday, December 26, 2013 @ 14:52:36 Author: svenstaro Revision: 103111 archrelease: copy trunk to community-i686, community-x86_64 Added: 0ad/repos/community-i686/PKGBUILD (from rev 103110, 0ad/trunk/PKGBUILD) 0ad/repos/community-i686/boost-1.50.patch (from rev 103110, 0ad/trunk/boost-1.50.patch) 0ad/repos/community-x86_64/PKGBUILD (from rev 103110, 0ad/trunk/PKGBUILD) 0ad/repos/community-x86_64/boost-1.50.patch (from rev 103110, 0ad/trunk/boost-1.50.patch) Deleted: 0ad/repos/community-i686/PKGBUILD 0ad/repos/community-i686/boost-1.50.patch 0ad/repos/community-x86_64/PKGBUILD 0ad/repos/community-x86_64/boost-1.50.patch ---+ /PKGBUILD | 86 /boost-1.50.patch | 78 community-i686/PKGBUILD | 42 - community-i686/boost-1.50.patch | 39 community-x86_64/PKGBUILD | 42 - community-x86_64/boost-1.50.patch | 39 6 files changed, 164 insertions(+), 162 deletions(-) Deleted: community-i686/PKGBUILD === --- community-i686/PKGBUILD 2013-12-26 13:52:18 UTC (rev 103110) +++ community-i686/PKGBUILD 2013-12-26 13:52:36 UTC (rev 103111) @@ -1,42 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com -# Contributor: t3ddy t3ddy1988 at gmail {dot} com -# Contributor: Adrián Chaves Fernández (Gallaecio) adriyeticha...@gmail.com -pkgname=0ad -pkgver=a14 -_pkgver=0.0.14-alpha -pkgrel=2 -pkgdesc=Cross-platform, 3D and historically-based real-time strategy game -arch=('i686' 'x86_64') -url=http://play0ad.com/; -license=('GPL2' 'CCPL') -depends=('binutils' 'boost-libs' 'curl' 'enet=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu') -makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2') -source=(http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz;) -md5sums=('5bbaffa02b6e9082cbd5142d43f9b700') - -build() { - cd $srcdir/$pkgname-$_pkgver/build/workspaces - - unset CPPFLAGS # for le spidermonkey - - ./update-workspaces.sh \ - --with-system-enet \ - --bindir=/usr/bin \ - --libdir=/usr/lib/0ad \ - --datadir=/usr/share/${pkgname}/data - - cd $srcdir/$pkgname-$_pkgver/build/workspaces/gcc - - make CONFIG=Release -} - -package() { - install -d ${pkgdir}/usr/{bin,lib/0ad} - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/pyrogenesis ${pkgdir}/usr/bin - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} ${pkgdir}/usr/lib/0ad - - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname} - install -Dm644 ${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop - install -Dm644 ${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png -} Copied: 0ad/repos/community-i686/PKGBUILD (from rev 103110, 0ad/trunk/PKGBUILD) === --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-12-26 13:52:36 UTC (rev 103111) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com +# Contributor: t3ddy t3ddy1988 at gmail {dot} com +# Contributor: Adrián Chaves Fernández (Gallaecio) adriyeticha...@gmail.com +pkgname=0ad +pkgver=a15 +_pkgver=0.0.15-alpha +pkgrel=1 +pkgdesc=Cross-platform, 3D and historically-based real-time strategy game +arch=('i686' 'x86_64') +url=http://play0ad.com/; +license=('GPL2' 'CCPL') +depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu' 'gloox' 'miniupnpc' 'libsm') +makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2') +source=(http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz;) +md5sums=('a651d81eb9b31da01e376ddaa597e954') + +build() { + cd $srcdir/$pkgname-$_pkgver/build/workspaces + + unset CPPFLAGS # for le spidermonkey + + ./update-workspaces.sh \ + --with-system-enet \ + --with-system-miniupnpc \ + --bindir=/usr/bin \ + --libdir=/usr/lib/0ad \ + --datadir=/usr/share/${pkgname}/data + + cd $srcdir/$pkgname-$_pkgver/build/workspaces/gcc + + make CONFIG=Release +} + +package() { + install -d ${pkgdir}/usr/{bin,lib/0ad} + install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/pyrogenesis ${pkgdir}/usr/bin + install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} ${pkgdir}/usr/lib/0ad + + install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname} + install -Dm644
[arch-commits] Commit in 0ad/repos (8 files)
Date: Thursday, September 5, 2013 @ 09:34:19 Author: svenstaro Revision: 96786 archrelease: copy trunk to community-i686, community-x86_64 Added: 0ad/repos/community-i686/PKGBUILD (from rev 96785, 0ad/trunk/PKGBUILD) 0ad/repos/community-i686/boost-1.50.patch (from rev 96785, 0ad/trunk/boost-1.50.patch) 0ad/repos/community-x86_64/PKGBUILD (from rev 96785, 0ad/trunk/PKGBUILD) 0ad/repos/community-x86_64/boost-1.50.patch (from rev 96785, 0ad/trunk/boost-1.50.patch) Deleted: 0ad/repos/community-i686/PKGBUILD 0ad/repos/community-i686/boost-1.50.patch 0ad/repos/community-x86_64/PKGBUILD 0ad/repos/community-x86_64/boost-1.50.patch ---+ /PKGBUILD | 84 /boost-1.50.patch | 78 + community-i686/PKGBUILD | 45 --- community-i686/boost-1.50.patch | 39 community-x86_64/PKGBUILD | 45 --- community-x86_64/boost-1.50.patch | 39 6 files changed, 162 insertions(+), 168 deletions(-) Deleted: community-i686/PKGBUILD === --- community-i686/PKGBUILD 2013-09-05 07:34:10 UTC (rev 96785) +++ community-i686/PKGBUILD 2013-09-05 07:34:19 UTC (rev 96786) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com -# Contributor: t3ddy t3ddy1988 at gmail {dot} com -# Contributor: Adrián Chaves Fernández (Gallaecio) adriyeticha...@gmail.com -pkgname=0ad -pkgver=a13 -_pkgver=0.0.13-alpha -pkgrel=5 -pkgdesc=Cross-platform, 3D and historically-based real-time strategy game -arch=('i686' 'x86_64') -url=http://play0ad.com/; -license=('GPL2' 'CCPL') -depends=('binutils' 'boost-libs' 'curl' 'enet=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu') -makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2') -source=(http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz;) -md5sums=('3075c982c4af41a3586b6b6ef637d2c4') - -build() { - cd $srcdir/$pkgname-$_pkgver/build/workspaces - - sed -i 's/unix_names = { boost_filesystem-mt, boost_system-mt },/unix_names = { boost_filesystem, boost_system },/g' ${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua - sed -i 's/unix_names = { boost_signals-mt },/unix_names = { boost_signals },/g' ${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua - - unset CPPFLAGS - - ./update-workspaces.sh \ - --with-system-enet \ - --bindir=/usr/bin \ - --libdir=/usr/lib/0ad \ - --datadir=/usr/share/${pkgname}/data - - cd $srcdir/$pkgname-$_pkgver/build/workspaces/gcc - - make CONFIG=Release -} - -package() { - install -d ${pkgdir}/usr/{bin,lib/0ad} - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/pyrogenesis ${pkgdir}/usr/bin - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} ${pkgdir}/usr/lib/0ad - - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname} - install -Dm644 ${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop - install -Dm644 ${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png -} Copied: 0ad/repos/community-i686/PKGBUILD (from rev 96785, 0ad/trunk/PKGBUILD) === --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-09-05 07:34:19 UTC (rev 96786) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com +# Contributor: t3ddy t3ddy1988 at gmail {dot} com +# Contributor: Adrián Chaves Fernández (Gallaecio) adriyeticha...@gmail.com +pkgname=0ad +pkgver=a14 +_pkgver=0.0.14-alpha +pkgrel=1 +pkgdesc=Cross-platform, 3D and historically-based real-time strategy game +arch=('i686' 'x86_64') +url=http://play0ad.com/; +license=('GPL2' 'CCPL') +depends=('binutils' 'boost-libs' 'curl' 'enet=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu') +makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2') +source=(http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz;) +md5sums=('5bbaffa02b6e9082cbd5142d43f9b700') + +build() { + cd $srcdir/$pkgname-$_pkgver/build/workspaces + + unset CPPFLAGS # for le spidermonkey + + ./update-workspaces.sh \ + --with-system-enet \ + --bindir=/usr/bin \ + --libdir=/usr/lib/0ad \ + --datadir=/usr/share/${pkgname}/data + + cd $srcdir/$pkgname-$_pkgver/build/workspaces/gcc + + make CONFIG=Release +} + +package() { + install -d ${pkgdir}/usr/{bin,lib/0ad} + install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/pyrogenesis ${pkgdir}/usr/bin + install -Dm755
[arch-commits] Commit in 0ad/repos (8 files)
Date: Sunday, April 28, 2013 @ 12:34:36 Author: jelle Revision: 89256 archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: 0ad/repos/community-staging-i686/PKGBUILD (from rev 89255, 0ad/trunk/PKGBUILD) 0ad/repos/community-staging-i686/boost-1.50.patch (from rev 89255, 0ad/trunk/boost-1.50.patch) 0ad/repos/community-staging-x86_64/PKGBUILD (from rev 89255, 0ad/trunk/PKGBUILD) 0ad/repos/community-staging-x86_64/boost-1.50.patch (from rev 89255, 0ad/trunk/boost-1.50.patch) Deleted: 0ad/repos/community-staging-i686/PKGBUILD 0ad/repos/community-staging-i686/boost-1.50.patch 0ad/repos/community-staging-x86_64/PKGBUILD 0ad/repos/community-staging-x86_64/boost-1.50.patch ---+ /PKGBUILD | 90 /boost-1.50.patch | 78 community-staging-i686/PKGBUILD | 45 -- community-staging-i686/boost-1.50.patch | 39 community-staging-x86_64/PKGBUILD | 45 -- community-staging-x86_64/boost-1.50.patch | 39 6 files changed, 168 insertions(+), 168 deletions(-) Deleted: community-staging-i686/PKGBUILD === --- community-staging-i686/PKGBUILD 2013-04-28 10:33:03 UTC (rev 89255) +++ community-staging-i686/PKGBUILD 2013-04-28 10:34:36 UTC (rev 89256) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com -# Contributor: t3ddy t3ddy1988 at gmail {dot} com -# Contributor: Adrián Chaves Fernández (Gallaecio) adriyeticha...@gmail.com -pkgname=0ad -pkgver=a13 -_pkgver=0.0.13-alpha -pkgrel=4 -pkgdesc=Cross-platform, 3D and historically-based real-time strategy game -arch=('i686' 'x86_64') -url=http://play0ad.com/; -license=('GPL2' 'CCPL') -depends=('binutils' 'boost-libs' 'curl' 'enet=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu') -makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2') -source=(http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz;) -md5sums=('3075c982c4af41a3586b6b6ef637d2c4') - -build() { - cd $srcdir/$pkgname-$_pkgver/build/workspaces - - sed -i 's/unix_names = { boost_filesystem-mt, boost_system-mt },/unix_names = { boost_filesystem, boost_system },/g' ${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua - sed -i 's/unix_names = { boost_signals-mt },/unix_names = { boost_signals },/g' ${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua - - unset CPPFLAGS - - ./update-workspaces.sh \ - --with-system-enet \ - --bindir=/usr/bin \ - --libdir=/usr/lib/0ad \ - --datadir=/usr/share/${pkgname}/data - - cd $srcdir/$pkgname-$_pkgver/build/workspaces/gcc - - make CONFIG=Release -} - -package() { - install -d ${pkgdir}/usr/{bin,lib/0ad} - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/pyrogenesis ${pkgdir}/usr/bin - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} ${pkgdir}/usr/lib/0ad - - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname} - install -Dm644 ${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop - install -Dm644 ${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png -} Copied: 0ad/repos/community-staging-i686/PKGBUILD (from rev 89255, 0ad/trunk/PKGBUILD) === --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2013-04-28 10:34:36 UTC (rev 89256) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com +# Contributor: t3ddy t3ddy1988 at gmail {dot} com +# Contributor: Adrián Chaves Fernández (Gallaecio) adriyeticha...@gmail.com +pkgname=0ad +pkgver=a13 +_pkgver=0.0.13-alpha +pkgrel=4 +pkgdesc=Cross-platform, 3D and historically-based real-time strategy game +arch=('i686' 'x86_64') +url=http://play0ad.com/; +license=('GPL2' 'CCPL') +depends=('binutils' 'boost-libs' 'curl' 'enet=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu') +makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2') +source=(http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz;) +md5sums=('3075c982c4af41a3586b6b6ef637d2c4') + +build() { + cd $srcdir/$pkgname-$_pkgver/build/workspaces + + sed -i 's/unix_names = { boost_filesystem-mt, boost_system-mt },/unix_names = { boost_filesystem, boost_system },/g' ${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua + sed -i 's/unix_names = { boost_signals-mt },/unix_names = { boost_signals },/g' ${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua + +
[arch-commits] Commit in 0ad/repos (8 files)
Date: Monday, April 8, 2013 @ 14:35:31 Author: svenstaro Revision: 87879 archrelease: copy trunk to community-i686, community-x86_64 Added: 0ad/repos/community-i686/PKGBUILD (from rev 87878, 0ad/trunk/PKGBUILD) 0ad/repos/community-i686/boost-1.50.patch (from rev 87878, 0ad/trunk/boost-1.50.patch) 0ad/repos/community-x86_64/PKGBUILD (from rev 87878, 0ad/trunk/PKGBUILD) 0ad/repos/community-x86_64/boost-1.50.patch (from rev 87878, 0ad/trunk/boost-1.50.patch) Deleted: 0ad/repos/community-i686/PKGBUILD 0ad/repos/community-i686/boost-1.50.patch 0ad/repos/community-x86_64/PKGBUILD 0ad/repos/community-x86_64/boost-1.50.patch ---+ /PKGBUILD | 90 /boost-1.50.patch | 78 +++ community-i686/PKGBUILD | 43 - community-i686/boost-1.50.patch | 39 --- community-x86_64/PKGBUILD | 43 - community-x86_64/boost-1.50.patch | 39 --- 6 files changed, 168 insertions(+), 164 deletions(-) Deleted: community-i686/PKGBUILD === --- community-i686/PKGBUILD 2013-04-08 12:34:41 UTC (rev 87878) +++ community-i686/PKGBUILD 2013-04-08 12:35:31 UTC (rev 87879) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com -# Contributor: t3ddy t3ddy1988 at gmail {dot} com -# Contributor: Adrián Chaves Fernández (Gallaecio) adriyeticha...@gmail.com -pkgname=0ad -pkgver=a13 -_pkgver=0.0.13-alpha -pkgrel=1 -pkgdesc=Cross-platform, 3D and historically-based real-time strategy game -arch=('i686' 'x86_64') -url=http://play0ad.com/; -license=('GPL2' 'CCPL') -depends=('binutils' 'boost-libs' 'curl' 'enet=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu') -makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2') -source=(http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz;) -md5sums=('3075c982c4af41a3586b6b6ef637d2c4') - -build() { - cd $srcdir/$pkgname-$_pkgver/build/workspaces - - sed -i 's/unix_names = { boost_filesystem-mt, boost_system-mt },/unix_names = { boost_filesystem, boost_system },/g' ${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua - sed -i 's/unix_names = { boost_signals-mt },/unix_names = { boost_signals },/g' ${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua - - ./update-workspaces.sh \ - --with-system-enet \ - --bindir=/usr/bin \ - --libdir=/usr/lib \ - --datadir=/usr/share/${pkgname}/data - - cd $srcdir/$pkgname-$_pkgver/build/workspaces/gcc - - make CONFIG=Release -} - -package() { - install -d ${pkgdir}/usr/{bin,lib} - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/pyrogenesis ${pkgdir}/usr/bin - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} ${pkgdir}/usr/lib - - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname} - install -Dm644 ${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop - install -Dm644 ${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png -} Copied: 0ad/repos/community-i686/PKGBUILD (from rev 87878, 0ad/trunk/PKGBUILD) === --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-04-08 12:35:31 UTC (rev 87879) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com +# Contributor: t3ddy t3ddy1988 at gmail {dot} com +# Contributor: Adrián Chaves Fernández (Gallaecio) adriyeticha...@gmail.com +pkgname=0ad +pkgver=a13 +_pkgver=0.0.13-alpha +pkgrel=2 +pkgdesc=Cross-platform, 3D and historically-based real-time strategy game +arch=('i686' 'x86_64') +url=http://play0ad.com/; +license=('GPL2' 'CCPL') +depends=('binutils' 'boost-libs' 'curl' 'enet=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu') +makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2') +source=(http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz;) +md5sums=('3075c982c4af41a3586b6b6ef637d2c4') + +build() { + cd $srcdir/$pkgname-$_pkgver/build/workspaces + + sed -i 's/unix_names = { boost_filesystem-mt, boost_system-mt },/unix_names = { boost_filesystem, boost_system },/g' ${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua + sed -i 's/unix_names = { boost_signals-mt },/unix_names = { boost_signals },/g' ${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua + + unset CPPFLAGS + + ./update-workspaces.sh \ + --with-system-enet \ + --bindir=/usr/bin \ + --libdir=/usr/lib/0ad \ + --datadir=/usr/share/${pkgname}/data + + cd
[arch-commits] Commit in 0ad/repos (8 files)
Date: Tuesday, April 2, 2013 @ 23:52:23 Author: svenstaro Revision: 87547 archrelease: copy trunk to community-i686, community-x86_64 Added: 0ad/repos/community-i686/PKGBUILD (from rev 87546, 0ad/trunk/PKGBUILD) 0ad/repos/community-i686/boost-1.50.patch (from rev 87546, 0ad/trunk/boost-1.50.patch) 0ad/repos/community-x86_64/PKGBUILD (from rev 87546, 0ad/trunk/PKGBUILD) 0ad/repos/community-x86_64/boost-1.50.patch (from rev 87546, 0ad/trunk/boost-1.50.patch) Deleted: 0ad/repos/community-i686/PKGBUILD 0ad/repos/community-i686/boost-1.50.patch 0ad/repos/community-x86_64/PKGBUILD 0ad/repos/community-x86_64/boost-1.50.patch ---+ /PKGBUILD | 86 /boost-1.50.patch | 78 community-i686/PKGBUILD | 43 -- community-i686/boost-1.50.patch | 39 community-x86_64/PKGBUILD | 43 -- community-x86_64/boost-1.50.patch | 39 6 files changed, 164 insertions(+), 164 deletions(-) Deleted: community-i686/PKGBUILD === --- community-i686/PKGBUILD 2013-04-02 21:51:58 UTC (rev 87546) +++ community-i686/PKGBUILD 2013-04-02 21:52:23 UTC (rev 87547) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com -# Contributor: t3ddy t3ddy1988 at gmail {dot} com -# Contributor: Adrián Chaves Fernández (Gallaecio) adriyeticha...@gmail.com -pkgname=0ad -pkgver=a12 -_pkgver=0.0.12-alpha -pkgrel=3 -pkgdesc=Cross-platform, 3D and historically-based real-time strategy game -arch=('i686' 'x86_64') -url=http://play0ad.com/; -license=('GPL2' 'CCPL') -depends=('binutils' 'boost-libs' 'curl' 'enet=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu') -makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2') -source=(http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz;) -md5sums=('0ff92fb2b22b5384067cdd88b89e5450') - -build() { - cd $srcdir/$pkgname-$_pkgver/build/workspaces - - sed -i 's/unix_names = { boost_filesystem-mt, boost_system-mt },/unix_names = { boost_filesystem, boost_system },/g' ${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua - sed -i 's/unix_names = { boost_signals-mt },/unix_names = { boost_signals },/g' ${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua - - ./update-workspaces.sh \ - --with-system-enet \ - --bindir=/usr/bin \ - --libdir=/usr/lib \ - --datadir=/usr/share/${pkgname}/data - - cd $srcdir/$pkgname-$_pkgver/build/workspaces/gcc - - make CONFIG=Release -} - -package() { - install -d ${pkgdir}/usr/{bin,lib} - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/pyrogenesis ${pkgdir}/usr/bin - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} ${pkgdir}/usr/lib - - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname} - install -Dm644 ${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop - install -Dm644 ${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png -} Copied: 0ad/repos/community-i686/PKGBUILD (from rev 87546, 0ad/trunk/PKGBUILD) === --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-04-02 21:52:23 UTC (rev 87547) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com +# Contributor: t3ddy t3ddy1988 at gmail {dot} com +# Contributor: Adrián Chaves Fernández (Gallaecio) adriyeticha...@gmail.com +pkgname=0ad +pkgver=a13 +_pkgver=0.0.13-alpha +pkgrel=1 +pkgdesc=Cross-platform, 3D and historically-based real-time strategy game +arch=('i686' 'x86_64') +url=http://play0ad.com/; +license=('GPL2' 'CCPL') +depends=('binutils' 'boost-libs' 'curl' 'enet=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu') +makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2') +source=(http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz;) +md5sums=('3075c982c4af41a3586b6b6ef637d2c4') + +build() { + cd $srcdir/$pkgname-$_pkgver/build/workspaces + + sed -i 's/unix_names = { boost_filesystem-mt, boost_system-mt },/unix_names = { boost_filesystem, boost_system },/g' ${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua + sed -i 's/unix_names = { boost_signals-mt },/unix_names = { boost_signals },/g' ${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua + + ./update-workspaces.sh \ + --with-system-enet \ + --bindir=/usr/bin \ + --libdir=/usr/lib \ + --datadir=/usr/share/${pkgname}/data + + cd
[arch-commits] Commit in 0ad/repos (8 files)
Date: Friday, March 29, 2013 @ 20:31:59 Author: stephane Revision: 87278 db-move: moved 0ad from [community-staging] to [community-testing] (i686, x86_64) Added: 0ad/repos/community-testing-i686/ 0ad/repos/community-testing-i686/PKGBUILD (from rev 87277, 0ad/repos/community-staging-i686/PKGBUILD) 0ad/repos/community-testing-i686/boost-1.50.patch (from rev 87277, 0ad/repos/community-staging-i686/boost-1.50.patch) 0ad/repos/community-testing-x86_64/ 0ad/repos/community-testing-x86_64/PKGBUILD (from rev 87277, 0ad/repos/community-staging-x86_64/PKGBUILD) 0ad/repos/community-testing-x86_64/boost-1.50.patch (from rev 87277, 0ad/repos/community-staging-x86_64/boost-1.50.patch) Deleted: 0ad/repos/community-staging-i686/ 0ad/repos/community-staging-x86_64/ ---+ community-testing-i686/PKGBUILD | 43 community-testing-i686/boost-1.50.patch | 39 + community-testing-x86_64/PKGBUILD | 43 community-testing-x86_64/boost-1.50.patch | 39 + 4 files changed, 164 insertions(+) Copied: 0ad/repos/community-testing-i686/PKGBUILD (from rev 87277, 0ad/repos/community-staging-i686/PKGBUILD) === --- community-testing-i686/PKGBUILD (rev 0) +++ community-testing-i686/PKGBUILD 2013-03-29 19:31:59 UTC (rev 87278) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com +# Contributor: t3ddy t3ddy1988 at gmail {dot} com +# Contributor: Adrián Chaves Fernández (Gallaecio) adriyeticha...@gmail.com +pkgname=0ad +pkgver=a12 +_pkgver=0.0.12-alpha +pkgrel=3 +pkgdesc=Cross-platform, 3D and historically-based real-time strategy game +arch=('i686' 'x86_64') +url=http://play0ad.com/; +license=('GPL2' 'CCPL') +depends=('binutils' 'boost-libs' 'curl' 'enet=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu') +makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2') +source=(http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz;) +md5sums=('0ff92fb2b22b5384067cdd88b89e5450') + +build() { + cd $srcdir/$pkgname-$_pkgver/build/workspaces + + sed -i 's/unix_names = { boost_filesystem-mt, boost_system-mt },/unix_names = { boost_filesystem, boost_system },/g' ${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua + sed -i 's/unix_names = { boost_signals-mt },/unix_names = { boost_signals },/g' ${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua + + ./update-workspaces.sh \ + --with-system-enet \ + --bindir=/usr/bin \ + --libdir=/usr/lib \ + --datadir=/usr/share/${pkgname}/data + + cd $srcdir/$pkgname-$_pkgver/build/workspaces/gcc + + make CONFIG=Release +} + +package() { + install -d ${pkgdir}/usr/{bin,lib} + install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/pyrogenesis ${pkgdir}/usr/bin + install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} ${pkgdir}/usr/lib + + install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname} + install -Dm644 ${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -Dm644 ${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png +} Copied: 0ad/repos/community-testing-i686/boost-1.50.patch (from rev 87277, 0ad/repos/community-staging-i686/boost-1.50.patch) === --- community-testing-i686/boost-1.50.patch (rev 0) +++ community-testing-i686/boost-1.50.patch 2013-03-29 19:31:59 UTC (rev 87278) @@ -0,0 +1,39 @@ +diff -ru 0ad-r11863-alpha/source/graphics/TextureManager.cpp 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp +--- 0ad-r11863-alpha/source/graphics/TextureManager.cpp2012-02-19 04:30:59.0 +0100 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp 2012-07-10 21:00:52.753251312 +0200 +@@ -425,9 +425,9 @@ + CTextureConverter::SettingsFile* f = GetSettingsFile(settingsPath); + if (f) + files.push_back(f); +- p = p / *it; ++ p = p / it-wstring(); + } +- return m_TextureConverter.ComputeSettings(srcPath.leaf(), files); ++ return m_TextureConverter.ComputeSettings(srcPath.leaf().wstring(), files); + } + + /** +diff -ru 0ad-r11863-alpha/source/lib/pch/pch_boost.h 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h +--- 0ad-r11863-alpha/source/lib/pch/pch_boost.h2012-02-16 19:01:10.0 +0100 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h