Hello community, here is the log from the commit of package openmcu for openSUSE:Factory checked in at 2016-07-14 09:48:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openmcu (Old) and /work/SRC/openSUSE:Factory/.openmcu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openmcu" Changes: -------- --- /work/SRC/openSUSE:Factory/openmcu/openmcu.changes 2016-03-17 16:47:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openmcu.new/openmcu.changes 2016-07-14 09:48:33.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Jul 4 18:34:10 UTC 2016 - [email protected] + +- add patch openmcu-3.48.0-gcc6.patch, fixed boo#985367 + * if/ofstream takes 'const char*' as the first argument, can't + pass PString to it. + * PString has its own constructors defined that conflicts w/ + std::string (same methods like ++), so use 'PString.operator + std::string()' to convert PString to std::string, then use + string method c_str() to convert to const char* + +------------------------------------------------------------------- New: ---- openmcu-3.48.0-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openmcu.spec ++++++ --- /var/tmp/diff_new_pack.TkGwwa/_old 2016-07-14 09:48:35.000000000 +0200 +++ /var/tmp/diff_new_pack.TkGwwa/_new 2016-07-14 09:48:35.000000000 +0200 @@ -23,11 +23,12 @@ License: MPL-1.1 Group: Productivity/Telephony/H323/Servers Url: http://openmcu.ru/eng.htm - Source0: https://github.com/muggot/openmcu/archive/v%{version}.tar.gz Patch0: aarch64-support.patch Patch1: undefined-operation.patch Patch2: ppc64le-support.patch +# PATCH-FIX-UPSTREAM ofstream takes const char not variable +Patch3: openmcu-3.48.0-gcc6.patch BuildRequires: SDL-devel BuildRequires: autoconf BuildRequires: automake @@ -40,6 +41,7 @@ BuildRequires: libjpeg-devel BuildRequires: libpt-devel BuildRequires: openldap2-devel +BuildRequires: pkgconfig BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(freetype2) @@ -76,6 +78,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build NOCONFIGURE=1 ./autogen.sh @@ -84,7 +87,7 @@ make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install +make %{?_smp_mflags} DESTDIR=%{buildroot} install # Remove installed doc in the wrong location rm -f %{buildroot}%{_datadir}/openmcu-ru/{AUTHORS,COPYING,NEWS,README} # Backward compatibility symlink ++++++ openmcu-3.48.0-gcc6.patch ++++++ Index: b/ptlib/src/ptlib/unix/svcproc.cxx =================================================================== --- a/ptlib/src/ptlib/unix/svcproc.cxx +++ b/ptlib/src/ptlib/unix/svcproc.cxx @@ -259,6 +259,9 @@ */ #include <ptlib.h> +#include <iostream> +#include <cstring> +#include <string> #pragma implementation "svcproc.h" #include <ptlib/svcproc.h> @@ -378,7 +381,7 @@ void PSystemLog::Output(Level level, con if (systemLogFileName == "-") out = &cerr; else - out = new ofstream(systemLogFileName, ios::app); + out = new ofstream((systemLogFileName.operator std::string()).c_str(), ios::app); PTime now; *out << now.AsString("yyyy/MM/dd hh:mm:ss.uuu\t"); @@ -592,7 +595,7 @@ int PServiceProcess::InitialiseService() pid_t pid; { - ifstream pidfile(pidfilename); + ifstream pidfile((pidfilename.operator std::string()).c_str()); if (!pidfile.is_open()) { cout << "Could not open pid file: \"" << pidfilename << "\"" " - " << strerror(errno) << endl; @@ -722,7 +725,7 @@ int PServiceProcess::InitialiseService() else if (systemLogFileName == "-") cout << "All output for " << GetName() << " is to console." << endl; else { - ofstream logfile(systemLogFileName, ios::app); + ofstream logfile((systemLogFileName.operator std::string()).c_str(), ios::app); if (!logfile.is_open()) { cout << "Could not open log file \"" << systemLogFileName << "\"" " - " << strerror(errno) << endl; @@ -770,7 +773,7 @@ int PServiceProcess::InitialiseService() // Run as a daemon, ie fork if (!pidfilename) { - ifstream pidfile(pidfilename); + ifstream pidfile((pidfilename.operator std::string()).c_str()); if (pidfile.is_open()) { pid_t pid; pidfile >> pid; @@ -798,7 +801,7 @@ int PServiceProcess::InitialiseService() 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((pidfilename.operator std::string()).c_str()); if (pidfile.is_open()) pidfile << pid; else
