public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/ptlib/files/, net-libs/ptlib/
Date: Thu, 18 May 2017 22:25:50 +0000 (UTC)	[thread overview]
Message-ID: <1495146342.2283a06a3813a77ce1e00e8f1539b05d2b5b3d90.mgorny@gentoo> (raw)

commit:     2283a06a3813a77ce1e00e8f1539b05d2b5b3d90
Author:     Peter-Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Thu May 11 05:05:59 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 18 22:25:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2283a06a

net-libs/ptlib: Fix building with GCC-6

Bug: https://bugs.gentoo.org/595690
Closes: https://github.com/gentoo/gentoo/pull/4600
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-libs/ptlib/files/ptlib-2.10.11-gcc6.patch | 29 +++++++++++++++++++++++++++
 net-libs/ptlib/ptlib-2.10.11.ebuild           |  5 +++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/net-libs/ptlib/files/ptlib-2.10.11-gcc6.patch b/net-libs/ptlib/files/ptlib-2.10.11-gcc6.patch
new file mode 100644
index 00000000000..140de64f16e
--- /dev/null
+++ b/net-libs/ptlib/files/ptlib-2.10.11-gcc6.patch
@@ -0,0 +1,29 @@
+--- a/src/ptlib/unix/svcproc.cxx
++++ b/src/ptlib/unix/svcproc.cxx
+@@ -217,7 +217,7 @@
+     pid_t pid;
+ 
+     {
+-      ifstream pidfile(pidfilename);
++      ifstream pidfile(static_cast<const char*>(pidfilename));
+       if (!pidfile.is_open()) {
+         cout << "Could not open pid file: \"" << pidfilename << "\""
+                 " - " << strerror(errno) << endl;
+@@ -384,7 +384,7 @@
+   // Run as a daemon, ie fork
+ 
+   if (!pidfilename) {
+-    ifstream pidfile(pidfilename);
++    ifstream pidfile(static_cast<const char*>(pidfilename));
+     if (pidfile.is_open()) {
+       pid_t pid;
+       pidfile >> pid;
+@@ -412,7 +412,7 @@
+       cout << "Daemon started with pid " << pid << endl;
+       if (!pidfilename) {
+         // Write out the child pid to magic file in /var/run (at least for linux)
+-        ofstream pidfile(pidfilename);
++        ofstream pidfile(static_cast<const char*>(pidfilename));
+         if (pidfile.is_open())
+           pidfile << pid;
+         else

diff --git a/net-libs/ptlib/ptlib-2.10.11.ebuild b/net-libs/ptlib/ptlib-2.10.11.ebuild
index eb76e20b142..02495a8d0e3 100644
--- a/net-libs/ptlib/ptlib-2.10.11.ebuild
+++ b/net-libs/ptlib/ptlib-2.10.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -60,7 +60,8 @@ src_prepare() {
 		"${FILESDIR}/${PN}-2.10.9-pkgconfig_ldflags.patch" \
 		"${FILESDIR}/${PN}-2.10.9-respect_cxxflags.patch" \
 		"${FILESDIR}/${PN}-2.10.10-mga-bison-parameter.patch" \
-		"${FILESDIR}/${PN}-2.10.10-respect_cflags_cxxflags.patch"
+		"${FILESDIR}/${PN}-2.10.10-respect_cflags_cxxflags.patch" \
+		"${FILESDIR}/${P}-gcc6.patch"
 
 	if ! use telnet; then
 		epatch "${FILESDIR}/${PN}-2.10.9-disable-telnet-symbols.patch"


             reply	other threads:[~2017-05-18 22:25 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-18 22:25 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-01-26 22:56 [gentoo-commits] repo/gentoo:master commit in: net-libs/ptlib/files/, net-libs/ptlib/ Mikle Kolyada

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=1495146342.2283a06a3813a77ce1e00e8f1539b05d2b5b3d90.mgorny@gentoo \
    --to=mgorny@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