| 1 |
ssuominen 10/05/06 11:19:00 |
| 2 |
|
| 3 |
Added: fme-1.1.2-gcc45.patch |
| 4 |
Log: |
| 5 |
Fix building with GCC 4.5+ wrt #318409. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-misc/fme/files/fme-1.1.2-gcc45.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/fme/files/fme-1.1.2-gcc45.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/fme/files/fme-1.1.2-gcc45.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: fme-1.1.2-gcc45.patch |
| 15 |
=================================================================== |
| 16 |
http://bugs.gentoo.org/318409 |
| 17 |
|
| 18 |
--- src/ui.cc |
| 19 |
+++ src/ui.cc |
| 20 |
@@ -886,7 +886,7 @@ |
| 21 |
unsigned i=1; |
| 22 |
for ( Glib::Container_Helpers::ArrayHandleIterator<Glib::Container_Helpers::TypeTraits<Glib::ustring> > iter=dirs.begin(); iter!=dirs.end(); iter++ ) { |
| 23 |
try { |
| 24 |
- Glib::Dir::Dir directory(*iter); |
| 25 |
+ Glib::Dir directory(*iter); |
| 26 |
#else |
| 27 |
boost::regex re("\\:"); |
| 28 |
boost::sregex_token_iterator dir(path.begin(), path.end(), re, -1); |
| 29 |
@@ -894,7 +894,7 @@ |
| 30 |
|
| 31 |
for ( unsigned i=1; dir!=end;) { |
| 32 |
try { |
| 33 |
- Glib::Dir::Dir directory(*dir++); |
| 34 |
+ Glib::Dir directory(*dir++); |
| 35 |
#endif /* GLIBMM_REGEX */ |
| 36 |
for ( Glib::DirIterator iter=directory.begin(); iter!=directory.end(); iter++ ) { |
| 37 |
Gtk::TreeModel::Row rowCompletion = *(refCompletionModel->append()); |
| 38 |
@@ -1259,7 +1259,7 @@ |
| 39 |
|
| 40 |
for ( std::vector<Glib::ustring>::iterator iterPath = preferences.getPathsIcons().begin(); iterPath!=preferences.getPathsIcons().end(); iterPath++ ) { |
| 41 |
try { |
| 42 |
- Glib::Dir::Dir directory(*iterPath); |
| 43 |
+ Glib::Dir directory(*iterPath); |
| 44 |
for ( Glib::DirIterator iter=directory.begin(); iter!=directory.end(); iter++ ) { |
| 45 |
Glib::ustring icon_name = *iter; |
| 46 |
if ( icon_name.find(command_name)!=Glib::ustring::npos ) { |
Archives