diff options
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/libgnomecanvasmm/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-cpp/libgnomecanvasmm/Manifest | 6 | ||||
| -rw-r--r-- | dev-cpp/libgnomecanvasmm/files/2.0.1-gcc3.4-after-cvs.patch | 80 | ||||
| -rw-r--r-- | dev-cpp/libgnomecanvasmm/files/2.0.1-gcc3.4-to-cvs.patch | 42 | ||||
| -rw-r--r-- | dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.0.1.ebuild | 19 |
5 files changed, 145 insertions, 9 deletions
diff --git a/dev-cpp/libgnomecanvasmm/ChangeLog b/dev-cpp/libgnomecanvasmm/ChangeLog index 2da2b3c9e53e..0367c122b0dd 100644 --- a/dev-cpp/libgnomecanvasmm/ChangeLog +++ b/dev-cpp/libgnomecanvasmm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-cpp/libgnomecanvasmm # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgnomecanvasmm/ChangeLog,v 1.17 2004/07/13 23:15:29 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgnomecanvasmm/ChangeLog,v 1.18 2004/07/14 12:06:11 lv Exp $ + + 14 Jul 2004; Travis Tilley <lv@gentoo.org> + +files/2.0.1-gcc3.4-after-cvs.patch, +files/2.0.1-gcc3.4-to-cvs.patch, + libgnomecanvasmm-2.0.1.ebuild: + added gcc 3.4 fix from ed catmur 14 Jul 2004; foser <foser@gentoo.org> libgnomecanvasmm-2.0.{0,1}.ebuild : Fix *mm deps to actually work.. diff --git a/dev-cpp/libgnomecanvasmm/Manifest b/dev-cpp/libgnomecanvasmm/Manifest index 126cbec07af1..b49040325c8f 100644 --- a/dev-cpp/libgnomecanvasmm/Manifest +++ b/dev-cpp/libgnomecanvasmm/Manifest @@ -1,10 +1,12 @@ MD5 c384ffa8997894abdd702e0959c8b02a libgnomecanvasmm-2.0.0.ebuild 635 MD5 309dc0b64c8195ea7a821375d5366839 libgnomecanvasmm-2.6.1.ebuild 786 MD5 c253de960acada9ee31a50b0a42abdbd libgnomecanvasmm-2.6.0.ebuild 746 -MD5 7bab75b388c39f0985dd63ad7862bc2d libgnomecanvasmm-2.0.1.ebuild 732 -MD5 71c9995e5448a1e0e3177dbaa0ead984 ChangeLog 2688 +MD5 a4b831845c64d19d4293fcce357c485b libgnomecanvasmm-2.0.1.ebuild 884 +MD5 e73a7daaaa30d16947eb73ce6c64a41d ChangeLog 2872 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +MD5 4e3e036401274ab4b34a7ea14bece6be files/2.0.1-gcc3.4-to-cvs.patch 1584 MD5 374e73c2ee23f5d948e866b203faaf63 files/digest-libgnomecanvasmm-2.0.0 74 MD5 503f4b94ee2876c2eb123fb633749c34 files/digest-libgnomecanvasmm-2.0.1 74 MD5 431e51ec601c0bc99667968d1177375a files/digest-libgnomecanvasmm-2.6.0 75 MD5 9d1a7838537ec9856edb6298891255e0 files/digest-libgnomecanvasmm-2.6.1 75 +MD5 c411f9f7919161492f9a879b4011fe03 files/2.0.1-gcc3.4-after-cvs.patch 2679 diff --git a/dev-cpp/libgnomecanvasmm/files/2.0.1-gcc3.4-after-cvs.patch b/dev-cpp/libgnomecanvasmm/files/2.0.1-gcc3.4-after-cvs.patch new file mode 100644 index 000000000000..0bd9f26983cd --- /dev/null +++ b/dev-cpp/libgnomecanvasmm/files/2.0.1-gcc3.4-after-cvs.patch @@ -0,0 +1,80 @@ +Index: ChangeLog +=================================================================== +RCS file: /cvs/gnome/gnomemm/libgnomecanvasmm/ChangeLog,v +retrieving revision 1.55.2.2 +diff -u -p -r1.55.2.2 ChangeLog +--- ChangeLog 2 May 2004 10:06:31 -0000 1.55.2.2 ++++ ChangeLog 11 Jul 2004 18:05:21 -0000 +@@ -1,3 +1,7 @@ ++2004-07-11 Ed Catmur <ed@catmur.co.uk> ++ ++ * examples/canvas_events/canvas_events.cc: use named enum, for gcc 3.4 ++ + 2004-05-01 Takashi Takekawa <takekawa@users.sourceforge.jp> + + * libgnomecanvas/libgnomecanvas.[h,cc] (GNOMEMM_PROPERTY, +Index: examples/canvas_events/canvas_events.cc +=================================================================== +RCS file: /cvs/gnome/gnomemm/libgnomecanvasmm/examples/canvas_events/canvas_events.cc,v +retrieving revision 1.1 +diff -u -p -r1.1 canvas_events.cc +--- examples/canvas_events/canvas_events.cc 9 Dec 2002 09:41:19 -0000 1.1 ++++ examples/canvas_events/canvas_events.cc 11 Jul 2004 18:05:21 -0000 +@@ -14,7 +14,7 @@ + + guint32 etime = 0; + guint status = 0; +-enum ++enum someEnum + { + CE = 0, + CEA = 1, +@@ -42,12 +42,12 @@ public: + virtual ~CanvasExample(); + + protected: +- void on_event_explorer_notify(GdkEvent* e, guint caller); +- void on_button_event_stub_notify(GdkEventButton* e, guint caller); +- bool on_button_event_stub(GdkEventButton* e, guint caller); ++ void on_event_explorer_notify(GdkEvent* e, someEnum caller); ++ void on_button_event_stub_notify(GdkEventButton* e, someEnum caller); ++ bool on_button_event_stub(GdkEventButton* e, someEnum caller); + + private: +- bool on_event_explorer(GdkEvent* e, guint caller); ++ bool on_event_explorer(GdkEvent* e, someEnum caller); + Gnome::Canvas::Group m_canvasgroup; + }; + +@@ -89,7 +89,7 @@ CanvasExample::~CanvasExample() + } + + bool +-CanvasExample::on_event_explorer(GdkEvent* e, guint caller) ++CanvasExample::on_event_explorer(GdkEvent* e, someEnum caller) + { + GdkEventButton* b; + // Ignore all but button-press events: +@@ -133,19 +133,19 @@ CanvasExample::on_event_explorer(GdkEven + } + + void +-CanvasExample::on_event_explorer_notify(GdkEvent* e, guint caller) ++CanvasExample::on_event_explorer_notify(GdkEvent* e, someEnum caller) + { + std::cerr << "on_event_explorer_notify" << std::endl; + } + + bool +-CanvasExample::on_button_event_stub(GdkEventButton* b, guint caller) ++CanvasExample::on_button_event_stub(GdkEventButton* b, someEnum caller) + { + return on_event_explorer((GdkEvent *) b, caller); + } + + void +-CanvasExample::on_button_event_stub_notify(GdkEventButton* b, guint caller) ++CanvasExample::on_button_event_stub_notify(GdkEventButton* b, someEnum caller) + { + std::cerr << "on_button_event_stub_notify" << std::endl; + } diff --git a/dev-cpp/libgnomecanvasmm/files/2.0.1-gcc3.4-to-cvs.patch b/dev-cpp/libgnomecanvasmm/files/2.0.1-gcc3.4-to-cvs.patch new file mode 100644 index 000000000000..01ed843eb709 --- /dev/null +++ b/dev-cpp/libgnomecanvasmm/files/2.0.1-gcc3.4-to-cvs.patch @@ -0,0 +1,42 @@ +--- libgnomecanvas/src/line.hg 2004/07/09 08:38:56 1.1 ++++ libgnomecanvas/src/line.hg 2004/07/09 08:40:31 +@@ -115,7 +115,7 @@ namespace Glib + { + + template <> +-class Glib::Value<Gnome::Canvas::Points> : public Glib::Value_Boxed<Gnome::Canvas::Points> ++class Value<Gnome::Canvas::Points> : public Value_Boxed<Gnome::Canvas::Points> + { + public: + static GType value_type() G_GNUC_CONST; +--- libgnomecanvas/libgnomecanvasmm/line.h 2004/07/09 08:42:09 1.1 ++++ libgnomecanvas/libgnomecanvasmm/line.h 2004/07/09 08:42:34 +@@ -286,7 +286,7 @@ namespace Glib + { + + template <> +-class Glib::Value<Gnome::Canvas::Points> : public Glib::Value_Boxed<Gnome::Canvas::Points> ++class Value<Gnome::Canvas::Points> : public Value_Boxed<Gnome::Canvas::Points> + { + public: + static GType value_type() G_GNUC_CONST; +--- ChangeLog 11 Jul 2004 18:10:49 -0000 ++++ ChangeLog 2 May 2004 10:06:31 -0000 1.55.2.2 +@@ -1,3 +1,17 @@ ++2004-05-01 Takashi Takekawa <takekawa@users.sourceforge.jp> ++ ++ * libgnomecanvas/libgnomecanvas.[h,cc] (GNOMEMM_PROPERTY, ++ GNOMEMM_PROPERTY_IMPL): fixed doubled '>' when T is a template class, ++ for the Intel compiler. ++ * libgnomecanvas/src/line.hg: deleted unnecessary namespace ++ qualification, for the Intel compiler. ++ ++2003-12-21 Eric Bourque <ericb@computer.org> ++ * libgnomecanvasmm.spec.in: fixed dependency to gtkmm2 instead of gtkmm ++ ++2003-09-25 Eric Bourque <ericb@computer.org> ++ * libgnomecanvasmm.spec.in: updated for libgnomecanvasmm-2.0 ++ + 2.0.1: + + 2003-08-22 Murray Cumming <murrayc@usa.net> diff --git a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.0.1.ebuild b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.0.1.ebuild index 48bd53c0fd08..70332b95e6b1 100644 --- a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.0.1.ebuild +++ b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.0.1.ebuild @@ -1,27 +1,34 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.0.1.ebuild,v 1.9 2004/07/13 23:15:29 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.0.1.ebuild,v 1.10 2004/07/14 12:06:11 lv Exp $ -inherit gnome2 +inherit eutils gnome2 DESCRIPTION="C++ bindings for libgnomecanvasmm" SRC_URI="mirror://sourceforge/gtkmm/${P}.tar.gz" HOMEPAGE="http://gtkmm.sourceforge.net/" IUSE="" -SLOT="2" +SLOT="2.0" LICENSE="LGPL-2.1" -KEYWORDS="~x86 ppc ~sparc hppa amd64" +KEYWORDS="~x86 ~ppc ~sparc" RDEPEND=">=gnome-base/libgnomecanvas-2 - =dev-cpp/gtkmm-2.2*" + >=dev-cpp/gtkmm-2.2.5" DEPEND=">=dev-util/pkgconfig-0.12.0 ${RDEPEND}" DOCS="AUTHORS COPYING ChangeLog NEWS README TODO INSTALL" +src_unpack() { + unpack ${A} + cd ${S}; epatch ${FILESDIR}/2.0.1-gcc3.4-to-cvs.patch + cd ${S}; epatch ${FILESDIR}/2.0.1-gcc3.4-after-cvs.patch +} + src_compile() { use amd64 && aclocal -I scripts && automake && autoconf gnome2_src_compile } + |