diff options
| -rw-r--r-- | media-sound/gejengel/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/gejengel/files/gejengel-0.1.3-gcc45.patch | 51 | ||||
| -rw-r--r-- | media-sound/gejengel/gejengel-0.1.3.ebuild | 11 |
3 files changed, 65 insertions, 4 deletions
diff --git a/media-sound/gejengel/ChangeLog b/media-sound/gejengel/ChangeLog index bd58bddd00d8..def9c78ecf95 100644 --- a/media-sound/gejengel/ChangeLog +++ b/media-sound/gejengel/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/gejengel # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.10 2010/04/14 09:03:34 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.11 2010/05/14 16:16:45 hwoarang Exp $ + + 14 May 2010; Markos Chandras <hwoarang@gentoo.org> gejengel-0.1.3.ebuild, + +files/gejengel-0.1.3-gcc45.patch: + Add gcc-4.5 patch wrt bug #319363. Adjust imagemagick dependencies wrt bug + #314321 *gejengel-0.1.3 (14 Apr 2010) diff --git a/media-sound/gejengel/files/gejengel-0.1.3-gcc45.patch b/media-sound/gejengel/files/gejengel-0.1.3-gcc45.patch new file mode 100644 index 000000000000..9820eea31eb8 --- /dev/null +++ b/media-sound/gejengel/files/gejengel-0.1.3-gcc45.patch @@ -0,0 +1,51 @@ +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() diff --git a/media-sound/gejengel/gejengel-0.1.3.ebuild b/media-sound/gejengel/gejengel-0.1.3.ebuild index c927e8dfbe7b..be1a51c4438a 100644 --- a/media-sound/gejengel/gejengel-0.1.3.ebuild +++ b/media-sound/gejengel/gejengel-0.1.3.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/gejengel-0.1.3.ebuild,v 1.1 2010/04/14 09:03:34 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/gejengel-0.1.3.ebuild,v 1.2 2010/05/14 16:16:45 hwoarang Exp $ EAPI=2 -inherit eutils multilib +inherit base eutils multilib DESCRIPTION="Lightweight audio player" HOMEPAGE="http://code.google.com/p/gejengel" @@ -19,7 +19,8 @@ RDEPEND=">=dev-cpp/gtkmm-2.16 dev-cpp/libsexymm media-libs/taglib dev-db/sqlite - || ( media-gfx/imagemagick[cxx] media-gfx/imagemagick[-nocxx] ) + || ( || ( media-gfx/imagemagick[cxx] media-gfx/imagemagick[-nocxx] ) + media-gfx/graphicsmagick[imagemagick] ) mad? ( media-libs/libmad ) flac? ( media-libs/flac[cxx] ) ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070330 ) @@ -33,6 +34,10 @@ DEPEND="${RDEPEND} dev-libs/libxdg-basedir >=sys-devel/automake-1.11" +PATCHES=( + "${FILESDIR}/${P}-gcc45.patch" +) + src_configure() { econf \ --disable-dependency-tracking \ |