diff options
| author | joerg <joerg@pkgsrc.org> | 2015-07-07 11:41:19 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-07-07 11:41:19 +0000 |
| commit | 665619411a15ea16409a8afd3298e0b9749cfba1 (patch) | |
| tree | 1c1591809af61f4cf8deb46ee225d68bf14b3da1 /games/solarus | |
| parent | e1a800bf130e6431db70876079f79ae60f9d9a69 (diff) | |
| download | pkgsrc-665619411a15ea16409a8afd3298e0b9749cfba1.tar.gz | |
Don't mark a member as const which disables copy assignment, which in
turn can be used by value-insert.
Diffstat (limited to 'games/solarus')
| -rw-r--r-- | games/solarus/Makefile | 5 | ||||
| -rw-r--r-- | games/solarus/distinfo | 3 | ||||
| -rw-r--r-- | games/solarus/patches/patch-include_solarus_EntityData.h | 16 |
3 files changed, 22 insertions, 2 deletions
diff --git a/games/solarus/Makefile b/games/solarus/Makefile index 89ad004c626..53014ed0afe 100644 --- a/games/solarus/Makefile +++ b/games/solarus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2015/07/01 23:06:59 rodent Exp $ +# $NetBSD: Makefile,v 1.19 2015/07/07 11:41:19 joerg Exp $ VERSION= 1.4.2 DISTNAME= solarus-${VERSION}-src @@ -20,6 +20,9 @@ USE_LANGUAGES= c c++ GCC_REQD+= 4.8 LDFLAGS.SunOS+= -lsocket -lnsl +pre-install: + rm ${WRKSRC}/include/solarus/EntityData.h.orig + .include "../../devel/physfs/buildlink3.mk" .include "../../lang/LuaJIT2/buildlink3.mk" LUA_VERSIONS_ACCEPTED= 51 diff --git a/games/solarus/distinfo b/games/solarus/distinfo index bad1c0d94e3..2d06314e114 100644 --- a/games/solarus/distinfo +++ b/games/solarus/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.8 2015/07/01 23:06:59 rodent Exp $ +$NetBSD: distinfo,v 1.9 2015/07/07 11:41:19 joerg Exp $ SHA1 (solarus-1.4.2-src.tar.gz) = 145c34d617f66ed419aa18e69616b5e7331a0092 RMD160 (solarus-1.4.2-src.tar.gz) = 3bada277c00ab929fc9bf16f475c8cff03ea7ee4 Size (solarus-1.4.2-src.tar.gz) = 2443414 bytes +SHA1 (patch-include_solarus_EntityData.h) = da21cd7fe6d752c27c1cc817ec71efc4ba23ff7e diff --git a/games/solarus/patches/patch-include_solarus_EntityData.h b/games/solarus/patches/patch-include_solarus_EntityData.h new file mode 100644 index 00000000000..3d9b8787aea --- /dev/null +++ b/games/solarus/patches/patch-include_solarus_EntityData.h @@ -0,0 +1,16 @@ +$NetBSD: patch-include_solarus_EntityData.h,v 1.1 2015/07/07 11:41:19 joerg Exp $ + +With the constt, EntityData::EntityField is not copy-assignable, but +that is required elsewhere for use by .insert(). + +--- include/solarus/EntityData.h.orig 2015-07-04 14:10:49.000000000 +0000 ++++ include/solarus/EntityData.h +@@ -63,7 +63,7 @@ class SOLARUS_API EntityData : public Lu + bool operator==(const FieldValue& other) const; + bool operator!=(const FieldValue& other) const; + +- const EntityFieldType value_type; ++ EntityFieldType value_type; + std::string string_value; + int int_value; // Also used for boolean. + }; |