| 1 |
commit: 518cafaff96142a48cae08b6b2b86e75325a58db |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 23 11:07:45 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 23 11:08:18 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=518cafaf |
| 7 |
|
| 8 |
dev-libs/collada-dom: Bump to 2.4.4 and backport upstream patch to build with gcc6. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-libs/collada-dom/Manifest | 1 + |
| 13 |
...llada-dom-9999.ebuild => collada-dom-2.4.4.ebuild} | 10 ++++++++-- |
| 14 |
dev-libs/collada-dom/collada-dom-9999.ebuild | 6 +++++- |
| 15 |
.../collada-dom/files/collada-dom-2.4.4-gcc6.patch | 19 +++++++++++++++++++ |
| 16 |
4 files changed, 33 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-libs/collada-dom/Manifest b/dev-libs/collada-dom/Manifest |
| 19 |
index bd9fdb0..e610b22 100644 |
| 20 |
--- a/dev-libs/collada-dom/Manifest |
| 21 |
+++ b/dev-libs/collada-dom/Manifest |
| 22 |
@@ -1,2 +1,3 @@ |
| 23 |
DIST collada-dom-2.4.0.tgz 42517651 SHA256 5ca2d12f744bdceff0066ed3067b3b23d6859581fb0d657f98ba4487d8fa3896 SHA512 6de67dc0e631cd02c4bc5567667e7bcee4a41a137310326d5b8290e088a757f7313454028473df3e198f73b3c2db7572a437f7256e666b44ed34fe81d44229c1 WHIRLPOOL fedb8e8d8adeafdd8b4b6bf7860a005153d05fdcaed99949b8913ce51582f2bc5d4e4ff223ea012c2bba84eb889a7e5fb3c8752ad1ae0884fd0127a2a1e1b44f |
| 24 |
DIST collada-dom-2.4.3_pre20150112.tar.xz 2272092 SHA256 be928859dc71491420433aa86df03b14576bf97b0fa6982cde201b7dac120d98 SHA512 46c237c123a9d1b9cc8e07bf992b4386c064a3382b44be1347ab4bc6dce85f75ad59da0a5740f97c879c982e5a1119dcec5ced82d4dd725efd789021b0ead7f1 WHIRLPOOL a7e6266895ba6528ef680f5dbcecc8dd3a3c0d9227f9e53fdc31729dc5538b6aebbc110b9a9b6ba2aa77cf7ed863e0301c55db72a0b4766b780e900b8125a860 |
| 25 |
+DIST collada-dom-2.4.4.tar.gz 4507681 SHA256 0dfa494827faa971310c871535b319cadbd0c2d6958ee11b303c61a55a5a437a SHA512 3a89357cca0e219d1af3830f85fe1e09928e469e90b5c124be9e0cc5acfa3ab897b484b225f572cf26435c9b4671c97eb5ea5d156b99b03e13f120d3ba1f1dcb WHIRLPOOL 2ee0b2430a16254dfb0d111896ee9c057f139b09bc82fe57c2f0e8abb34b7f12d9614b16f6e2a93ceaa7a28e3572a65cddc6a9c960cf53ab2f92932f5b2e972b |
| 26 |
|
| 27 |
diff --git a/dev-libs/collada-dom/collada-dom-9999.ebuild b/dev-libs/collada-dom/collada-dom-2.4.4.ebuild |
| 28 |
similarity index 77% |
| 29 |
copy from dev-libs/collada-dom/collada-dom-9999.ebuild |
| 30 |
copy to dev-libs/collada-dom/collada-dom-2.4.4.ebuild |
| 31 |
index b6bdc59..e9aa25a 100644 |
| 32 |
--- a/dev-libs/collada-dom/collada-dom-9999.ebuild |
| 33 |
+++ b/dev-libs/collada-dom/collada-dom-2.4.4.ebuild |
| 34 |
@@ -1,8 +1,8 @@ |
| 35 |
-# Copyright 1999-2015 Gentoo Foundation |
| 36 |
+# Copyright 1999-2017 Gentoo Foundation |
| 37 |
# Distributed under the terms of the GNU General Public License v2 |
| 38 |
# $Id$ |
| 39 |
|
| 40 |
-EAPI=5 |
| 41 |
+EAPI=6 |
| 42 |
|
| 43 |
SCM="" |
| 44 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 45 |
@@ -15,6 +15,10 @@ inherit ${SCM} cmake-utils |
| 46 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 47 |
KEYWORDS="" |
| 48 |
SRC_URI="" |
| 49 |
+elif [ "${PV%_pre*}" != "${PV}" ]; then |
| 50 |
+ # snapshot |
| 51 |
+ KEYWORDS="~amd64 ~arm" |
| 52 |
+ SRC_URI="mirror://gentoo/${P}.tar.xz" |
| 53 |
else |
| 54 |
KEYWORDS="~amd64 ~arm" |
| 55 |
SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 56 |
@@ -35,3 +39,5 @@ RDEPEND=" |
| 57 |
" |
| 58 |
DEPEND="${RDEPEND} |
| 59 |
virtual/pkgconfig" |
| 60 |
+ |
| 61 |
+PATCHES=( "${FILESDIR}/${P}-gcc6.patch" ) |
| 62 |
|
| 63 |
diff --git a/dev-libs/collada-dom/collada-dom-9999.ebuild b/dev-libs/collada-dom/collada-dom-9999.ebuild |
| 64 |
index b6bdc59..8c6c0ab 100644 |
| 65 |
--- a/dev-libs/collada-dom/collada-dom-9999.ebuild |
| 66 |
+++ b/dev-libs/collada-dom/collada-dom-9999.ebuild |
| 67 |
@@ -1,4 +1,4 @@ |
| 68 |
-# Copyright 1999-2015 Gentoo Foundation |
| 69 |
+# Copyright 1999-2017 Gentoo Foundation |
| 70 |
# Distributed under the terms of the GNU General Public License v2 |
| 71 |
# $Id$ |
| 72 |
|
| 73 |
@@ -15,6 +15,10 @@ inherit ${SCM} cmake-utils |
| 74 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 75 |
KEYWORDS="" |
| 76 |
SRC_URI="" |
| 77 |
+elif [ "${PV%_pre*}" != "${PV}" ]; then |
| 78 |
+ # snapshot |
| 79 |
+ KEYWORDS="~amd64 ~arm" |
| 80 |
+ SRC_URI="mirror://gentoo/${P}.tar.xz" |
| 81 |
else |
| 82 |
KEYWORDS="~amd64 ~arm" |
| 83 |
SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 84 |
|
| 85 |
diff --git a/dev-libs/collada-dom/files/collada-dom-2.4.4-gcc6.patch b/dev-libs/collada-dom/files/collada-dom-2.4.4-gcc6.patch |
| 86 |
new file mode 100644 |
| 87 |
index 00000000..48cdcd2 |
| 88 |
--- /dev/null |
| 89 |
+++ b/dev-libs/collada-dom/files/collada-dom-2.4.4-gcc6.patch |
| 90 |
@@ -0,0 +1,19 @@ |
| 91 |
+commit 8e65676c1cbecde1c0c4d8c2e1cfb20fc49c410b |
| 92 |
+Author: rosen <rosen.diankov@××××××××.jp> |
| 93 |
+Date: Wed Feb 24 12:49:14 2016 +0900 |
| 94 |
+ |
| 95 |
+ fix return type thanks to #22 |
| 96 |
+ |
| 97 |
+diff --git a/dom/src/dae/daeMetaGroup.cpp b/dom/src/dae/daeMetaGroup.cpp |
| 98 |
+index 25fd9cc..c34ac4c 100644 |
| 99 |
+--- a/dom/src/dae/daeMetaGroup.cpp |
| 100 |
++++ b/dom/src/dae/daeMetaGroup.cpp |
| 101 |
+@@ -26,7 +26,7 @@ daeElement *daeMetaGroup::placeElement( daeElement *parent, daeElement *child, d |
| 102 |
+ (void)offset; |
| 103 |
+ daeString nm = child->getElementName(); |
| 104 |
+ if ( findChild( nm ) == NULL ) { |
| 105 |
+- return false; |
| 106 |
++ return NULL; |
| 107 |
+ } |
| 108 |
+ daeElementRef el; |
| 109 |
+ |
Archives