Tue Jul 7 11:41:19 2015 UTC ()
Don't mark a member as const which disables copy assignment, which in
turn can be used by value-insert.


(joerg)
diff -r1.18 -r1.19 pkgsrc/games/solarus/Makefile
diff -r1.8 -r1.9 pkgsrc/games/solarus/distinfo
diff -r0 -r1.1 pkgsrc/games/solarus/patches/patch-include_solarus_EntityData.h
cvs diff -r1.18 -r1.19 pkgsrc/games/solarus/Makefile (expand / switch to unified diff)

--- pkgsrc/games/solarus/Makefile 2015/07/01 23:06:59 1.18
+++ pkgsrc/games/solarus/Makefile 2015/07/07 11:41:19 1.19
@@ -1,35 +1,38 @@ @@ -1,35 +1,38 @@
1# $NetBSD: Makefile,v 1.18 2015/07/01 23:06:59 rodent Exp $ 1# $NetBSD: Makefile,v 1.19 2015/07/07 11:41:19 joerg Exp $
2 2
3VERSION= 1.4.2 3VERSION= 1.4.2
4DISTNAME= solarus-${VERSION}-src 4DISTNAME= solarus-${VERSION}-src
5PKGNAME= ${DISTNAME:S/-src//1} 5PKGNAME= ${DISTNAME:S/-src//1}
6CATEGORIES= games 6CATEGORIES= games
7MASTER_SITES= http://www.solarus-games.org/downloads/solarus/ 7MASTER_SITES= http://www.solarus-games.org/downloads/solarus/
8 8
9MAINTAINER= rodent@NetBSD.org 9MAINTAINER= rodent@NetBSD.org
10HOMEPAGE= http://www.solarus-games.org/solarus/ 10HOMEPAGE= http://www.solarus-games.org/solarus/
11COMMENT= Open-source Zelda-like 2D game engine licensed under GPL 11COMMENT= Open-source Zelda-like 2D game engine licensed under GPL
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14WRKSRC= ${WRKDIR}/solarus-${VERSION} 14WRKSRC= ${WRKDIR}/solarus-${VERSION}
15USE_CMAKE= yes 15USE_CMAKE= yes
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17 17
18.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
19 19
20GCC_REQD+= 4.8 20GCC_REQD+= 4.8
21LDFLAGS.SunOS+= -lsocket -lnsl 21LDFLAGS.SunOS+= -lsocket -lnsl
22 22
 23pre-install:
 24 rm ${WRKSRC}/include/solarus/EntityData.h.orig
 25
23.include "../../devel/physfs/buildlink3.mk" 26.include "../../devel/physfs/buildlink3.mk"
24.include "../../lang/LuaJIT2/buildlink3.mk" 27.include "../../lang/LuaJIT2/buildlink3.mk"
25LUA_VERSIONS_ACCEPTED= 51 28LUA_VERSIONS_ACCEPTED= 51
26BUILDLINK_API_DEPENDS.lua51+= lua51>=5.1.5 29BUILDLINK_API_DEPENDS.lua51+= lua51>=5.1.5
27.include "../../lang/lua/buildlink3.mk" 30.include "../../lang/lua/buildlink3.mk"
28.include "../../audio/libmodplug/buildlink3.mk" 31.include "../../audio/libmodplug/buildlink3.mk"
29.include "../../multimedia/libogg/buildlink3.mk" 32.include "../../multimedia/libogg/buildlink3.mk"
30.include "../../audio/libvorbis/buildlink3.mk" 33.include "../../audio/libvorbis/buildlink3.mk"
31.include "../../audio/openal/buildlink3.mk" 34.include "../../audio/openal/buildlink3.mk"
32BUILDLINK_API_DEPENDS.SDL2_ttf+= SDL2_ttf>=2.0.12 35BUILDLINK_API_DEPENDS.SDL2_ttf+= SDL2_ttf>=2.0.12
33.include "../../fonts/SDL2_ttf/buildlink3.mk" 36.include "../../fonts/SDL2_ttf/buildlink3.mk"
34BUILDLINK_API_DEPENDS.SDL2_image+= SDL2_image>=2.0.0 37BUILDLINK_API_DEPENDS.SDL2_image+= SDL2_image>=2.0.0
35.include "../../graphics/SDL2_image/buildlink3.mk" 38.include "../../graphics/SDL2_image/buildlink3.mk"
cvs diff -r1.8 -r1.9 pkgsrc/games/solarus/distinfo (expand / switch to unified diff)

--- pkgsrc/games/solarus/distinfo 2015/07/01 23:06:59 1.8
+++ pkgsrc/games/solarus/distinfo 2015/07/07 11:41:19 1.9
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.8 2015/07/01 23:06:59 rodent Exp $ 1$NetBSD: distinfo,v 1.9 2015/07/07 11:41:19 joerg Exp $
2 2
3SHA1 (solarus-1.4.2-src.tar.gz) = 145c34d617f66ed419aa18e69616b5e7331a0092 3SHA1 (solarus-1.4.2-src.tar.gz) = 145c34d617f66ed419aa18e69616b5e7331a0092
4RMD160 (solarus-1.4.2-src.tar.gz) = 3bada277c00ab929fc9bf16f475c8cff03ea7ee4 4RMD160 (solarus-1.4.2-src.tar.gz) = 3bada277c00ab929fc9bf16f475c8cff03ea7ee4
5Size (solarus-1.4.2-src.tar.gz) = 2443414 bytes 5Size (solarus-1.4.2-src.tar.gz) = 2443414 bytes
 6SHA1 (patch-include_solarus_EntityData.h) = da21cd7fe6d752c27c1cc817ec71efc4ba23ff7e
File Added: pkgsrc/games/solarus/patches/Attic/patch-include_solarus_EntityData.h
$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.
     };