[gentoo-commits] gentoo-x86 commit in media-sound/gejengel/files: gejengel-0.1.3-gcc45.patch

[gentoo-commits] gentoo-x86 commit in media-sound/gejengel/files: gejengel-0.1.3-gcc45.patch

[Markos Chandras (hwoarang)]

hwoarang    10/05/14 16:16:45

  Added:                gejengel-0.1.3-gcc45.patch
  Log:
  Add gcc-4.5 patch wrt bug #319363. Adjust imagemagick dependencies wrt bug #314321
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-sound/gejengel/files/gejengel-0.1.3-gcc45.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/gejengel/files/gejengel-0.1.3-gcc45.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/gejengel/files/gejengel-0.1.3-gcc45.patch?rev=1.1&content-type=text/plain

Index: gejengel-0.1.3-gcc45.patch
===================================================================
Fixing build gcc 4.5

http://bugs.gentoo.org/show_bug.cgi?id=319363

--- src/ui/playqueuemodel.cpp
+++ src/ui/playqueuemodel.cpp
@@ -64,7 +64,7 @@
     }
     else
     {
-        TreeIter iter = m_ListStore->get_iter(Gtk::TreePath::TreePath(1, static_cast<uint32_t>(index)));
+        TreeIter iter = m_ListStore->get_iter(Gtk::TreePath(1, static_cast<uint32_t>(index)));
         row = *(m_ListStore->insert(iter));
     }
 
@@ -99,7 +99,7 @@
 
 void PlayQueueModel::onTrackRemoved(uint32_t index)
 {
-    m_ListStore->erase(m_ListStore->get_iter(Gtk::TreePath::TreePath(1, index)));
+    m_ListStore->erase(m_ListStore->get_iter(Gtk::TreePath(1, index)));
     signalModelUpdated.emit();
 }
 
@@ -113,13 +113,13 @@
     if (destIndex >= m_ListStore->children().size())
     {
         //gtkmm should fix this, ther is no move move after
-        TreeIter source = m_ListStore->get_iter(Gtk::TreePath::TreePath(1, sourceIndex));
+        TreeIter source = m_ListStore->get_iter(Gtk::TreePath(1, sourceIndex));
         TreeIter dest = --m_ListStore->children().end();
         gtk_list_store_move_after(m_ListStore->gobj(), const_cast<GtkTreeIter*>(source.get_gobject_if_not_end()), const_cast<GtkTreeIter*>(dest.get_gobject_if_not_end()));
     }
     else
     {
-        m_ListStore->move(m_ListStore->get_iter(Gtk::TreePath::TreePath(1, sourceIndex)), m_ListStore->get_iter(Gtk::TreePath::TreePath(1, destIndex)));
+        m_ListStore->move(m_ListStore->get_iter(Gtk::TreePath(1, sourceIndex)), m_ListStore->get_iter(Gtk::TreePath(1, destIndex)));
     }
 
     signalModelUpdated.emit();
--- src/ui/detailedalbumview.cpp
+++ src/ui/detailedalbumview.cpp
@@ -190,7 +190,7 @@
 
 void DetailedAlbumView::onAlbumQueued(const Glib::ustring& rowPath)
 {
-    signalAlbumQueued.emit((*(m_AlbumModel.getStore()->get_iter(Gtk::TreePath::TreePath(rowPath))))[m_AlbumModel.columns().id], -1);
+    signalAlbumQueued.emit((*(m_AlbumModel.getStore()->get_iter(Gtk::TreePath(rowPath))))[m_AlbumModel.columns().id], -1);
 }
 
 void DetailedAlbumView::onLargeView()