summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <sven.eden@gmx.de>2012-07-18 17:49:38 +0200
committerSven Eden <sven.eden@gmx.de>2012-07-18 17:49:38 +0200
commit8542424297d4e88e139868b9a322a8187952a941 (patch)
treed6728b1c1006bfefb5977da1246bcda7de659ad5
parentnet-mail/davmail: version bump, dev-games/crystalspace: Some fixes and remova... (diff)
downloadseden-8542424297d4e88e139868b9a322a8187952a941.tar.gz
seden-8542424297d4e88e139868b9a322a8187952a941.tar.bz2
seden-8542424297d4e88e139868b9a322a8187952a941.zip
dev-games/crystalspace: -fpermissive flag is no longer needed with gcc-4.7+
-rw-r--r--dev-games/crystalspace/ChangeLog13
-rw-r--r--dev-games/crystalspace/Manifest9
-rw-r--r--dev-games/crystalspace/crystalspace-2.0-r2.ebuild (renamed from dev-games/crystalspace/crystalspace-2.0-r1.ebuild)9
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_01.patch11
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_02.patch29
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_03.patch11
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_04.patch20
-rw-r--r--dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_05.patch29
8 files changed, 129 insertions, 2 deletions
diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog
index ac32f6a..3547e7e 100644
--- a/dev-games/crystalspace/ChangeLog
+++ b/dev-games/crystalspace/ChangeLog
@@ -2,6 +2,19 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*crystalspace-2.0-r2 (19 Jul 2012)
+
+ 19 Jul 2012; Sven Eden <sven.eden@gmx.de>
+ +crystalspace-2.0-r2.ebuild,
+ -crystalspace-2.0-r1.ebuild,
+ +files/crystalspace-2.0-fix_unqualified_calls_01.patch,
+ +files/crystalspace-2.0-fix_unqualified_calls_02.patch,
+ +files/crystalspace-2.0-fix_unqualified_calls_03.patch,
+ +files/crystalspace-2.0-fix_unqualified_calls_04.patch,
+ +files/crystalspace-2.0-fix_unqualified_calls_05.patch:
+ Eventually found time to fix unqualified calls to class methods
+ that require -fpermissive flag with gcc-4.7+.
+
*crystalspace-2.0-r1 (18 Jul 2012)
18 Jul 2012; Sven Eden <sven.eden@gmx.de>
diff --git a/dev-games/crystalspace/Manifest b/dev-games/crystalspace/Manifest
index 4ee4576..7def4da 100644
--- a/dev-games/crystalspace/Manifest
+++ b/dev-games/crystalspace/Manifest
@@ -11,7 +11,12 @@ AUX crystalspace-2.0-fix_ode_update_10.patch 428 SHA256 06e52aeeca805dec8c1f1baa
AUX crystalspace-2.0-fix_ode_update_11.patch 4583 SHA256 d1c2f7ebf40aa9ed821cb6584cd8e95397c73713ef7241ac99eab80c529503ac SHA512 eb5a6d4de3e8c7bcf8ae8f2e81528d880669aa3a78a4a6c1583b1542994fe49b3d744512720be1a02ba44df87f8141d5e07746bd318948a06a61219d6980d0ce WHIRLPOOL 127711f6a54e4ff7a4d3c088df08e8e4569efa5543554d02e81a8d43977e4b464159c1bc62ae53cd2c48b6316b88e4477483715c23a99ddf4924ec7f2265f87d
AUX crystalspace-2.0-fix_ode_update_12.patch 2496 SHA256 e98092ca53a28fdd02d15fcb54d305378ed21af1ea4d8c57bca5fc5231916e78 SHA512 ed5d7f2b7a23336864f598d51f34403afbd9fb2d615e9f35fd7fe44464f68e169aadb9f39e83aaf7dd47bb3e62f1c6df0b104ca7ec8762ecda4d4dde7bc92703 WHIRLPOOL 291e26b58c8c8f787814fab98be42d9ad862176b5e6cbaf06208535a8ec45d9188841a3703bbdc7c436c011e0278b2ba11b7bda8ca04d2dc0b54e49cabe1cc2d
AUX crystalspace-2.0-fix_ode_update_13.patch 1988 SHA256 e865e1616bc4ac4728066bc58686f8ef7aad3764db0867b6aaf31aec52ad6aa7 SHA512 cd88a5a479944b7969ff738208b720a4f283dbeecee7573bcc2d767a0a91c7d8085e0ba806c819c4afb6fce2ecbe0b1839d5e6207466950b3eaa42034c4655de WHIRLPOOL 27cd936d02942d278ca62e7f6e8d85480f079c2d50e1c4d48950311632771383e78ff10cc11dea8587fcc2d8c12646124e702195827287a79c3581806e3a946a
+AUX crystalspace-2.0-fix_unqualified_calls_01.patch 367 SHA256 5750d296437282df3d8bed735f2495148583da659d6801a97a89d8ada99e8000 SHA512 672f503bef9bc8919453ccb86e04874d5d4bbd7a9502cf773b2313bd3ae3e778e60f90ff0358b9561759f9abe2a01eb4aefa6cc3ffa26c1dfd15e7d91a4fe83d WHIRLPOOL d32b3562a573c0ccad71b179b4f58aa7b69cd49e34d6af34232d0adc8a73fa541f767ac268f260274321e554856d852a7749fc10e5a113fbf2365bfe0a251868
+AUX crystalspace-2.0-fix_unqualified_calls_02.patch 627 SHA256 af9e24971436b5ee0976c7635f857b57b65901efb1cb783e942a8380e0207974 SHA512 94d4a5b8105b914dd76bb7d237746a244461f81c39fc4ce3fd2c8d2123c53e1fd554fd888599732885205fde35bb73c00394c3afb2adb4f9da79b3176ae84ba2 WHIRLPOOL 273a6fd0e35cdbcd441a6b329d8e21e80e33bf4993217021f7f303f199fa79e72ff7707f135ae4b2e0fd9e1934bd011961f5a426161827caaec11904d6eef4c4
+AUX crystalspace-2.0-fix_unqualified_calls_03.patch 363 SHA256 0f5e3fdbb9935614da834be6910ee86afdc387a5d11c793918d04e7bed579b63 SHA512 186dddbcb56e0d6ff5f75695f5dfb3340c8e966e351d1a452a1fc110908622a68f497b82a54cb8ba7baf98015ead413b5f51a9b7d9e51a65f59824d83d5251b3 WHIRLPOOL 7ca3a0e0697ead4679733543b96ffba0065b842ecd500d126c537b5a7bc4ab653e7ed5591c1f46ef9eded697ff53c7540d87d258cf0bdf9ee30b60a913c7771e
+AUX crystalspace-2.0-fix_unqualified_calls_04.patch 773 SHA256 f766f1679da0e01bbc964acaf927a9443d4b46fc4e12e0a2d181b19a73aa9aad SHA512 a1cab0dd2f5ba5c280272b324363f8ebb0c87d1afbb70d180cfc54d970c3252be8c0c27bae29a45e8643528249ae40d6e6ee6e1e0b792eb3d19f062f6b12bf7b WHIRLPOOL d96bf5f3400a4d288429a0199ac293937a1c5862cd7595e4dda621b82479c480367f5458d4786f4c0582acde21a70de3393b97179d4aa5ebc9d3d3b06cbcad10
+AUX crystalspace-2.0-fix_unqualified_calls_05.patch 1195 SHA256 df6093e6150e8285ce56bf8107dc5d696e1fd954a4065fa76b3e1a152fe274dd SHA512 0f11df14cc44207d6fd042dc472eb1f846885f893c72c28cdaa11ff4891b37249c4837c58b9105adbee7147f31d7763c75f8774ab683a99f6296f633d27bf53b WHIRLPOOL 3aa49c5898d0fe507c8332e833d4fddd2e2e67a2891ad675ee79a19d763914ef2acf6bf9fe81d0339990526c05a80d2c981d1e1980f20cdac68dfd4cd202fa8b
DIST crystalspace-src-2.0.tar.bz2 185925180 SHA256 f1cda74fd998e44088746803209b1ea6625e80e3d4fb72023d8bed6b677b7b6a SHA512 f09d40669268e26542a2854560ac5033e7f89d0bd5def870e5062e08611c36a0875666abe0c705bb5f9f37dafa619f33f900e358d5fe255746a86127a3899f97 WHIRLPOOL a1705cb88b64eb0e8f6a146c2a75baab01aa598d07b8d36ab0671a47d4092b5c9b53c13f46bb1e56663b2b228c4b95cee3a355554c1de92c3d931187e97c4ca1
-EBUILD crystalspace-2.0-r1.ebuild 4727 SHA256 1a516d9419a8368f41134738eddf123072ab0c4b29950598b52c8f087bf544f5 SHA512 97dcde93046ce246d0c8760f8f0ef460dc560a536e621d4cdbe85184b2dfcebf9b47feffd6339a9cafd76934d4b7bf7ef926e4dc400c33a55712d81a85891fbe WHIRLPOOL ffe20d13d83fe9947ce7d7472dc42686cb1508032b130845fc3077037b96c70eccccc008efd385e764e561fe4961d3f460ce702ff76121c6aa7f253136829107
-MISC ChangeLog 5610 SHA256 b6958a175e60e1adc419d9b04fb191ab0c9339dce05b928e8d1c92020b1c3a12 SHA512 a962feead51a39f2511b25232cabb0f612dc90eb6348044acd0e9bf8386e344533d7221cf789cc9305565684272770ea7fb4d0b49c99d03ef97d80e322fb370e WHIRLPOOL 105d288f9d512848cb9f3c9f06f0af5fb632d293c156e98563f7afaffb732fd2712f15e7a244ebfd2ee80a04b68a64f05020e5272d5a8321f173c50be0b3c736
+EBUILD crystalspace-2.0-r2.ebuild 5143 SHA256 10b7b0fa5207439ee35148a55cb88c80b3bf11fc2af3709789f3e11cfa10d6d3 SHA512 9df7a0f17d2dfffa1041a1e513c1cbf3191968ecab3b502567ac4481edebe576ed2a32a901df37dc0ad72c83020e61a8dcd12290d8342838ebc2e7237749bcc8 WHIRLPOOL b936e19eb56d83d47986c705b394b2936dc1b17d2b5edd91f6d7c0ed75b059e1f0b27e4f5c50a9f0d45d73f83004280b6d7d5f3769a1e5c9a8ce2e16d17332fa
+MISC ChangeLog 6157 SHA256 1e42edd1b4b689b33b9b417bd06b6c08fce2874d92a4234d9b4865f81eabf314 SHA512 36a21f438db0c92a2ba5c2470f15cc4fe247622a90d186924c0734d65559ff10972f37f3004c9130a15eedfbb0b695a0e33deb847fe8f128fc904dabe77e9036 WHIRLPOOL 2071677a0f603433375b5d8cf39ff5007e42636fb627a14cf8f8d6239ab03c9b850f142b87bf6528340a34224efa8914f1823fd04aa04198c09fb666e01208ad
MISC metadata.xml 897 SHA256 82b3c21f6c5fb6b66310dc663f6bdd3ad3ca2b0e1d70ee056ce48eb92ef747ed SHA512 e7ad7264a6badd9b6cd0d5e3ac5fcb12da19c8668a51528dc9b445b51fff31323dd66f29e3c702acbe6901a9316cd627340fdb4b0d8a6be9bf8549b1fabaa6a2 WHIRLPOOL e14f2ef8b54c1066f73ed92089fc4fb62e7151056c1cf468a87ebc6a188cb26343b24f5fd881695a6bba14c62ac68f6ebe52ff5a5e7a6083b559a1ddce64eff4
diff --git a/dev-games/crystalspace/crystalspace-2.0-r1.ebuild b/dev-games/crystalspace/crystalspace-2.0-r2.ebuild
index 3b87ff8..e5ead5e 100644
--- a/dev-games/crystalspace/crystalspace-2.0-r1.ebuild
+++ b/dev-games/crystalspace/crystalspace-2.0-r2.ebuild
@@ -70,6 +70,15 @@ src_prepare() {
epatch "${FILESDIR}"/${MY_P}-fix_ode_update_12.patch
epatch "${FILESDIR}"/${MY_P}-fix_ode_update_13.patch
+ # Some calls to class methods are unqualified from their
+ # scope. gcc-4.7+ would need -fpermissive flag to allow
+ # this, so repair the calls:
+ epatch "${FILESDIR}"/-fix_unqualified_calls_01.patch
+ epatch "${FILESDIR}"/-fix_unqualified_calls_02.patch
+ epatch "${FILESDIR}"/-fix_unqualified_calls_03.patch
+ epatch "${FILESDIR}"/-fix_unqualified_calls_04.patch
+ epatch "${FILESDIR}"/-fix_unqualified_calls_05.patch
+
# Installing doc conflict with dodoc on src_install
# Removing conflicting target
sed -i \
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_01.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_01.patch
new file mode 100644
index 0000000..4f1504e
--- /dev/null
+++ b/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_01.patch
@@ -0,0 +1,11 @@
+--- include/csutil/refarr.h.ori 2012-07-18 16:17:45.460834864 +0200
++++ include/csutil/refarr.h 2012-07-18 16:18:11.580836231 +0200
+@@ -111,7 +111,7 @@
+ {
+ CS_ASSERT (this->GetSize () > 0);
+ csRef<T> ret = this->Get (this->GetSize () - 1); // see *1*
+- SetSize (this->GetSize () - 1);
++ this->SetSize (this->GetSize () - 1);
+ return ret;
+ }
+ };
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_02.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_02.patch
new file mode 100644
index 0000000..9a371a7
--- /dev/null
+++ b/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_02.patch
@@ -0,0 +1,29 @@
+--- include/csutil/blockallocator.h.ori 2012-07-18 16:20:00.460841926 +0200
++++ include/csutil/blockallocator.h 2012-07-18 17:02:35.940975474 +0200
+@@ -193,7 +193,7 @@
+ ~csBlockAllocator()
+ {
+ ObjectDispose dispose (*this, false);
+- DisposeAll (dispose);
++ this->DisposeAll (dispose);
+ }
+
+ /**
+@@ -204,7 +204,7 @@
+ void Empty ()
+ {
+ ObjectDispose dispose (*this, true);
+- FreeAll (dispose);
++ this->FreeAll (dispose);
+ }
+
+ /**
+@@ -215,7 +215,7 @@
+ void DeleteAll ()
+ {
+ ObjectDispose dispose (*this, true);
+- DisposeAll (dispose);
++ this->DisposeAll (dispose);
+ }
+
+ /**
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_03.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_03.patch
new file mode 100644
index 0000000..28c9b5a
--- /dev/null
+++ b/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_03.patch
@@ -0,0 +1,11 @@
+--- include/csutil/parray.h.ori 2012-07-18 16:50:17.604270426 +0200
++++ include/csutil/parray.h 2012-07-18 16:50:52.484272185 +0200
+@@ -112,7 +112,7 @@
+ {
+ CS_ASSERT (this->GetSize () > 0);
+ T* ret = GetAndClear (this->GetSize () - 1); // see *1*
+- Truncate (this->GetSize () - 1);
++ this->Truncate (this->GetSize () - 1);
+ return ret;
+ }
+
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_04.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_04.patch
new file mode 100644
index 0000000..bc76e0c
--- /dev/null
+++ b/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_04.patch
@@ -0,0 +1,20 @@
+--- include/csutil/redblacktree.h.ori 2012-07-18 17:23:56.847708962 +0200
++++ include/csutil/redblacktree.h 2012-07-18 17:26:29.221050599 +0200
+@@ -1155,7 +1155,7 @@
+ T* Put (const K& key, const T &value)
+ {
+ csRedBlackTreePayload<K, T>* payload = (csRedBlackTreePayload<K, T>*)
+- Insert (csRedBlackTreePayload<K, T>(key, value));
++ this->Insert (csRedBlackTreePayload<K, T>(key, value));
+ return (payload != 0) ? &payload->GetValue() : 0;
+ }
+ /**
+@@ -1194,7 +1194,7 @@
+ */
+ const T& Get (const K& key, const T& fallback) const
+ {
+- const csRedBlackTreePayload<K, T>* payload = Find (key);
++ const csRedBlackTreePayload<K, T>* payload = this->Find (key);
+ if (payload == 0) return fallback;
+ return payload->GetValue();
+ }
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_05.patch b/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_05.patch
new file mode 100644
index 0000000..01a1097
--- /dev/null
+++ b/dev-games/crystalspace/files/crystalspace-2.0-fix_unqualified_calls_05.patch
@@ -0,0 +1,29 @@
+--- include/csplugincommon/rendermanager/render.h.ori 2012-07-18 17:26:53.654385262 +0200
++++ include/csplugincommon/rendermanager/render.h 2012-07-18 17:27:46.111054919 +0200
+@@ -194,7 +194,7 @@
+ || (mesh.preCopyNum != 0))
+ {
+ // Render the latest batch of meshes
+- RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, m);
++ this->RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, m);
+ lastRenderedMesh = m;
+
+ lastShader = shader;
+@@ -208,7 +208,7 @@
+ }
+ }
+
+- RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, node->meshes.GetSize ());
++ this->RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, node->meshes.GetSize ());
+ }
+ };
+
+@@ -242,7 +242,7 @@
+ iShader* shader = context.shaderArray[mesh.contextLocalId+layerOffset];
+
+ size_t ticket = context.ticketArray[mesh.contextLocalId+layerOffset];
+- RenderMeshes (context, node->meshes, shader, ticket, m, m+1);
++ this->RenderMeshes (context, node->meshes, shader, ticket, m, m+1);
+ }
+ }
+ }