Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

2007-12-12 Mike Kestner <mkestner@novell.com>

	* Makefile.am: remove boostrap-fu.
	* Makefile.include: add policy and GAC-fu.
	* autogen.sh: moved from bootstrap-generic.
	* bootstrap*: switching to autogen.sh setup.
	* configure.in: rename from in.in and remove substs.
	* gapi-cdecl-insert: copied from gnome-sharp.
	* policy.config.in: ditto.
	* gnomedesktop/*: switching to gac install.
	* gtkhtml/*: switching to gac install.
	* sources/Makefile.am: add librsvg
	* sources/sources-2.20.xml: add rsvg. not checking in parse yet.

svn path=/trunk/gnome-desktop-sharp/; revision=91197
  • Loading branch information...
commit 1c6240a20fe125f8b7c33e306554bcd5c11afb23 1 parent c0cda16
Mike Kestner authored December 13, 2007
14  ChangeLog
... ...
@@ -1,3 +1,17 @@
  1
+2007-12-12  Mike Kestner  <mkestner@novell.com>
  2
+
  3
+	* Makefile.am: remove boostrap-fu.
  4
+	* Makefile.include: add policy and GAC-fu.
  5
+	* autogen.sh: moved from bootstrap-generic.
  6
+	* bootstrap*: switching to autogen.sh setup.
  7
+	* configure.in: rename from in.in and remove substs.
  8
+	* gapi-cdecl-insert: copied from gnome-sharp.
  9
+	* policy.config.in: ditto.
  10
+	* gnomedesktop/*: switching to gac install.
  11
+	* gtkhtml/*: switching to gac install.
  12
+	* sources/Makefile.am: add librsvg
  13
+	* sources/sources-2.20.xml: add rsvg. not checking in parse yet.
  14
+
1 15
 2007-12-09  Mike Kestner  <mkestner@novell.com>
2 16
 
3 17
 	* sources/Makefile.am: add gtkhtml-search.* to parse.
3  Makefile.am
@@ -3,10 +3,9 @@ SUBDIRS = sources gnomedesktop gtkhtml #sample
3 3
 EXTRA_DIST = 			\
4 4
 	gtk-sharp.snk		\
5 5
 	gapi-cdecl-insert	\
  6
+	policy.config.in	\
6 7
 	AssemblyInfo.cs.in	\
7 8
 	ChangeLog		\
8 9
 	HACKING			\
9 10
 	README
10 11
 
11  
-configure.in: bootstrap.status configure.in.in 
12  
-	$(SHELL) $<
72  Makefile.include
... ...
@@ -1,29 +1,25 @@
1 1
 SNK = gtk-sharp.snk
2  
-API = $(pkg)-api.xml
3  
-RAW_API = $(pkg)-api.raw
  2
+API = $(pkg:=-api.xml)
  3
+RAW_API = $(pkg:=-api.raw)
  4
+ASSEMBLY_NAME = $(pkg:=-sharp)
  5
+ASSEMBLY = $(ASSEMBLY_NAME:=.dll)
  6
+PACKAGE_VERSION = $(ASSEMBLY_NAME:=-$(pkgversion))
4 7
 
5  
-ASSEMBLY_NAME = $(pkg)-sharp
6  
-ASSEMBLY = $(ASSEMBLY_NAME).dll
7  
-
8  
-assemblydir = $(prefix)/lib/$(ASSEMBLY_NAME)/$(pkgversion)
9  
-TARGET = $(pkg:=-sharp.dll) $(pkg:=-sharp.dll.config) $(POLICY_ASSEMBLIES)
10  
-assembly_DATA = $(TARGET)
11  
-TARGET_API = $(pkg:=-api.xml)
  8
+TARGET = $(ASSEMBLY) $(ASSEMBLY:=.config) $(POLICY_ASSEMBLIES)
  9
+noinst_DATA = $(TARGET)
12 10
 gapidir = $(datadir)/$(ASSEMBLY_NAME)/$(pkgversion)
13  
-gapi_DATA = $(TARGET_API)
14  
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) glue/generated.c $(SNK) AssemblyInfo.cs
15  
-DISTCLEANFILES = $(ASSEMBLY).config
16  
-
17  
-EXTRA_DIST = $(RAW_API) $(SYMBOLS) $(ASSEMBLY).config.in $(METADATA) $(customs) $(sources) $(add_dist)
  11
+gapi_DATA = $(API)
  12
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY:=.mdb) $(POLICY_ASSEMBLIES) $(POLICY_CONFIGS) generated-stamp generated/*.cs $(API) glue/generated.c $(SNK) AssemblyInfo.cs
  13
+DISTCLEANFILES = $(ASSEMBLY:=.config)
18 14
 
19  
-build_symbols = $(addprefix --symbols=$(srcdir)/, $(SYMBOLS))
  15
+EXTRA_DIST = $(RAW_API) $(METADATA) $(customs) $(sources) $(add_dist)
20 16
 
21  
-$(API): $(METADATA) $(RAW_API) $(SYMBOLS)
  17
+$(API): $(METADATA) $(RAW_API)
22 18
 	cp $(srcdir)/$(RAW_API) $(API)
23 19
 	chmod u+w $(API)
24 20
 	@if test -n '$(METADATA)'; then		\
25  
-		echo "$(GAPI_FIXUP) --api=$(API) --metadata=$(srcdir)/$(METADATA) $(build_symbols)";	\
26  
-		$(GAPI_FIXUP) --api=$(API) --metadata=$(srcdir)/$(METADATA) $(build_symbols); \
  21
+		echo "$(GAPI_FIXUP) --api=$(API) --metadata=$(srcdir)/$(METADATA)";	\
  22
+		$(GAPI_FIXUP) --api=$(API) --metadata=$(srcdir)/$(METADATA); \
27 23
 	fi
28 24
 
29 25
 build_customs = $(addprefix $(srcdir)/, $(customs))
@@ -41,11 +37,11 @@ generated-stamp: $(API) $(INCLUDE_API) $(build_customs)
41 37
 $(SNK): $(top_srcdir)/$(SNK)
42 38
 	cp $(top_srcdir)/$(SNK) .
43 39
 
44  
-AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs
45  
-	cp $(top_builddir)/AssemblyInfo.cs .
  40
+AssemblyInfo.cs: $(top_srcdir)/AssemblyInfo.cs.in
  41
+	sed -e "s/@API_VERSION@/$(API_VERSION)/" $(top_srcdir)/AssemblyInfo.cs.in > AssemblyInfo.cs
46 42
 
47 43
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
48  
-build_references = $(GTKSHARP_LIBS) $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
  44
+build_references = $(GTKSHARP_LIBS) $(addprefix /r:, $(references))
49 45
 
50 46
 if PLATFORM_WIN32
51 47
 GAPI_CDECL_INSERT=$(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
@@ -58,3 +54,37 @@ $(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references)
58 54
 	$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(build_references) $(GENERATED_SOURCES) $(build_sources)
59 55
 	$(GAPI_CDECL_INSERT)
60 56
 
  57
+POLICY_ASSEMBLIES = $(filter %.dll, $(patsubst %, policy.%.$(ASSEMBLY), $(POLICY_VERSIONS)))
  58
+POLICY_CONFIGS = $(patsubst %, policy.%.config, $(POLICY_VERSIONS))
  59
+
  60
+$(POLICY_ASSEMBLIES): $(top_srcdir)/policy.config.in $(SNK)
  61
+	@for i in $(POLICY_VERSIONS); do	\
  62
+	  echo "Creating policy.$$i.$(ASSEMBLY)";	\
  63
+	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" -e "s/@API_VERSION@/$(API_VERSION)/" $(top_srcdir)/policy.config.in > policy.$$i.config;	\
  64
+	  $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:$(SNK);	\
  65
+	done
  66
+
  67
+install-data-local:
  68
+	@if test -n '$(pkg)'; then							\
  69
+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)";				\
  70
+	  $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1;			\
  71
+	  if test -n '$(POLICY_VERSIONS)'; then						\
  72
+	    for i in $(POLICY_VERSIONS); do						\
  73
+	      echo "$(GACUTIL) /i policy.$$i.$(ASSEMBLY) /f $(GACUTIL_FLAGS)";		\
  74
+	      $(GACUTIL) /i policy.$$i.$(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1;	\
  75
+	    done									\
  76
+	  fi										\
  77
+	fi
  78
+
  79
+uninstall-local:
  80
+	@if test -n '$(pkg)'; then							\
  81
+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)";			\
  82
+	  $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1;			\
  83
+	  if test -n '$(POLICY_VERSIONS)'; then						\
  84
+	    for i in $(POLICY_VERSIONS); do						\
  85
+	      echo "$(GACUTIL) /u policy.$$i.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS)";	\
  86
+	      $(GACUTIL) /u policy.$$i.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1;	\
  87
+	    done									\
  88
+	  fi										\
  89
+	fi
  90
+
25  bootstrap-generic → autogen.sh
... ...
@@ -1,33 +1,8 @@
1 1
 #!/bin/sh
2  
-# Run this to set configure.in up for an API version.
3  
-
4  
-if [ x"$GNOME_SHARP_VERSION" = x ] ; then
5  
-    echo "error: this script should not be run directly; use bootstrap instead" 1>&2
6  
-    exit 1
7  
-fi
8 2
 
9 3
 srcdir=`dirname $0`
10 4
 test -z "$srcdir" && srcdir=.
11 5
 
12  
-cat >bootstrap.status <<EOF
13  
-#!/bin/sh
14  
-set -e
15  
-set -x
16  
-
17  
-sed -e "s/@GNOME_SHARP_VERSION@/$GNOME_SHARP_VERSION/" \
18  
-    -e "s/@GTK_REQUIRED_VERSION@/$GTK_REQUIRED_VERSION/" \
19  
-    -e "s/@GNOME_REQUIRED_VERSION@/$GNOME_REQUIRED_VERSION/" \
20  
-    -e "s/@VERSIONCSDEFINES@/$VERSIONCSDEFINES/" \
21  
-    -e "s/@VERSIONCFLAGS@/$VERSIONCFLAGS/" \
22  
-    -e "s/@POLICY_VERSIONS@/$POLICY_VERSIONS/" \
23  
-    -e "s/@ASSEMBLY_VERSION@/$ASSEMBLY_VERSION/" $srcdir/configure.in.in > $srcdir/configure.in
24  
-
25  
-ln -f $srcdir/gnomedesktop/gnomedesktop-api-$GNOME_API_TAG.raw $srcdir/gnomedesktop/gnomedesktop-api.raw
26  
-EOF
27  
-
28  
-chmod +x bootstrap.status
29  
-./bootstrap.status
30  
-
31 6
 DIE=0
32 7
 
33 8
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
13  bootstrap-2.20
... ...
@@ -1,13 +0,0 @@
1  
-#!/bin/sh
2  
-# Run this to set configure.in up for an API version.
3  
-
4  
-GNOME_SHARP_VERSION=2.19.0
5  
-ASSEMBLY_VERSION=2.20.0.0
6  
-POLICY_VERSIONS=
7  
-GTK_REQUIRED_VERSION=2.10.0
8  
-GNOME_REQUIRED_VERSION=2.20.0
9  
-VERSIONCSDEFINES=
10  
-VERSIONCFLAGS=
11  
-GNOME_API_TAG=2.20
12  
-
13  
-. ./bootstrap-generic "$@"
31  configure.in.in → configure.in
... ...
@@ -1,19 +1,9 @@
1 1
 AC_INIT(README)
2 2
 AC_CANONICAL_SYSTEM
3 3
 AM_CONFIG_HEADER(config.h)
4  
-AM_INIT_AUTOMAKE(gnome-desktop-sharp, @GNOME_SHARP_VERSION@)
  4
+AM_INIT_AUTOMAKE(gnome-desktop-sharp, 2.19.0)
5 5
 AM_MAINTAINER_MODE
6 6
 
7  
-API_VERSION=@ASSEMBLY_VERSION@
8  
-AC_SUBST(API_VERSION)
9  
-POLICY_VERSIONS="@POLICY_VERSIONS@"
10  
-AC_SUBST(POLICY_VERSIONS)
11  
-
12  
-PACKAGE_VERSION=gtk-sharp-2.0
13  
-AC_SUBST(PACKAGE_VERSION)
14  
-
15  
-GTKHTML_REQUIRED_VERSION=3.14.0
16  
-
17 7
 case "$host" in
18 8
 	*-*-mingw*|*-*-cygwin*)
19 9
 		platform_win32=yes
@@ -70,13 +60,10 @@ AC_ARG_ENABLE(debug, [  --enable-debug          Build debugger (.mdb) files for
70 60
 )
71 61
 fi
72 62
 
73  
-CSDEFINES='@VERSIONCSDEFINES@'
  63
+CSDEFINES=
74 64
 CSFLAGS="$DEBUG_FLAGS $CSDEFINES"
75 65
 AC_SUBST(CSFLAGS)
76 66
 
77  
-GTK_SHARP_VERSION_CFLAGS='@VERSIONCFLAGS@'
78  
-AC_SUBST(GTK_SHARP_VERSION_CFLAGS)
79  
-
80 67
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
81 68
 if test "x$PKG_CONFIG" = "xno"; then
82 69
 	AC_MSG_ERROR([You need to install pkg-config])
@@ -154,7 +141,7 @@ if test "x$has_mono_cairo" = "xfalse" -a "x$API_VERSION" = "x2.8.0.0"; then
154 141
 	AC_MSG_ERROR([You need to install Mono.Cairo.dll and its pkgconfig file or set PKG_CONFIG_PATH to find it.])
155 142
 fi
156 143
 
157  
-GTK_REQUIRED_VERSION=@GTK_REQUIRED_VERSION@
  144
+GTK_REQUIRED_VERSION=2.11.0
158 145
 
159 146
 PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 >= $GTK_REQUIRED_VERSION)
160 147
 AC_SUBST(GTKSHARP_CFLAGS)
@@ -169,16 +156,17 @@ AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no)
169 156
 AC_SUBST(GAPI_FIXUP)
170 157
 
171 158
 ## Versions of dependencies
172  
-GNOME_REQUIRED_VERSION=@GNOME_REQUIRED_VERSION@
173  
-ART_REQUIRED_VERSION=2.3.16
  159
+GNOME_REQUIRED_VERSION=2.19.0
174 160
 
175  
-PKG_CHECK_MODULES(GNOME, libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED_VERSION libgnomeui-2.0 >= $GNOME_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION libgnomeprintui-2.2 >= $GNOMEPRINT_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION libpanelapplet-2.0 >= $GNOMEPANEL_REQUIRED_VERSION, enable_gnome=yes, enable_gnome=no)
176  
-AC_SUBST(GNOME_CFLAGS)
177  
-AC_SUBST(GNOME_LIBS)
  161
+PKG_CHECK_MODULES(GNOMESHARP, gnome-sharp-2.0 >= $GNOME_REQUIRED_VERSION, enable_gnome=yes, enable_gnome=no)
  162
+AC_SUBST(GNOMESHARP_CFLAGS)
  163
+AC_SUBST(GNOMESHARP_LIBS)
178 164
 
179 165
 AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes")
180 166
 AC_SUBST(CFLAGS)
181 167
 
  168
+GTKHTML_REQUIRED_VERSION=3.16.0
  169
+
182 170
 PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.14 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
183 171
 AC_SUBST(GTKHTML_CFLAGS)
184 172
 AC_SUBST(GTKHTML_LIBS)
@@ -187,7 +175,6 @@ AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes")
187 175
 AC_SUBST(CFLAGS)
188 176
 
189 177
 AC_OUTPUT([
190  
-AssemblyInfo.cs
191 178
 Makefile
192 179
 sources/Makefile
193 180
 gnomedesktop/Makefile
58  gapi-cdecl-insert
... ...
@@ -0,0 +1,58 @@
  1
+#!/usr/bin/perl
  2
+#
  3
+# gapi-cdecl-insert : Inserts il into an assembly for CDecl callback delegates.
  4
+#
  5
+# Authors: Mike Kestner <mkestner@novell.com>
  6
+#
  7
+# Copyright (c) 2005 Novell, Inc.
  8
+#
  9
+# This program is free software; you can redistribute it and/or
  10
+# modify it under the terms of version 2 of the GNU General Public
  11
+# License as published by the Free Software Foundation.
  12
+#
  13
+# This program is distributed in the hope that it will be useful,
  14
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
  15
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  16
+# General Public License for more details.
  17
+#
  18
+# You should have received a copy of the GNU General Public
  19
+# License along with this program; if not, write to the
  20
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  21
+# Boston, MA 02111-1307, USA.
  22
+
  23
+die "Usage: gapi-cdecl-insert [--keyfile=<file>] <assembly_path>\n" if ($ARGV > 2);
  24
+foreach $arg (@ARGV) {
  25
+	if ($arg =~ /--keyfile=(.*)/) {
  26
+		$key = $1;
  27
+	} elsif (-e $arg) {
  28
+		$assembly = $arg;
  29
+	} else {
  30
+		die "Usage: gapi-cdecl-insert [--keyfile=<file>] <assembly_path>\n";
  31
+	}
  32
+}
  33
+
  34
+if ($assembly =~ /(.*)\.dll/) {
  35
+	$basename = $1;
  36
+	`ildasm $assembly /out:$basename.raw`;
  37
+	open(INFILE, $basename . ".raw") || die "Couldn't open $basename.raw\n";
  38
+	open(OUTFILE, "> $basename.il") || die "Couldn't open $basename.il\n";
  39
+	while ($line = <INFILE>) {
  40
+		$insert = 1 if ($line =~ /\.custom instance void .*GLib\.CDeclCallbackAttribute/);
  41
+
  42
+		if ($insert && $line =~ /(.*)\s+(Invoke\(.*)/) {
  43
+			print OUTFILE "$1 modopt([mscorlib]System.Runtime.CompilerServices.CallConvCdecl) $2";
  44
+			$insert = 0;
  45
+			next;
  46
+		}
  47
+		print OUTFILE $line;
  48
+	}
  49
+	`ilasm /DLL /QUIET $basename.il`;
  50
+	`sn -R $assembly gtk-sharp.snk` if ($key);
  51
+	unlink "$basename.raw";
  52
+	unlink "$basename.il";
  53
+	unlink "$basename.res";
  54
+} else {
  55
+	print "This script only works for dlls.\nUsage: gapi-cdecl-insert [--keyfile=<file>] <dll_path>\n";
  56
+}
  57
+
  58
+
4  gnomedesktop/Makefile.am
@@ -3,16 +3,16 @@ pkgconfigdir = $(libdir)/pkgconfig
3 3
 pkgconfig_DATA = gnomedesktop-sharp-2.20.pc
4 4
 pkgversion = 2.20
5 5
 
  6
+API_VERSION = 2.20.0.0
6 7
 INCLUDE_API =
7 8
 METADATA = metadata
8  
-SYMBOLS =
9 9
 references =
10 10
 
11 11
 sources =
12 12
 
13 13
 customs =
14 14
 
15  
-add_dist = gnomedesktop-sharp-2.20.pc.in
  15
+add_dist = gnomedesktop-sharp-2.20.pc.in gnomedesktop-sharp.dll.config.in
16 16
 
17 17
 include ../Makefile.include
18 18
 
0  gnomedesktop/gnomedesktop-api-2.20.raw → gnomedesktop/gnomedesktop-api.raw
File renamed without changes
4  gnomedesktop/gnomedesktop-sharp-2.20.pc.in
@@ -2,9 +2,7 @@ prefix=${pcfiledir}/../..
2 2
 exec_prefix=${prefix}
3 3
 libdir=${exec_prefix}/lib
4 4
 gapidir=${prefix}/share/gnomedesktop-sharp/2.20
5  
-assemblies_dir=${prefix}/lib/gnomedesktop-sharp/2.20
6  
-Libraries=${assemblies_dir}/gnomedesktop-sharp.dll ${assemblies_dir}/gnomedesktop-sharp.dll.config
7  
-
  5
+assemblies_dir=${libdir}/mono/gnomedesktop-sharp-2.20
8 6
 
9 7
 Name: GnomeDesktop#
10 8
 Description: GnomeDesktop# - GNOMEDesktop .NET Binding
4  gtkhtml/Makefile.am
@@ -7,9 +7,9 @@ else
7 7
 pkg = 
8 8
 endif
9 9
 
  10
+API_VERSION=3.16.0.0
10 11
 INCLUDE_API =
11 12
 METADATA = metadata
12  
-SYMBOLS =
13 13
 references =
14 14
 
15 15
 sources =
@@ -18,7 +18,7 @@ customs =			\
18 18
 	HTML.custom		\
19 19
 	HTMLStream.custom	
20 20
 
21  
-add_dist = gtkhtml-sharp-3.14.pc.in
  21
+add_dist = gtkhtml-sharp-3.14.pc.in gtkhtml-sharp.dll.config.in
22 22
 
23 23
 include ../Makefile.include
24 24
 
5  gtkhtml/gtkhtml-sharp-3.14.pc.in
@@ -2,12 +2,11 @@ prefix=${pcfiledir}/../..
2 2
 exec_prefix=${prefix}
3 3
 libdir=${exec_prefix}/lib
4 4
 gapidir=${prefix}/share/gtkhtml-sharp/3.14
5  
-assemblies_dir=${prefix}/lib/gtkhtml-sharp/3.14
6  
-Libraries=${assemblies_dir}/gtkhtml-sharp.dll ${assemblies_dir}/gtkhtml-sharp.dll.config
  5
+assemblies_dir=${libdir}/mono/gtkhtml-sharp-3.14
7 6
 
8 7
 Name: Gtkhtml#
9 8
 Description: Gtkhtml# - Gtkhtml .NET Binding
10 9
 Version: @VERSION@
11  
-Requires: gnome-sharp-2.0
  10
+Requires: gtk-sharp-2.0
12 11
 Cflags: -I:${gapidir}/gtkhtml-api.xml
13 12
 Libs: -r:${assemblies_dir}/gtkhtml-sharp.dll
10  policy.config.in
... ...
@@ -0,0 +1,10 @@
  1
+<configuration>
  2
+   <runtime>
  3
+      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
  4
+       <dependentAssembly>
  5
+         <assemblyIdentity name="@ASSEMBLY_NAME@" publicKeyToken="35e10195dab3c99f" />
  6
+         <bindingRedirect oldVersion="@POLICY@.0.0" newVersion="@API_VERSION@"/>
  7
+       </dependentAssembly>
  8
+      </assemblyBinding>
  9
+   </runtime>
  10
+</configuration>
2  sources/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST =				\
5 5
 
6 6
 GNOME_2_20_DOWNLOADS = \
7 7
 	http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.0/sources/gnome-desktop-2.20.0.tar.bz2 \
8  
-	http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.0/sources/libgtop-2.20.0.tar.bz2	\
  8
+	http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.0/sources/librsvg-2.18.2.tar.bz2	\
9 9
 	http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.0/sources/nautilus-cd-burner-2.20.0.tar.bz2
10 10
 
11 11
 api: api-2.20
9  sources/sources-2.20.xml
... ...
@@ -1,5 +1,5 @@
1 1
 <gapi-parser-input>
2  
-  <api filename="../gnomedesktop/gnomedesktop-api-2.20.raw">
  2
+  <api filename="../gnomedesktop/gnomedesktop-api.raw">
3 3
     <library name="gnome-desktop-2">
4 4
       <namespace name="Gnome">
5 5
         <directory path="gnome-desktop-2.20.0/libgnome-desktop" />
@@ -7,6 +7,13 @@
7 7
       </namespace>
8 8
     </library>
9 9
   </api>
  10
+  <api filename="../rsvg/rsvg-api.raw">
  11
+    <library name="rsvg-2">
  12
+      <namespace name="Rsvg">
  13
+        <dir>librsvg-2.18.2</dir>
  14
+      </namespace>
  15
+    </library>
  16
+  </api>
10 17
   <api filename="../gtkhtml/gtkhtml-api.raw">
11 18
     <library name="gtkhtml-3.0">
12 19
       <namespace name="Gtk">

0 notes on commit 1c6240a

Please sign in to comment.
Something went wrong with that request. Please try again.