Attachment 48621 Details for Bug 74398 – gtk-sharp-1.0.4.diff

[patch] gtk-sharp-1.0.4.diff

gtk-sharp-1.0.4.diff (text/plain), 12.33 KB, created by Tom McLaughlin on 2004-11-26 04:40:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom McLaughlin

Created: 2004-11-26 04:40:27 UTC

Size: 12.33 KB

patch

obsolete

>diff -Nur gtk-sharp.orig/Makefile gtk-sharp/Makefile
>--- gtk-sharp.orig/Makefile	Sun Nov  7 17:37:31 2004
>+++ gtk-sharp/Makefile	Sun Nov 14 02:47:11 2004
>@@ -2,14 +2,13 @@
> # Date created:         2003-01-01
> # Whom:                 Juli Mallett
> #
>-# $FreeBSD: ports/x11-toolkits/gtk-sharp/Makefile,v 1.26 2004/11/07 22:37:31 marcus Exp $
>+# $FreeBSD$
> #
> 
> PORTNAME=	gtk-sharp
>-PORTVERSION=	1.0
>-PORTREVISION=	3
>+PORTVERSION=	1.0.4
> CATEGORIES=	x11-toolkits
>-MASTER_SITES=	http://mono.ximian.com/archive/${PORTVERSION}/
>+MASTER_SITES=	http://www.go-mono.com/archive/${PORTVERSION}/
> 
> MAINTAINER=	coop9211@uidaho.edu
> COMMENT=	GTK+ and GNOME interfaces for the .NET runtime
>@@ -17,7 +16,8 @@
> BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
> RUN_DEPENDS=	${BUILD_DEPENDS}
> 
>-GNU_CONFIGURE=	yes
>+USE_X_PREFIX=	yes
>+USE_LIBTOOL_VER=15
> USE_REINPLACE=	yes
> INSTALLS_SHLIB=	yes
> USE_GMAKE=	yes
>diff -Nur gtk-sharp.orig/distinfo gtk-sharp/distinfo
>--- gtk-sharp.orig/distinfo	Wed Jul 14 18:44:23 2004
>+++ gtk-sharp/distinfo	Wed Nov  3 00:23:04 2004
>@@ -1,2 +1,2 @@
>-MD5 (gtk-sharp-1.0.tar.gz) = 6eab56e11c1e1245ec6af12312969399
>-SIZE (gtk-sharp-1.0.tar.gz) = 1424982
>+MD5 (gtk-sharp-1.0.4.tar.gz) = c105e94934a22f7734c5657948977078
>+SIZE (gtk-sharp-1.0.4.tar.gz) = 1774252
>diff -Nur gtk-sharp.orig/files/patch-art_art-sharp.dll.config.in gtk-sharp/files/patch-art_art-sharp.dll.config.in
>--- gtk-sharp.orig/files/patch-art_art-sharp.dll.config.in	Sat Aug 28 21:20:26 2004
>+++ gtk-sharp/files/patch-art_art-sharp.dll.config.in	Tue Oct 26 22:52:51 2004
>@@ -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@@LIB_SUFFIX@"/>
>++  <dllmap dll="art_lgpl" target="libart_lgpl_2@LIB_PREFIX@@LIB_SUFFIX@"/>
>  </configuration>
>diff -Nur gtk-sharp.orig/files/patch-configure gtk-sharp/files/patch-configure
>--- gtk-sharp.orig/files/patch-configure	Wed Jul 14 18:44:23 2004
>+++ gtk-sharp/files/patch-configure	Wed Nov  3 00:23:05 2004
>@@ -1,6 +1,6 @@
>---- configure.bak	Tue Jun 29 09:02:24 2004
>-+++ configure	Thu Jul  8 02:13:18 2004
>-@@ -8441,7 +8441,7 @@
>+--- configure.orig	Tue Nov  2 23:10:31 2004
>++++ configure	Tue Nov  2 23:13:55 2004
>+@@ -20740,7 +20740,7 @@
>  
>  
>  
>@@ -9,3 +9,12 @@
>  
>  # Extract the first word of "pkg-config", so it can be a program name with args.
>  set dummy pkg-config; ac_word=$2
>+@@ -20909,7 +20909,7 @@
>+ 
>+ 
>+ if test "x$has_mono" = "xtrue"; then
>+-GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(DESTDIR)$(libdir)'
>++GACUTIL_FLAGS='/package $(PACKAGE) /root $(DESTDIR)$(libdir) /gacdir $(DESTDIR)$(libdir)'
>+ GENERATED_SOURCES=generated/*.cs
>+ # Extract the first word of "mono", so it can be a program name with args.
>+ set dummy mono; ac_word=$2
>diff -Nur gtk-sharp.orig/files/patch-ltmain.sh gtk-sharp/files/patch-ltmain.sh
>--- gtk-sharp.orig/files/patch-ltmain.sh	Sun Jun 20 16:13:06 2004
>+++ gtk-sharp/files/patch-ltmain.sh	Wed Dec 31 19:00:00 1969
>@@ -1,41 +0,0 @@
>---- ltmain.sh.orig	Thu May 22 16:42:22 2003
>-+++ ltmain.sh	Tue May 27 12:12:52 2003
>-@@ -1072,7 +1072,7 @@
>- 	  esac
>- 	 elif test "X$arg" = "X-lc_r"; then
>- 	  case $host in
>--	 *-*-openbsd* | *-*-freebsd*)
>-+	 *-*-openbsd* | *-*-freebsd4*)
>- 	    # Do not include libc_r directly, use -pthread flag.
>- 	    continue
>- 	    ;;
>-@@ -1082,8 +1082,16 @@
>- 	continue
>- 	;;
>- 
>-+      -pthread)
>-+      compile_command="$compile_command -pthread"
>-+      finalize_command="$finalize_command -pthread"
>-+      compiler_flags="$compiler_flags -pthread"
>-+      continue
>-+      ;;
>-+
>-       -module)
>- 	module=yes
>-+	build_old_libs=no
>- 	continue
>- 	;;
>- 
>-@@ -4325,10 +4336,12 @@
>- 	fi
>- 
>- 	# Install the pseudo-library for information purposes.
>-+	if /usr/bin/false; then
>- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
>- 	instname="$dir/$name"i
>- 	$show "$install_prog $instname $destdir/$name"
>- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
>-+	fi
>- 
>- 	# Maybe install the static library, too.
>- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
>diff -Nur gtk-sharp.orig/files/patch-pango_pango-sharp.dll.config.in gtk-sharp/files/patch-pango_pango-sharp.dll.config.in
>--- gtk-sharp.orig/files/patch-pango_pango-sharp.dll.config.in	Sat Aug 28 21:20:26 2004
>+++ gtk-sharp/files/patch-pango_pango-sharp.dll.config.in	Tue Oct 26 22:52:51 2004
>@@ -1,7 +1,9 @@
>---- pango/pango-sharp.dll.config.in.orig	Wed Jul 14 22:25:54 2004
>-+++ pango/pango-sharp.dll.config.in	Wed Jul 14 22:26:14 2004
>-@@ -1,3 +1,3 @@
>+--- pango/pango-sharp.dll.config.in.orig	Fri Aug 20 17:04:23 2004
>++++ pango/pango-sharp.dll.config.in	Tue Oct 26 21:38:51 2004
>+@@ -1,4 +1,4 @@
>  <configuration>
>+-  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
> -  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
>++  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@@LIB_SUFFIX@"/>
> +  <dllmap dll="libpango-1.0-0.dll" target="libpango-1.0@LIB_PREFIX@@LIB_SUFFIX@"/>
>  </configuration>
>diff -Nur gtk-sharp.orig/files/patch-sample_rsvg_Makefile.in gtk-sharp/files/patch-sample_rsvg_Makefile.in
>--- gtk-sharp.orig/files/patch-sample_rsvg_Makefile.in	Wed Jul 14 18:44:23 2004
>+++ gtk-sharp/files/patch-sample_rsvg_Makefile.in	Wed Dec 31 19:00:00 1969
>@@ -1,11 +0,0 @@
>---- sample/rsvg/Makefile.in.bak	Tue Jun 29 09:03:12 2004
>-+++ sample/rsvg/Makefile.in	Thu Jul  8 16:27:33 2004
>-@@ -119,7 +119,7 @@
>- am__include = @am__include@
>- am__quote = @am__quote@
>- install_sh = @install_sh@
>--assemblies = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll ../../rsvg/rsvg-sharp.dll
>-+assemblies = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll ../../art/art-sharp.dll ../../rsvg/rsvg-sharp.dll
>- references = $(addprefix /r:, $(assemblies))
>- 
>- @ENABLE_RSVG_TRUE@TARGETS = svghelloworld.exe
>diff -Nur gtk-sharp.orig/pkg-plist gtk-sharp/pkg-plist
>--- gtk-sharp.orig/pkg-plist	Wed Jul 14 18:44:23 2004
>+++ gtk-sharp/pkg-plist	Sun Sep 19 22:03:46 2004
>@@ -1,48 +1,48 @@
>-@unexec gacutil /u glib-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
>+@unexec gacutil /u glib-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true
> lib/mono/gtk-sharp/glib-sharp.dll
>-@exec gacutil /i glib-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
>-@unexec gacutil /u pango-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
>+@exec gacutil /i glib-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null
>+@unexec gacutil /u pango-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true
> lib/mono/gtk-sharp/pango-sharp.dll
>-@exec gacutil /i pango-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
>-@unexec gacutil /u atk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
>+@exec gacutil /i pango-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null
>+@unexec gacutil /u atk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true
> lib/mono/gtk-sharp/atk-sharp.dll
>-@exec gacutil /i atk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
>-@unexec gacutil /u gdk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
>+@exec gacutil /i atk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null
>+@unexec gacutil /u gdk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true
> lib/mono/gtk-sharp/gdk-sharp.dll
>-@exec gacutil /i gdk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
>+@exec gacutil /i gdk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null
> @unexec gacutil /u gtk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
> lib/mono/gtk-sharp/gtk-sharp.dll
>-@exec gacutil /i gtk-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
>-@unexec gacutil /u glade-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
>+@exec gacutil /i gtk-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null
>+@unexec gacutil /u glade-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true
> lib/mono/gtk-sharp/glade-sharp.dll
>-@exec gacutil /i glade-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
>-@unexec gacutil /u art-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
>+@exec gacutil /i glade-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null
>+@unexec gacutil /u art-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true
> lib/mono/gtk-sharp/art-sharp.dll
>-@exec gacutil /i art-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
>-@unexec gacutil /u gnome-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
>+@exec gacutil /i art-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null
>+@unexec gacutil /u gnome-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true
> lib/mono/gtk-sharp/gnome-sharp.dll
>-@exec gacutil /i gnome-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
>-@unexec gacutil /u gda-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
>+@exec gacutil /i gnome-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null
>+@unexec gacutil /u gda-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true
> lib/mono/gtk-sharp/gda-sharp.dll
>-@exec gacutil /i gda-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
>-@unexec gacutil /u gnomedb-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
>+@exec gacutil /i gda-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null
>+@unexec gacutil /u gnomedb-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true
> lib/mono/gtk-sharp/gnomedb-sharp.dll
>-@exec gacutil /i gnomedb-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
>-@unexec gacutil /u gtkhtml-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
>+@exec gacutil /i gnomedb-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null
>+@unexec gacutil /u gtkhtml-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true
> lib/mono/gtk-sharp/gtkhtml-sharp.dll
>-@exec gacutil /i gtkhtml-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
>-@unexec gacutil /u gconf-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
>+@exec gacutil /i gtkhtml-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null
>+@unexec gacutil /u gconf-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true
> lib/mono/gtk-sharp/gconf-sharp.dll
>-@exec gacutil /i gconf-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
>-@unexec gacutil /u gconf-sharp-peditors.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
>+@exec gacutil /i gconf-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null
>+@unexec gacutil /u gconf-sharp-peditors.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true
> lib/mono/gtk-sharp/gconf-sharp-peditors.dll
>-@exec gacutil /i gconf-sharp-peditors.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
>-@unexec gacutil /u rsvg-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
>+@exec gacutil /i gconf-sharp-peditors.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null
>+@unexec gacutil /u rsvg-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true
> lib/mono/gtk-sharp/rsvg-sharp.dll
>-@exec gacutil /i rsvg-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
>-@unexec gacutil /u vte-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null || /usr/bin/true
>+@exec gacutil /i rsvg-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null
>+@unexec gacutil /u vte-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null || /usr/bin/true
> lib/mono/gtk-sharp/vte-sharp.dll
>-@exec gacutil /i vte-sharp.dll /f /package gtk-sharp /gacdir %D/lib > /dev/null
>+@exec gacutil /i vte-sharp.dll /f /package gtk-sharp /root %D/lib /gacdir %D/lib > /dev/null
> bin/gapi-codegen
> bin/gapi-fixup
> bin/gapi-fixup.exe

Actions: View | Diff

Attachments on bug 74398: 48621