From: "Alexey Shvetsov" <alexxy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/coin/files/, media-libs/coin/
Date: Sun, 23 Jul 2017 13:09:38 +0000 (UTC) [thread overview]
Message-ID: <1500815349.91ee8a4e9e3f2d09578d350ef0badd1edf4d4693.alexxy@gentoo> (raw)
commit: 91ee8a4e9e3f2d09578d350ef0badd1edf4d4693
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 13:08:39 2017 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 13:09:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ee8a4e
media-libs/coin: Now it can be build with gcc7
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/coin/coin-3.1.3-r2.ebuild | 1 +
media-libs/coin/files/coin-3.1.3-gcc-7.patch | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/media-libs/coin/coin-3.1.3-r2.ebuild b/media-libs/coin/coin-3.1.3-r2.ebuild
index 5edce05a9cb..6880fa4cc0e 100644
--- a/media-libs/coin/coin-3.1.3-r2.ebuild
+++ b/media-libs/coin/coin-3.1.3-r2.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc-4.7.patch
"${FILESDIR}"/${P}-freetype251.patch
"${FILESDIR}"/${P}-memhandler-initialization.patch
+ "${FILESDIR}"/${P}-gcc-7.patch
)
DOCS=(
diff --git a/media-libs/coin/files/coin-3.1.3-gcc-7.patch b/media-libs/coin/files/coin-3.1.3-gcc-7.patch
new file mode 100644
index 00000000000..c1f1f560d85
--- /dev/null
+++ b/media-libs/coin/files/coin-3.1.3-gcc-7.patch
@@ -0,0 +1,21 @@
+diff -urN Coin-3.1.3.orig/src/3ds/SoStream.cpp Coin-3.1.3/src/3ds/SoStream.cpp
+--- Coin-3.1.3.orig/src/3ds/SoStream.cpp 2010-03-02 16:20:09.000000000 +0300
++++ Coin-3.1.3/src/3ds/SoStream.cpp 2017-07-23 15:04:43.808204691 +0300
+@@ -176,7 +176,7 @@
+ if (!gotNum) { setBadBit(); return FALSE; } \
+ \
+ char *ce; \
+- s = '\0'; \
++ s = NULL; \
+ _convertType_ tempVal = _convertFunc_(buf, &ce, 0); \
+ \
+ if (ce != s) \
+@@ -273,7 +273,7 @@
+ gotAll: \
+ \
+ char *ce; \
+- s = '\0'; \
++ s = NULL; \
+ double tempVal = _convertFunc_(buf, &ce); \
+ \
+ if (ce != s) \
next reply other threads:[~2017-07-23 13:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-23 13:09 Alexey Shvetsov [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-11-21 21:24 [gentoo-commits] repo/gentoo:master commit in: media-libs/coin/files/, media-libs/coin/ Maciej Mrozowski
2020-08-10 22:45 Maciej Mrozowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1500815349.91ee8a4e9e3f2d09578d350ef0badd1edf4d4693.alexxy@gentoo \
--to=alexxy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox