From owner-freebsd-gnome@FreeBSD.ORG  Thu Aug 12 03:49:24 2004
Return-Path: <owner-freebsd-gnome@FreeBSD.ORG>
Delivered-To: freebsd-gnome@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2B57416A4CE
	for <gnome@freebsd.org>; Thu, 12 Aug 2004 03:49:24 +0000 (GMT)
Received: from straycat.dhs.org (h0050da134090.ne.client2.attbi.com
	[24.60.174.16])	by mx1.FreeBSD.org (Postfix) with SMTP id 28C6443D45
	for <gnome@freebsd.org>; Thu, 12 Aug 2004 03:49:23 +0000 (GMT)
	(envelope-from tmclaugh@sdf.lonestar.org)
Received: (qmail 19918 invoked from network); 12 Aug 2004 03:49:22 -0000
Received: from compass.straycat.dhs.org (HELO ?192.168.1.32?) (192.168.1.32)
  by alexandria.straycat.dhs.org with SMTP; 12 Aug 2004 03:49:22 -0000
From: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
To: FreeBSD Gnome <gnome@freebsd.org>, apeiron@comcast.net
Content-Type: multipart/mixed; boundary="=-Y/K23JQOrHuU26qngOjM"
Date: Thu, 12 Aug 2004 03:49:38 +0000
Message-Id: <1092282578.42143.65.camel@compass.straycat.dhs.org>
Mime-Version: 1.0
X-Mailer: Evolution 1.5.92.1FreeBSD GNOME Team Port 
Subject: Gnome 2.7: Mono apps do not work, gtk-sharp patch attached
X-BeenThere: freebsd-gnome@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: GNOME for FreeBSD -- porting and maintaining
	<freebsd-gnome.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gnome>
List-Post: <mailto:freebsd-gnome@freebsd.org>
List-Help: <mailto:freebsd-gnome-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Aug 2004 03:49:24 -0000


--=-Y/K23JQOrHuU26qngOjM
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hi all, currently Muine will not run on Gnome 2.7 because the gtk-sharp
port references the old Gnome and GTK library versions in the dll
mapping files.  John Cooper had already patched these files to
correspond with the latest library versions in the standard ports tree.
The attached patch will fix gtk-sharp on Gnome 2.7.  I've been able to
run Muine with no problems so far.  Gfax, the other mono port, does not
build for me because a dependency is broken on -current so I have not
been able to test that.

I believe this patch will not break gtk-sharp and the mono ports on
Gnome 2.6 but I have not been able to test that either.  Would someone
please test this for me?  If this patch works fine with Gnome 2.6 and
2.7 can this be committed while John is gone?  The patch eliminates the
need to worry about updating gtk-sharp any time there is a minor library
version change.  If not, I'll just keep tracking gtk-sharp on 2.7.
Thanks.

Tom

--=-Y/K23JQOrHuU26qngOjM
Content-Description: 
Content-Disposition: attachment; filename=gtk-sharp_dll-mapping.diff
Content-Type: text/x-patch; charset=us-ascii
Content-Transfer-Encoding: 7bit

Index: gtk-sharp/files/patch-art_art-sharp.dll.config.in
===================================================================
RCS file: /ncvs/ports/x11-toolkits/gtk-sharp/files/patch-art_art-sharp.dll.config.in,v
retrieving revision 1.1
diff -u -r1.1 patch-art_art-sharp.dll.config.in
--- gtk-sharp/files/patch-art_art-sharp.dll.config.in	15 Jul 2004 22:44:42 -0000	1.1
+++ gtk-sharp/files/patch-art_art-sharp.dll.config.in	12 Aug 2004 03:36:46 -0000
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="art_lgpl" target="libart_lgpl_2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
-+  <dllmap dll="art_lgpl" target="libart_lgpl@LIB_PREFIX@.5@LIB_SUFFIX@"/>
++  <dllmap dll="art_lgpl" target="libart_lgpl@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
Index: gtk-sharp/files/patch-atk_atk-sharp.dll.config.in
===================================================================
RCS file: /ncvs/ports/x11-toolkits/gtk-sharp/files/patch-atk_atk-sharp.dll.config.in,v
retrieving revision 1.1
diff -u -r1.1 patch-atk_atk-sharp.dll.config.in
--- gtk-sharp/files/patch-atk_atk-sharp.dll.config.in	15 Jul 2004 22:44:42 -0000	1.1
+++ gtk-sharp/files/patch-atk_atk-sharp.dll.config.in	12 Aug 2004 03:36:46 -0000
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.600@LIB_SUFFIX@"/>
++  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
Index: gtk-sharp/files/patch-gconf_GConf_gconf-sharp.dll.config.in
===================================================================
RCS file: /ncvs/ports/x11-toolkits/gtk-sharp/files/patch-gconf_GConf_gconf-sharp.dll.config.in,v
retrieving revision 1.1
diff -u -r1.1 patch-gconf_GConf_gconf-sharp.dll.config.in
--- gtk-sharp/files/patch-gconf_GConf_gconf-sharp.dll.config.in	15 Jul 2004 22:44:42 -0000	1.1
+++ gtk-sharp/files/patch-gconf_GConf_gconf-sharp.dll.config.in	12 Aug 2004 03:36:46 -0000
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@.4@LIB_SUFFIX@"/>
-+  <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@.5@LIB_SUFFIX@"/>
++  <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
Index: gtk-sharp/files/patch-gda_gda-sharp.dll.config.in
===================================================================
RCS file: /ncvs/ports/x11-toolkits/gtk-sharp/files/patch-gda_gda-sharp.dll.config.in,v
retrieving revision 1.1
diff -u -r1.1 patch-gda_gda-sharp.dll.config.in
--- gtk-sharp/files/patch-gda_gda-sharp.dll.config.in	15 Jul 2004 22:44:42 -0000	1.1
+++ gtk-sharp/files/patch-gda_gda-sharp.dll.config.in	12 Aug 2004 03:36:46 -0000
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
-+  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
++  <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
Index: gtk-sharp/files/patch-gdk_gdk-sharp.dll.config.in
===================================================================
RCS file: /ncvs/ports/x11-toolkits/gtk-sharp/files/patch-gdk_gdk-sharp.dll.config.in,v
retrieving revision 1.1
diff -u -r1.1 patch-gdk_gdk-sharp.dll.config.in
--- gtk-sharp/files/patch-gdk_gdk-sharp.dll.config.in	15 Jul 2004 22:44:42 -0000	1.1
+++ gtk-sharp/files/patch-gdk_gdk-sharp.dll.config.in	12 Aug 2004 03:36:46 -0000
@@ -6,8 +6,8 @@
 -  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
Index: gtk-sharp/files/patch-glib_glib-sharp.dll.config.in
===================================================================
RCS file: /ncvs/ports/x11-toolkits/gtk-sharp/files/patch-glib_glib-sharp.dll.config.in,v
retrieving revision 1.1
diff -u -r1.1 patch-glib_glib-sharp.dll.config.in
--- gtk-sharp/files/patch-glib_glib-sharp.dll.config.in	15 Jul 2004 22:44:42 -0000	1.1
+++ gtk-sharp/files/patch-glib_glib-sharp.dll.config.in	12 Aug 2004 03:36:46 -0000
@@ -5,7 +5,7 @@
 -  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
Index: gtk-sharp/files/patch-gnome_gnome-sharp.dll.config.in
===================================================================
RCS file: /ncvs/ports/x11-toolkits/gtk-sharp/files/patch-gnome_gnome-sharp.dll.config.in,v
retrieving revision 1.1
diff -u -r1.1 patch-gnome_gnome-sharp.dll.config.in
--- gtk-sharp/files/patch-gnome_gnome-sharp.dll.config.in	15 Jul 2004 22:44:42 -0000	1.1
+++ gtk-sharp/files/patch-gnome_gnome-sharp.dll.config.in	12 Aug 2004 03:36:46 -0000
@@ -11,13 +11,13 @@
 -  <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="gnome-2" target="libgnome-2@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomecanvas-2" target="libgnomecanvas-2@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
-+  <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@.600@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnome-2" target="libgnome-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomecanvas-2" target="libgnomecanvas-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomeprint-2-2" target="libgnomeprint-2-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomeprintui-2-2" target="libgnomeprintui-2-2@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="gnomeui-2" target="libgnomeui-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
Index: gtk-sharp/files/patch-gtk_gtk-sharp.dll.config.in
===================================================================
RCS file: /ncvs/ports/x11-toolkits/gtk-sharp/files/patch-gtk_gtk-sharp.dll.config.in,v
retrieving revision 1.1
diff -u -r1.1 patch-gtk_gtk-sharp.dll.config.in
--- gtk-sharp/files/patch-gtk_gtk-sharp.dll.config.in	15 Jul 2004 22:44:42 -0000	1.1
+++ gtk-sharp/files/patch-gtk_gtk-sharp.dll.config.in	12 Aug 2004 03:36:46 -0000
@@ -6,8 +6,8 @@
 -  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
-+  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.400@LIB_SUFFIX@"/>
++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
Index: gtk-sharp/files/patch-pango_pango-sharp.dll.config.in
===================================================================
RCS file: /ncvs/ports/x11-toolkits/gtk-sharp/files/patch-pango_pango-sharp.dll.config.in,v
retrieving revision 1.1
diff -u -r1.1 patch-pango_pango-sharp.dll.config.in
--- gtk-sharp/files/patch-pango_pango-sharp.dll.config.in	15 Jul 2004 22:44:42 -0000	1.1
+++ gtk-sharp/files/patch-pango_pango-sharp.dll.config.in	12 Aug 2004 03:36:46 -0000
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-+  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.399@LIB_SUFFIX@"/>
++  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
Index: gtk-sharp/files/patch-rsvg_rsvg-sharp.dll.config.in
===================================================================
RCS file: /ncvs/ports/x11-toolkits/gtk-sharp/files/patch-rsvg_rsvg-sharp.dll.config.in,v
retrieving revision 1.1
diff -u -r1.1 patch-rsvg_rsvg-sharp.dll.config.in
--- gtk-sharp/files/patch-rsvg_rsvg-sharp.dll.config.in	15 Jul 2004 22:44:42 -0000	1.1
+++ gtk-sharp/files/patch-rsvg_rsvg-sharp.dll.config.in	12 Aug 2004 03:36:46 -0000
@@ -3,5 +3,5 @@
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@.2@LIB_SUFFIX@"/>
-+  <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@.8@LIB_SUFFIX@"/>
++  <dllmap dll="rsvg-2" target="librsvg-2@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>
Index: gtk-sharp/files/patch-vte_vte-sharp.dll.config.in
===================================================================
RCS file: /ncvs/ports/x11-toolkits/gtk-sharp/files/patch-vte_vte-sharp.dll.config.in,v
retrieving revision 1.1
diff -u -r1.1 patch-vte_vte-sharp.dll.config.in
--- gtk-sharp/files/patch-vte_vte-sharp.dll.config.in	15 Jul 2004 22:44:42 -0000	1.1
+++ gtk-sharp/files/patch-vte_vte-sharp.dll.config.in	12 Aug 2004 03:36:46 -0000
@@ -4,6 +4,6 @@
  <configuration>
 -  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
 -  <dllmap dll="vte" target="libvte@LIB_PREFIX@.4@LIB_SUFFIX@"/>
-+  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.600@LIB_SUFFIX@"/>
-+  <dllmap dll="vte" target="libvte@LIB_PREFIX@.8@LIB_SUFFIX@"/>
++  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
++  <dllmap dll="vte" target="libvte@LIB_PREFIX@@LIB_SUFFIX@"/>
  </configuration>

--=-Y/K23JQOrHuU26qngOjM--