Author: wade
Date: 2007-12-06 23:40:30 -0500 (Thu, 06 Dec 2007)
New Revision: 90893

Added:
   
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-enable_win32_gconf.patch
Modified:
   trunk/release/packaging/defs/gnome-sharp2
Log:
Enable gconf# on win32 with gnome-sharp 2.16.0 (temp fix for #345910)


Modified: trunk/release/packaging/defs/gnome-sharp2
===================================================================
--- trunk/release/packaging/defs/gnome-sharp2   2007-12-07 04:32:49 UTC (rev 
90892)
+++ trunk/release/packaging/defs/gnome-sharp2   2007-12-07 04:40:30 UTC (rev 
90893)
@@ -10,6 +10,8 @@
 
 web_index=7
 
+USE_PATCHES=1
+
 MKTARBALL_HOST="suse-102-x86_64"
 
 USE_HOSTS=([EMAIL PROTECTED])

Added: 
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-enable_win32_gconf.patch
===================================================================
--- 
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-enable_win32_gconf.patch
  2007-12-07 04:32:49 UTC (rev 90892)
+++ 
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-enable_win32_gconf.patch
  2007-12-07 04:40:30 UTC (rev 90893)
@@ -0,0 +1,40 @@
+--- gnome-sharp-2.16.0/gconf/GConf/Makefile.in.orig    2007-12-06 
21:41:23.000000000 -0700
++++ gnome-sharp-2.16.0/gconf/GConf/Makefile.in 2007-12-06 21:43:00.000000000 
-0700
+@@ -231,10 +231,9 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
[EMAIL PROTECTED]@TARGET = 
[EMAIL PROTECTED]@TARGET = $(ASSEMBLY) $(ASSEMBLY).config
[EMAIL PROTECTED]@pkgconfigdir = $(libdir)/pkgconfig
[EMAIL PROTECTED]@pkgconfig_DATA = gconf-sharp-2.0.pc
++TARGET = $(ASSEMBLY) $(ASSEMBLY).config
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = gconf-sharp-2.0.pc
+ noinst_DATA = $(TARGET) $(POLICY_ASSEMBLIES)
+ CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk $(POLICY_ASSEMBLIES) 
$(POLICY_CONFIGS)
+ DISTCLEANFILES = gconf-sharp-2.0.pc $(ASSEMBLY).config
+@@ -260,7 +259,7 @@
+       NotifyWrapper.cs        \
+       Value.cs
+ 
+-build_sources = $(addprefix $(srcdir)/, $(sources)) ../../AssemblyInfo.cs
++build_sources = $(addprefix $(srcdir)/, $(sources))
+ @[EMAIL PROTECTED] = 
+ @[EMAIL PROTECTED] = $(top_srcdir)/gapi-cdecl-insert --keyfile=gtk-sharp.snk 
$(ASSEMBLY)
+ all: all-am
+@@ -455,9 +454,12 @@
+ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
+       cp $(top_srcdir)/gtk-sharp.snk .
+ 
+-$(ASSEMBLY): $(build_sources) gtk-sharp.snk
++AssemblyInfo.cs: $(top_srcdir)/AssemblyInfo.cs
++      cp $(top_srcdir)/AssemblyInfo.cs .
++
++$(ASSEMBLY): $(build_sources) gtk-sharp.snk AssemblyInfo.cs
+       @rm -f $(ASSEMBLY).mdb
+-      $(CSC) $(CSFLAGS) /out:$(ASSEMBLY) /target:library $(references) 
$(build_sources)
++      $(CSC) $(CSFLAGS) /out:$(ASSEMBLY) /target:library $(references) 
$(build_sources) AssemblyInfo.cs
+       $(GAPI_CDECL_INSERT)
+ 
+ $(POLICY_ASSEMBLIES): $(top_builddir)/policy.config gtk-sharp.snk

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to