From a2de45a8df0e872bb1292ece5265935f6ecd33b2 Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 5 Jan 2004 01:49:16 +0000 Subject: [PATCH] regen patches. set a base public, because gcc3 has more correct access restrictions. proper fix would probably be to make the array stuff friend (hard since those are template classe ?) or provide an explicit function to handle the cast. Well, simplest way to fix this... --- x11/gnomemm/patches/patch-src_Makefile_in | 8 ++++---- x11/gnomemm/patches/patch-src_gnome--_Makefile_in | 8 ++++---- x11/gnomemm/patches/patch-src_gnome--_app-helper_h | 12 ++++++++++++ 3 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 x11/gnomemm/patches/patch-src_gnome--_app-helper_h diff --git a/x11/gnomemm/patches/patch-src_Makefile_in b/x11/gnomemm/patches/patch-src_Makefile_in index 49e10d53bbd..93ea8088d4a 100644 --- a/x11/gnomemm/patches/patch-src_Makefile_in +++ b/x11/gnomemm/patches/patch-src_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2001/11/01 13:31:13 wilfried Exp $ ---- src/Makefile.in.orig Sun Aug 5 12:04:51 2001 -+++ src/Makefile.in Sat Oct 27 13:28:42 2001 -@@ -336,16 +336,16 @@ maintainer-clean-generic clean mostlycle +$OpenBSD: patch-src_Makefile_in,v 1.2 2004/01/05 01:49:16 espie Exp $ +--- src/Makefile.in.orig 2002-07-23 14:29:46.000000000 +0200 ++++ src/Makefile.in 2004-01-05 02:22:26.000000000 +0100 +@@ -340,16 +340,16 @@ maintainer-clean-generic clean mostlycle install-data-hook: diff --git a/x11/gnomemm/patches/patch-src_gnome--_Makefile_in b/x11/gnomemm/patches/patch-src_gnome--_Makefile_in index b589566bf89..4c4e1824123 100644 --- a/x11/gnomemm/patches/patch-src_gnome--_Makefile_in +++ b/x11/gnomemm/patches/patch-src_gnome--_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_gnome--_Makefile_in,v 1.1.1.1 2001/11/01 13:31:13 wilfried Exp $ ---- src/gnome--/Makefile.in.orig Sun Aug 5 12:04:53 2001 -+++ src/gnome--/Makefile.in Sat Oct 27 14:08:03 2001 -@@ -150,7 +150,7 @@ gnomemm_DATA = $(gnomemmh) imlib.h app-h +$OpenBSD: patch-src_gnome--_Makefile_in,v 1.2 2004/01/05 01:49:17 espie Exp $ +--- src/gnome--/Makefile.in.orig 2002-07-23 14:29:48.000000000 +0200 ++++ src/gnome--/Makefile.in 2004-01-05 02:22:26.000000000 +0100 +@@ -165,7 +165,7 @@ gnomemm_DATA = $(gnomemmh) imlib.h app-h # This builds the library libgnomemm_la_SOURCES = $(gnomemmc) app-helper.cc app-callback.cc point.cc affinetrans.cc construct_copies.cc diff --git a/x11/gnomemm/patches/patch-src_gnome--_app-helper_h b/x11/gnomemm/patches/patch-src_gnome--_app-helper_h new file mode 100644 index 00000000000..f07303a04b6 --- /dev/null +++ b/x11/gnomemm/patches/patch-src_gnome--_app-helper_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_gnome--_app-helper_h,v 1.1 2004/01/05 01:49:17 espie Exp $ +--- src/gnome--/app-helper.h.orig 2004-01-05 02:37:56.000000000 +0100 ++++ src/gnome--/app-helper.h 2004-01-05 02:39:22.000000000 +0100 +@@ -40,7 +40,7 @@ class Icon; + template + class Array; + +-class Info : protected GnomeUIInfo ++class Info : public GnomeUIInfo + { + /* Note when deriving this, you must not add any fields nor may you + add any virtuals */