From 2110dad6d1d028f873788fb2bed50af288a7c834 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Thu, 8 Jan 2009 20:05:24 +0000
Subject: [PATCH] 2009-01-08  Mike Kestner  <mkestner@novell.com>

	* cairo/Makefile.am: use mono.snk to sign the Mono.Cairo assembly
	so that it's compatible with mono built versions.  Initial patch
	from Christian Hoff with a few tweaks.

svn path=/trunk/gtk-sharp/; revision=122821
---
 ChangeLog             |   6 ++++++
 Makefile.am           |   1 +
 cairo/AssemblyInfo.cs |   6 ++++++
 cairo/Makefile.am     |  19 ++++++++-----------
 mono.snk              | Bin 0 -> 596 bytes
 5 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 cairo/AssemblyInfo.cs
 create mode 100644 mono.snk

diff --git a/ChangeLog b/ChangeLog
index 57365a51f..c20adc8a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-08  Mike Kestner  <mkestner@novell.com>
+
+	* cairo/Makefile.am: use mono.snk to sign the Mono.Cairo assembly
+	so that it's compatible with mono built versions.  Initial patch
+	from Christian Hoff with a few tweaks.
+
 2009-01-08  Mike Kestner  <mkestner@novell.com>
 
 	* generator/InterfaceGen.cs: generate Adapters for consume_only ifaces
diff --git a/Makefile.am b/Makefile.am
index 31e4f2423..478629aa1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 SUBDIRS = sources generator parser glib gio cairo pango atk gdk gtk glade gtkdotnet sample doc
 
 EXTRA_DIST = 			\
+	mono.snk		\
 	gtk-sharp.snk		\
 	gapi-cdecl-insert	\
 	makefile.win32		\
diff --git a/cairo/AssemblyInfo.cs b/cairo/AssemblyInfo.cs
new file mode 100644
index 000000000..f31b62e7e
--- /dev/null
+++ b/cairo/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly:AssemblyVersion("2.0.0.0")]
+[assembly:AssemblyDelaySign(false)]
+[assembly:AssemblyKeyFile("mono.snk")]
diff --git a/cairo/Makefile.am b/cairo/Makefile.am
index 6c9e63780..c73e03082 100644
--- a/cairo/Makefile.am
+++ b/cairo/Makefile.am
@@ -11,10 +11,11 @@ endif
 
 noinst_DATA = $(TARGET)
 
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(POLICY_ASSEMBLY) gtk-sharp.snk AssemblyInfo.cs
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(POLICY_ASSEMBLY) mono.snk
 
 sources = \
 	Antialias.cs \
+	AssemblyInfo.cs \
 	Cairo.cs \
 	Content.cs \
 	Context.cs \
@@ -63,22 +64,18 @@ sources = \
 	XlibSurface.cs \
 	#
 
-build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
+build_sources = $(addprefix $(srcdir)/, $(sources))
 
-gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
-	cp $(top_srcdir)/gtk-sharp.snk .
+mono.snk: $(top_srcdir)/mono.snk
+	cp $(top_srcdir)/mono.snk .
 
-AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs
-	@echo "sed -e "s/@API_VERSION@/2.0.0.0/" -e "s/\[assembly:GLib.IgnoreClassInitializers\]//" $(top_builddir)/AssemblyInfo.cs > $@"
-	@sed -e "s/@API_VERSION@/2.0.0.0/" -e "s/\[assembly:GLib.IgnoreClassInitializers\]//" $(top_builddir)/AssemblyInfo.cs > $@
-
-$(ASSEMBLY): $(build_sources) gtk-sharp.snk AssemblyInfo.cs
+$(ASSEMBLY): $(build_sources) mono.snk
 	@rm -f $(ASSEMBLY).mdb
 	$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(references) $(build_sources)
 
-$(POLICY_ASSEMBLY): $(srcdir)/$(POLICY_CONFIG) gtk-sharp.snk
+$(POLICY_ASSEMBLY): $(srcdir)/$(POLICY_CONFIG) mono.snk
 	echo "Creating policy.1.0.$(ASSEMBLY)";
-	$(AL) -link:$(POLICY_CONFIG) -out:$@ -keyfile:gtk-sharp.snk;
+	$(AL) -link:$(POLICY_CONFIG) -out:$@ -keyfile:mono.snk;
 
 install-data-local:
 	@if test -n '$(TARGET)'; then							\
diff --git a/mono.snk b/mono.snk
new file mode 100644
index 0000000000000000000000000000000000000000..380116c18fc37e37caee38d5c7f00553381fbf9e
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097b6`6O^&^nH5>Uu78=+UptljwyRbd@W#
zfT1jrG)GMY1|&zrehz5BfKzYJJU_lK`N?_CnS^!a2I$U$-CGYe4Z#kRzb@|2hf5@P
z3{ZjF>U2l_+WIGZBHl;V|LR1Rbfo$G&xFxXX$X^mC{4Z7Uq;RU5~00#<nI7w&=%iK
z#@oEjKVXTH8;PH^SDFl|Y9eD)IR(n4R%kzyhJz#a0fcZDOvqLWa$u+fGr^>T8$V?4
zm0(Z@pa!7K?(Fv6`Sy%zIG6>&?npz0UV%?bgx!7tH#C%jM34vHZxVr2-GyqR){Wb_
z{XsWBT$ZExT8-J6M|x?bD~-_)p-JamyVJi9497FdEQ65@I<~MMyg{tluUqokqOaxj
zlhqj9JtQiyyKdy8TBK}e2S{tm<$7FGKad_^`^?rYM0;cj^<r(}<_k*`ti}$qJaNhR
z0U7GYLsxVkUftkC>51yOyC%wV#(=?x_-cVmn-um!xGBCj903_NLpqj#fY94K!%&o7
zw|E3wgmzMa{N+PDQQ4BhoE7KBA!Hxyi2D5IJ4civ7g7A4#<j*^F!BY52{@vHe_Ez0
z4QJgno?O2X3FjUM-b|M|ALpX@s)prV&D_XcJI@p;?+YrzK2Ann`hVHgmoE06pKUg9
zs+TXb2@kP}O^oqKiyYRmFSkZtN%x@pwJv1K#4lcCB}Oawii)KYvG|NVQK8VHS>@Va
i>Ut2fuAI+%0QCxKtaJZ4tp|R<30%KGIZqYwf2q$<xgwAN

literal 0
HcmV?d00001