| 1 |
hasufell 13/07/29 21:25:23 |
| 2 |
|
| 3 |
Added: mana-0.6.1-Import-cstdint-for-int64_t.patch |
| 4 |
mana-0.6.1-Fix-missing-virtual-destructors-and-guichan-use.patch |
| 5 |
mana-0.6.1-Trick-gcc-into-importing-C99-stdint.h-when-C-11-is-n.patch |
| 6 |
Log: |
| 7 |
fix bug 428316 |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 games-rpg/mana/files/mana-0.6.1-Import-cstdint-for-int64_t.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/mana/files/mana-0.6.1-Import-cstdint-for-int64_t.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/mana/files/mana-0.6.1-Import-cstdint-for-int64_t.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: mana-0.6.1-Import-cstdint-for-int64_t.patch |
| 18 |
=================================================================== |
| 19 |
From dfd304e93bb9010ef8226ee4d026d45c9bf9d2f5 Mon Sep 17 00:00:00 2001 |
| 20 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 21 |
Date: Sat, 28 Jul 2012 15:54:57 +0200 |
| 22 |
Subject: [PATCH 3/3] Import cstdint for int64_t. |
| 23 |
|
| 24 |
--- |
| 25 |
src/net/download.h | 1 + |
| 26 |
1 file changed, 1 insertion(+) |
| 27 |
|
| 28 |
diff --git a/src/net/download.h b/src/net/download.h |
| 29 |
index c0bdf20..b9ad17e 100644 |
| 30 |
--- a/src/net/download.h |
| 31 |
+++ b/src/net/download.h |
| 32 |
@@ -18,6 +18,7 @@ |
| 33 |
* along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 34 |
*/ |
| 35 |
|
| 36 |
+#include <cstdint> |
| 37 |
#include <cstdio> |
| 38 |
#include <string> |
| 39 |
|
| 40 |
-- |
| 41 |
1.7.11.1 |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.1 games-rpg/mana/files/mana-0.6.1-Fix-missing-virtual-destructors-and-guichan-use.patch |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/mana/files/mana-0.6.1-Fix-missing-virtual-destructors-and-guichan-use.patch?rev=1.1&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/mana/files/mana-0.6.1-Fix-missing-virtual-destructors-and-guichan-use.patch?rev=1.1&content-type=text/plain |
| 50 |
|
| 51 |
Index: mana-0.6.1-Fix-missing-virtual-destructors-and-guichan-use.patch |
| 52 |
=================================================================== |
| 53 |
From b5dc2de418d6d06cce31d786862c5f548171a097 Mon Sep 17 00:00:00 2001 |
| 54 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 55 |
Date: Sat, 28 Jul 2012 15:52:35 +0200 |
| 56 |
Subject: [PATCH 1/3] Fix missing virtual destructors and guichan use. |
| 57 |
|
| 58 |
--- |
| 59 |
src/gui/widgets/tabbedarea.h | 3 ++- |
| 60 |
src/gui/widgets/textfield.h | 1 + |
| 61 |
src/resources/itemdb.h | 2 +- |
| 62 |
3 files changed, 4 insertions(+), 2 deletions(-) |
| 63 |
|
| 64 |
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h |
| 65 |
index 45b092a..b43078a 100644 |
| 66 |
--- a/src/gui/widgets/tabbedarea.h |
| 67 |
+++ b/src/gui/widgets/tabbedarea.h |
| 68 |
@@ -98,7 +98,8 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener |
| 69 |
int getContainerHeight() const |
| 70 |
{ return mWidgetContainer->getHeight(); } |
| 71 |
|
| 72 |
- using gcn::TabbedArea::setSelectedTab; |
| 73 |
+ void setSelectedTab(unsigned int index) |
| 74 |
+ { gcn::TabbedArea::setSelectedTab(index); } |
| 75 |
|
| 76 |
void setSelectedTab(gcn::Tab *tab); |
| 77 |
|
| 78 |
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h |
| 79 |
index 2865403..94cada4 100644 |
| 80 |
--- a/src/gui/widgets/textfield.h |
| 81 |
+++ b/src/gui/widgets/textfield.h |
| 82 |
@@ -63,6 +63,7 @@ struct TextHistory { |
| 83 |
|
| 84 |
class AutoCompleteLister { |
| 85 |
public: |
| 86 |
+ virtual ~AutoCompleteLister() {} |
| 87 |
virtual void getAutoCompleteList(std::vector<std::string>&) const {} |
| 88 |
}; |
| 89 |
|
| 90 |
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h |
| 91 |
index 1531108..d7859ad 100644 |
| 92 |
--- a/src/resources/itemdb.h |
| 93 |
+++ b/src/resources/itemdb.h |
| 94 |
@@ -78,7 +78,7 @@ class ItemDB |
| 95 |
mLoaded(false) |
| 96 |
{} |
| 97 |
|
| 98 |
- ~ItemDB() |
| 99 |
+ virtual ~ItemDB() |
| 100 |
{} |
| 101 |
|
| 102 |
/** |
| 103 |
-- |
| 104 |
1.7.11.1 |
| 105 |
|
| 106 |
|
| 107 |
|
| 108 |
|
| 109 |
1.1 games-rpg/mana/files/mana-0.6.1-Trick-gcc-into-importing-C99-stdint.h-when-C-11-is-n.patch |
| 110 |
|
| 111 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/mana/files/mana-0.6.1-Trick-gcc-into-importing-C99-stdint.h-when-C-11-is-n.patch?rev=1.1&view=markup |
| 112 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/mana/files/mana-0.6.1-Trick-gcc-into-importing-C99-stdint.h-when-C-11-is-n.patch?rev=1.1&content-type=text/plain |
| 113 |
|
| 114 |
Index: mana-0.6.1-Trick-gcc-into-importing-C99-stdint.h-when-C-11-is-n.patch |
| 115 |
=================================================================== |
| 116 |
From bb92108fed0242f1a3509384faeb2234d007c05e Mon Sep 17 00:00:00 2001 |
| 117 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 118 |
Date: Sat, 28 Jul 2012 15:54:10 +0200 |
| 119 |
Subject: [PATCH 2/3] Trick gcc into importing C99 stdint.h when C++11 is not |
| 120 |
used. |
| 121 |
|
| 122 |
--- |
| 123 |
src/cpp0x_compat/cstdint | 5 +++++ |
| 124 |
1 file changed, 5 insertions(+) |
| 125 |
|
| 126 |
diff --git a/src/cpp0x_compat/cstdint b/src/cpp0x_compat/cstdint |
| 127 |
index d8d71d9..d430649 100644 |
| 128 |
--- a/src/cpp0x_compat/cstdint |
| 129 |
+++ b/src/cpp0x_compat/cstdint |
| 130 |
@@ -5,3 +5,8 @@ |
| 131 |
* compiles Mana fine so it apparently understands types like uint16_t by |
| 132 |
* default. |
| 133 |
*/ |
| 134 |
+ |
| 135 |
+extern "C" |
| 136 |
+{ |
| 137 |
+#include <stdint.h> |
| 138 |
+}; |
| 139 |
-- |
| 140 |
1.7.11.1 |
Archives