tinkering with gnomemm-1.2.3.ebuild

diff --git a/gnome-extra/gnomemm/ChangeLog b/gnome-extra/gnomemm/ChangeLog
index c28e1558cadaf485438b2c0881a96b903f449284..ff3d8041cfe65cc18513be5b8e3cf598efbedeec 100644 (file)
--- a/gnome-extra/gnomemm/ChangeLog
+++ b/gnome-extra/gnomemm/ChangeLog
@@ -1,8 +1,12 @@
 # ChangeLog for gnome-extra/gnomemm
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnomemm/ChangeLog,v 1.6 2002/08/15 01:43:41 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnomemm/ChangeLog,v 1.7 2002/10/07 20:57:01 foser Exp $
 
 *gnomemm-1.2.3 (31 Jul 2002)
+
+  07 Oct 2002; foser <foser@gentoo.org> gnomemm-1.2.3.ebuild :
+  Fix for gcc 2.95
+
   15 Aug 2002; Spider <spider@gentoo.org> gnomemm-1.2.3.ebuild gnomemm-1.2.2-r3.ebuild :
   Fix deps some for gtkmm 
 

diff --git a/gnome-extra/gnomemm/files/gnomemm-1.2.3-gentoo.patch b/gnome-extra/gnomemm/files/gnomemm-1.2.3-gentoo.patch
new file mode 100644 (file)
index 0000000..cec6185
--- /dev/null
+++ b/gnome-extra/gnomemm/files/gnomemm-1.2.3-gentoo.patch
@@ -0,0 +1,16 @@
+--- procbar.gen_h~     2002-10-07 21:57:23.000000000 +0200
++++ procbar.gen_h      2002-10-07 21:57:53.000000000 +0200
+@@ -82,12 +82,11 @@
+ 
+   //The callback signature is wrong but we shouldn't change it in a stable API,
+   //though I think that gnome-libs did.
+-  typedef gint (* type_correctcallback)(gpointer);
+   gnome_proc_bar_construct(gtkobj(),
+                          GTK_WIDGET(const_cast<GtkLabel*>(label.gtkobj())),
+                          colors.size(),
+                          colors_,
+-                         (type_correctcallback) cb);
++                         cb);
+ }
+ 
+ ProcBar::~ProcBar()

diff --git a/gnome-extra/gnomemm/gnomemm-1.2.3.ebuild b/gnome-extra/gnomemm/gnomemm-1.2.3.ebuild
index 44f1c3d96bc7a5b269aaba9736a7136c1b8dd19e..cb980e53561e4f84762754586e94c1d0f61c3867 100644 (file)
--- a/gnome-extra/gnomemm/gnomemm-1.2.3.ebuild
+++ b/gnome-extra/gnomemm/gnomemm-1.2.3.ebuild
@@ -1,7 +1,8 @@
 # Copyright 2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnomemm/gnomemm-1.2.3.ebuild,v 1.4 2002/10/04 05:38:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnomemm/gnomemm-1.2.3.ebuild,v 1.5 2002/10/07 20:57:01 foser Exp $
 
+inherit gcc
 
 S=${WORKDIR}/${P}
 DESCRIPTION="C++ binding for the GNOME libraries"
@@ -17,17 +18,15 @@ RDEPEND="=x11-libs/gtkmm-1.2*
 
 DEPEND="${RDEPEND}"
 
-# The following patches seems to be no longer actual
-# stroke@gentoo.org
-# src_unpack() {
-#      
-#      unpack ${A}
-#
-#      cd ${S}/src
-#      patch < ${FILESDIR}/${P}-gentoo.patch
-#      cd ${S}
-#      patch -p1 < ${FILESDIR}/${P}-gentoo.patch2
-# }
+src_unpack() {
+       unpack ${A}
+
+       if [ "$(gcc-major-version)" == 2 ]
+       then
+               cd ${S}/src
+               patch < ${FILESDIR}/${P}-gentoo.patch
+       fi
+}
 
 src_compile() {