Add gcc-4.5 patch wrt bug #319363. Adjust imagemagick dependencies wrt bug #314321

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-sound/gejengel/ChangeLog b/media-sound/gejengel/ChangeLog
index bd58bddd00d8f86425513f0e700fe0ae8293e039..def9c78ecf95d9fd5cc30c8642aada01d63a3242 100644 (file)
--- 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/Manifest b/media-sound/gejengel/Manifest
index da0c4b08ece38b58daf723789cf038994cfc0ddb..8cffe58091dfb3c165b3b837ad8cc8da77e203e7 100644 (file)
--- a/media-sound/gejengel/Manifest
+++ b/media-sound/gejengel/Manifest
@@ -1,8 +1,9 @@
 AUX gejengel-0.1.2-plugin.patch 419 RMD160 19ceffd3165ff1f2bc40e6f3c5c24132d2aed2ed SHA1 c07c6d3e7ca14e430dc8cb16fdf6a9c4a744df45 SHA256 0f6bd25e68c08dd1d93967d100c6c491f1c00360e11b7f0d99c764f2f92914e7
 AUX gejengel-0.1.2_64bit_fix.patch 1446 RMD160 65cbda557c6c593c202ad2b238c6710d2889777e SHA1 1d21548b4da61f3a2d05499ec33e1245105cfd72 SHA256 5baa9c45a1d810092510c5d9f406b8c014b678c580c8760075094756a16abbb0
+AUX gejengel-0.1.3-gcc45.patch 2058 RMD160 f9cad4a35200eb23fa5c41669f2ab091eebf9266 SHA1 c08dad74b6b4e965f52b5a368d0a6a9d9abfcf89 SHA256 d4c17fc8bc4d0ce275deedbd7d47bd24305c44ca69e1c46fb99b5c7b3ef53684
 DIST gejengel-0.1.2.tar.gz 475783 RMD160 4011b6aaace6c2b07405da6d2744e7ab7bcb4c96 SHA1 90111f2de1a014b01dedcb57563b2587e9b4b4bb SHA256 efa7e8db2463fb32c8978fdb0b6e1fef8e22aa8d296eb9bcd8c5be3b5425e6ea
 DIST gejengel-0.1.3.tar.gz 473475 RMD160 5db5a58df7086f7ac2caf506a913562fe49810e9 SHA1 06df7aef9f9874e5822e157b35f26c0972ad162b SHA256 4f0df9898d7ae9dbb526dc32fbf97bf28af266d8a4546ab0633efbc0e60cb6b9
 EBUILD gejengel-0.1.2.ebuild 1763 RMD160 8dd2a0e3710224aea000d4fce13cc31df708afb4 SHA1 cd7101e53be761fa51b5a8e0eaff596a30ea3fea SHA256 8272277f48f5494946112c2ccb73df80636931eb82a1afb77d57b57968568a4f
-EBUILD gejengel-0.1.3.ebuild 1661 RMD160 f138d26195aa946fa2174a3484bb15549175fc1d SHA1 13e08c63c8f1ad45ab3931248e8e181f6efb4f7d SHA256 54e777276ec527aebeab4bdb50793a8d3b181c3a3b863ef9efcfd58f7f057cda
-MISC ChangeLog 1597 RMD160 4aa1a1b9b58aa14c5602e9246473ffcd73d1a7e6 SHA1 7242d490aaca865e875924c69d6d717b3377a5a0 SHA256 0d5b42d8069dd9d27995698602e7ba92d6f52228a3694e5b9e907fb60c2fc047
+EBUILD gejengel-0.1.3.ebuild 1757 RMD160 0c4eab94d9a717cb0dcc52c919a39af5b62e2be8 SHA1 90f536bc0faf7ee500e9d36c3a0ea4c2f5f5ef2e SHA256 d057652a69aed27b27f90930675599f245cdab460a5d62f5de0b584421516e5e
+MISC ChangeLog 1798 RMD160 03ebeb62115bcf127e7a49c32f8c024f42b91668 SHA1 26cf96e1d953b93f1612cc4d0820f7d2c70941e0 SHA256 bd18e2ef0e71cd20c1ec79d5f80ec13922cca327b60f98856c2bb824cf31a29a
 MISC metadata.xml 561 RMD160 fa1cd6eae8181d8de7776f3766ab04b2fb4f8327 SHA1 7434df6d71d08be1838f006715454ba105eea6b1 SHA256 c536a2322d23676f2c59c1ccf080671e24d9a1950c9b334b1daf67231ebcc574

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 (file)
index 0000000..9820eea
--- /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 c927e8dfbe7bcd50854cfc4b0c30d4e09fb93fd5..be1a51c4438a982c292990f40591bf7b46006a30 100644 (file)
--- 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 \