Attachment 190340 Details for Bug 225685 – patch

[patch] patch

OpenTomb.patch (text/plain), 3.17 KB, created by Piotr Kubaj on 2018-02-05 14:57:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2018-02-05 14:57:18 UTC

Size: 3.17 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 460972)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	OpenTomb
> DISTVERSIONPREFIX=	win32-
>-DISTVERSION=	2017-08-05_alpha
>+DISTVERSION=	2018-02-03_alpha
> CATEGORIES=	games
> 
> MAINTAINER=	pkubaj@anongoth.pl
>@@ -14,9 +14,8 @@
> 
> LIB_DEPENDS=	libpng.so:graphics/png
> 
>+USES=		cmake lua openal
> USE_GITHUB=	yes
>-
>-USES=		cmake lua openal
> USE_SDL=	sdl2
> LLD_UNSAFE=	yes
> SUB_FILES=	OpenTomb
>Index: distinfo
>===================================================================
>--- distinfo	(revision 460972)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1502468625
>-SHA256 (OpenTomb-OpenTomb-win32-2017-08-05_alpha_GH0.tar.gz) = 1bb6ded291d35eb0f15a98df9a466780f2ea6848e020156d5cc0062dc13aa656
>-SIZE (OpenTomb-OpenTomb-win32-2017-08-05_alpha_GH0.tar.gz) = 9274258
>+TIMESTAMP = 1517840323
>+SHA256 (OpenTomb-OpenTomb-win32-2018-02-03_alpha_GH0.tar.gz) = 3b8a81ef6d4cc66d9f41d7657aee8740603648f1c8fd36d0ce97231240b9c167
>+SIZE (OpenTomb-OpenTomb-win32-2018-02-03_alpha_GH0.tar.gz) = 9131835
>Index: files/patch-src_world.cpp
>===================================================================
>--- files/patch-src_world.cpp	(revision 460972)
>+++ files/patch-src_world.cpp	(working copy)
>@@ -1,18 +0,0 @@
>-Fix compiling with libc++ and Clang
>-
>-src/world.cpp:689:53: error: no viable conversion from '__map_iterator<__tree_iterator<__value_type<unsigned int, [...]>, class std::__1::__tree_node<union
>-      std::__1::__value_type<unsigned int, struct base_item_s *>, void *> *, [...]>>' to '__map_iterator<__tree_iterator<__value_type<const unsigned int, [...]>, class std::__1::__tree_node<union std::__1::__value_type<const unsigned int, struct base_item_s *>, void
>-      *> *, [...]>>'
>-    std::map<const uint32_t, base_item_p>::iterator it = global_world.items_tree.find(item_id);
>-                                                    ^    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>---- src/world.cpp.orig	2017-04-23 13:39:54 UTC
>-+++ src/world.cpp
>-@@ -686,7 +686,7 @@ int World_CreateItem(uint32_t item_id, u
>- 
>- int World_DeleteItem(uint32_t item_id)
>- {
>--    std::map<const uint32_t, base_item_p>::iterator it = global_world.items_tree.find(item_id);
>-+    std::map<uint32_t, base_item_p>::iterator it = global_world.items_tree.find(item_id);
>- 
>-     if(it != global_world.items_tree.end())
>-     {
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 460972)
>+++ pkg-plist	(working copy)
>@@ -192,6 +192,12 @@
> %%DATADIR%%/scripts/strings/getstring.lua
> %%DATADIR%%/scripts/strings/italian/generic.lua
> %%DATADIR%%/scripts/strings/italian/global_items.lua
>+%%DATADIR%%/scripts/strings/portuguese-ptbr/generic.lua
>+%%DATADIR%%/scripts/strings/portuguese-ptbr/global_items.lua
>+%%DATADIR%%/scripts/strings/portuguese-ptbr/sys_notify.lua
>+%%DATADIR%%/scripts/strings/portuguese-ptpt/generic.lua
>+%%DATADIR%%/scripts/strings/portuguese-ptpt/global_items.lua
>+%%DATADIR%%/scripts/strings/portuguese-ptpt/sys_notify.lua
> %%DATADIR%%/scripts/strings/russian/generic.lua
> %%DATADIR%%/scripts/strings/russian/global_items.lua
> %%DATADIR%%/scripts/strings/russian/sys_notify.lua

Actions: View | Diff

Attachments on bug 225685: 190340