From 5f06ea33698791cfd77f1d7607e73bed00d058d0 Mon Sep 17 00:00:00 2001 From: Mike Fleetwood Date: Sun, 14 Apr 2013 15:23:47 +0200 Subject: [PATCH] Further RHEL / CentOS 5.9 compile fixes (#695279) Glib::ustring::compose() method requires glibmm >= 2.16, but RHEL / CentOS 5.9 only provides glibmm 2.12. Replace with String::ucompose() as is used everywhere else in the code. Add missing include for kill() and SIGINT declarations. Bug #695279 - GParted doesn't compile on RHEL / CentOS 5.9 --- src/Dialog_Progress.cc | 4 ++-- src/FileSystem.cc | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Dialog_Progress.cc b/src/Dialog_Progress.cc index 5c3efef8..f8fcc7fd 100644 --- a/src/Dialog_Progress.cc +++ b/src/Dialog_Progress.cc @@ -292,7 +292,7 @@ bool Dialog_Progress::cancel_timeout() if (--cancel_countdown) { /*TO TRANSLATORS: looks like Force Cancel (5) * where the number represents a count down in seconds until the button is enabled */ - cancelbutton->set_label( Glib::ustring::compose( _("Force Cancel (%1)"), cancel_countdown ) ); + cancelbutton->set_label( String::ucompose( _("Force Cancel (%1)"), cancel_countdown ) ); } else { cancelbutton->set_label( _("Force Cancel") ); canceltimer.disconnect(); @@ -323,7 +323,7 @@ void Dialog_Progress::on_cancel() cancel_countdown = 5; /*TO TRANSLATORS: looks like Force Cancel (5) * where the number represents a count down in seconds until the button is enabled */ - cancelbutton->set_label( Glib::ustring::compose( _("Force Cancel (%1)"), cancel_countdown ) ); + cancelbutton->set_label( String::ucompose( _("Force Cancel (%1)"), cancel_countdown ) ); canceltimer = Glib::signal_timeout().connect( sigc::mem_fun(*this, &Dialog_Progress::cancel_timeout), 1000 ); } diff --git a/src/FileSystem.cc b/src/FileSystem.cc index 14d93f5c..eb5b4e75 100644 --- a/src/FileSystem.cc +++ b/src/FileSystem.cc @@ -22,6 +22,7 @@ #include #include #include +#include #include namespace GParted