diff options
| author | mezz <mezz@FreeBSD.org> | 2005-03-15 10:19:18 +0800 |
|---|---|---|
| committer | mezz <mezz@FreeBSD.org> | 2005-03-15 10:19:18 +0800 |
| commit | d220d1739ba151843cd2ae395a2a60675e2cbd04 (patch) | |
| tree | 65e2c400bc3ceec9b39246b226304feea4b7fb4e | |
| parent | 186bb5a1f9db59a953e54a3a412c3721c12853e9 (diff) | |
| download | freebsd-ports-gnome-d220d1739ba151843cd2ae395a2a60675e2cbd04.tar.gz freebsd-ports-gnome-d220d1739ba151843cd2ae395a2a60675e2cbd04.tar.zst freebsd-ports-gnome-d220d1739ba151843cd2ae395a2a60675e2cbd04.zip | |
Fix the build with GTK+ 2.6, took from Gentoo.
http://gentoo.org/cgi-bin/viewcvs.cgi/net-p2p/gtk-gnutella/files/0.95-gtk2.6.patch
Reported by: Clint Olsen <clint@0lsen.net>
Fernan Aguero <fernan@iib.unsam.edu.ar>
Tested by: Clint Olsen <clint@0lsen.net>
Fernan Aguero <fernan@iib.unsam.edu.ar>
| -rw-r--r-- | net-p2p/gtk-gnutella/files/patch-0.95-gtk2.6 | 40 | ||||
| -rw-r--r-- | net/gtk-gnutella/files/patch-0.95-gtk2.6 | 40 |
2 files changed, 80 insertions, 0 deletions
diff --git a/net-p2p/gtk-gnutella/files/patch-0.95-gtk2.6 b/net-p2p/gtk-gnutella/files/patch-0.95-gtk2.6 new file mode 100644 index 000000000000..2f3842bcc88c --- /dev/null +++ b/net-p2p/gtk-gnutella/files/patch-0.95-gtk2.6 @@ -0,0 +1,40 @@ +diff -ur gtk-gnutella-0.95-old/src/ui/gtk/gtk2/pbarcellrenderer.c gtk-gnutella-0.95/src/ui/gtk/gtk2/pbarcellrenderer.c +--- src/ui/gtk/gtk2/pbarcellrenderer.c 2005-01-25 01:24:15.291080696 -0500 ++++ src/ui/gtk/gtk2/pbarcellrenderer.c 2005-01-25 01:37:07.614669664 -0500 +@@ -51,6 +51,9 @@ + * Boston, MA 02111-1307, USA. + */ + ++/* If we're using GTK 2.6, this is obsolete - Tim Hentenaar */ ++#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 6 ++ + #include "gtk/gui.h" + + RCSID("$Id: 0.95-gtk2.6.patch,v 1.1 2005/01/30 20:46:05 squinky86 Exp $"); +@@ -426,5 +429,5 @@ + G_FREE_NULL(cellprogress->priv); + (*G_OBJECT_CLASS(parent_class)->finalize)(object); + } +- ++#endif /* GTK < 2.6 */ + /* vi: set ts=4: */ +diff -ur gtk-gnutella-0.95-old/src/ui/gtk/gtk2/pbarcellrenderer.h gtk-gnutella-0.95/src/ui/gtk/gtk2/pbarcellrenderer.h +--- src/ui/gtk/gtk2/pbarcellrenderer.h 2005-01-25 01:24:15.291080696 -0500 ++++ src/ui/gtk/gtk2/pbarcellrenderer.h 2005-01-25 01:35:55.844580376 -0500 +@@ -49,6 +49,9 @@ + #ifndef _gtk2_pbarcellrenderer_h_ + #define _gtk2_pbarcellrenderer_h_ + ++/* If we're using GTK 2.6, this is obsolete - Tim Hentenaar */ ++#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 6 ++ + #include <gtk/gtkcellrenderer.h> + #include "gtk/gui.h" + +@@ -76,5 +79,5 @@ + GtkCellRenderer* gtk_cell_renderer_progress_new(void); + + G_END_DECLS +- ++#endif /* GTK < 2.6 */ + #endif /* _gtk2_pbarcellrenderer_h_ */ diff --git a/net/gtk-gnutella/files/patch-0.95-gtk2.6 b/net/gtk-gnutella/files/patch-0.95-gtk2.6 new file mode 100644 index 000000000000..2f3842bcc88c --- /dev/null +++ b/net/gtk-gnutella/files/patch-0.95-gtk2.6 @@ -0,0 +1,40 @@ +diff -ur gtk-gnutella-0.95-old/src/ui/gtk/gtk2/pbarcellrenderer.c gtk-gnutella-0.95/src/ui/gtk/gtk2/pbarcellrenderer.c +--- src/ui/gtk/gtk2/pbarcellrenderer.c 2005-01-25 01:24:15.291080696 -0500 ++++ src/ui/gtk/gtk2/pbarcellrenderer.c 2005-01-25 01:37:07.614669664 -0500 +@@ -51,6 +51,9 @@ + * Boston, MA 02111-1307, USA. + */ + ++/* If we're using GTK 2.6, this is obsolete - Tim Hentenaar */ ++#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 6 ++ + #include "gtk/gui.h" + + RCSID("$Id: 0.95-gtk2.6.patch,v 1.1 2005/01/30 20:46:05 squinky86 Exp $"); +@@ -426,5 +429,5 @@ + G_FREE_NULL(cellprogress->priv); + (*G_OBJECT_CLASS(parent_class)->finalize)(object); + } +- ++#endif /* GTK < 2.6 */ + /* vi: set ts=4: */ +diff -ur gtk-gnutella-0.95-old/src/ui/gtk/gtk2/pbarcellrenderer.h gtk-gnutella-0.95/src/ui/gtk/gtk2/pbarcellrenderer.h +--- src/ui/gtk/gtk2/pbarcellrenderer.h 2005-01-25 01:24:15.291080696 -0500 ++++ src/ui/gtk/gtk2/pbarcellrenderer.h 2005-01-25 01:35:55.844580376 -0500 +@@ -49,6 +49,9 @@ + #ifndef _gtk2_pbarcellrenderer_h_ + #define _gtk2_pbarcellrenderer_h_ + ++/* If we're using GTK 2.6, this is obsolete - Tim Hentenaar */ ++#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 6 ++ + #include <gtk/gtkcellrenderer.h> + #include "gtk/gui.h" + +@@ -76,5 +79,5 @@ + GtkCellRenderer* gtk_cell_renderer_progress_new(void); + + G_END_DECLS +- ++#endif /* GTK < 2.6 */ + #endif /* _gtk2_pbarcellrenderer_h_ */ |