| 1 |
loki_val 09/09/02 20:57:09 |
| 2 |
|
| 3 |
Added: evolution-sharp-0.21.1-gtk-sharp-dropped.patch |
| 4 |
Log: |
| 5 |
Fix bug 282042 completely. Shuffle the sample programs building under check_SCRIPTS, make the .dll use only glib-sharp. |
| 6 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-dotnet/evolution-sharp/files/evolution-sharp-0.21.1-gtk-sharp-dropped.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-dotnet/evolution-sharp/files/evolution-sharp-0.21.1-gtk-sharp-dropped.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-dotnet/evolution-sharp/files/evolution-sharp-0.21.1-gtk-sharp-dropped.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: evolution-sharp-0.21.1-gtk-sharp-dropped.patch |
| 15 |
=================================================================== |
| 16 |
diff -NrU5 evolution-sharp-0.21.1.orig/configure.in evolution-sharp-0.21.1/configure.in |
| 17 |
--- evolution-sharp-0.21.1.orig/configure.in 2009-09-02 19:30:52.000000000 +0200 |
| 18 |
+++ evolution-sharp-0.21.1/configure.in 2009-09-02 20:45:29.000000000 +0200 |
| 19 |
@@ -109,12 +109,21 @@ |
| 20 |
AC_SUBST(CSC) |
| 21 |
AC_SUBST(GACUTIL) |
| 22 |
AC_SUBST(LIB_PREFIX) |
| 23 |
AC_SUBST(LIB_SUFFIX) |
| 24 |
|
| 25 |
-PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= 2.4.0) |
| 26 |
+PKG_CHECK_MODULES([GLIB_SHARP], |
| 27 |
+ [glib-sharp-2.0 >= 2.4.0]) |
| 28 |
+AC_SUBST(GLIB_SHARP_LIBS) |
| 29 |
+ |
| 30 |
+PKG_CHECK_MODULES([GTK_SHARP], |
| 31 |
+ [gtk-sharp-2.0 >= 2.4.0], |
| 32 |
+ [HAVE_GTK_SHARP=yes], |
| 33 |
+ [AC_MSG_WARN([You will not be able to compile the "make check" programs])]) |
| 34 |
AC_SUBST(GTK_SHARP_LIBS) |
| 35 |
+AM_CONDITIONAL([HAVE_GTK_SHARP], |
| 36 |
+ [test x$HAVE_GTK_SHARP = xyes]) |
| 37 |
|
| 38 |
AC_PATH_PROG(GAPI_CODEGEN, gapi2-codegen, no) |
| 39 |
if test "x$GAPI_CODEGEN" = "xno"; then |
| 40 |
AC_MSG_ERROR([You need to install gtk-sharp2-gapi]) |
| 41 |
fi |
| 42 |
diff -NrU5 evolution-sharp-0.21.1.orig/evolution/Makefile.am evolution-sharp-0.21.1/evolution/Makefile.am |
| 43 |
--- evolution-sharp-0.21.1.orig/evolution/Makefile.am 2009-09-02 19:30:52.000000000 +0200 |
| 44 |
+++ evolution-sharp-0.21.1/evolution/Makefile.am 2009-09-02 22:23:08.000000000 +0200 |
| 45 |
@@ -26,11 +26,12 @@ |
| 46 |
endif |
| 47 |
|
| 48 |
API=evolution-api.xml |
| 49 |
METADATA = Evolution.metadata |
| 50 |
ASSEMBLY_NAME = evolution-sharp |
| 51 |
-references = $(GTK_SHARP_LIBS) |
| 52 |
+references = $(GLIB_SHARP_LIBS) |
| 53 |
+check_references = $(GTK_SHARP_LIBS) |
| 54 |
|
| 55 |
TARGET = $(ASSEMBLY) |
| 56 |
ASSEMBLY = $(ASSEMBLY_NAME).dll |
| 57 |
gapidir = $(datadir)/gapi-2.0 |
| 58 |
noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config |
| 59 |
@@ -90,12 +91,10 @@ |
| 60 |
&& touch generated-stamp |
| 61 |
|
| 62 |
$(ASSEMBLY): $(build_sources) generated-stamp evolution-sharp.snk |
| 63 |
$(CSC) -debug -unsafe /out:$(ASSEMBLY) $(CSFLAGS) /target:library $(references) $(build_sources) generated/*.cs |
| 64 |
|
| 65 |
-all: $(ASSEMBLY) $(TEST_TARGETS) |
| 66 |
- |
| 67 |
install-data-local: |
| 68 |
@if test -n '$(TARGET)'; then \ |
| 69 |
echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib"; \ |
| 70 |
$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib || exit 1; \ |
| 71 |
fi |
| 72 |
@@ -107,33 +106,35 @@ |
| 73 |
fi |
| 74 |
|
| 75 |
evolution-sharp.snk: $(top_srcdir)/evolution-sharp.snk |
| 76 |
cp $(top_srcdir)/evolution-sharp.snk . |
| 77 |
|
| 78 |
+if HAVE_GTK_SHARP |
| 79 |
+ |
| 80 |
if USE_EDS_2_24 |
| 81 |
-TEST_TARGETS_2_24 = $(TESTCACHE_TARGET) |
| 82 |
+TESTCACHE_TARGET = TestCache.exe |
| 83 |
+TESTCACHE_CSFILES = $(srcdir)/TestCache.cs |
| 84 |
+$(TESTCACHE_TARGET): $(TESTCACHE_CSFILES) $(ASSEMBLY) |
| 85 |
+ $(CSC) -debug -out:$@ $(CSFLAGS) $(TESTCACHE_CSFILES) -r:$(ASSEMBLY) $(check_references) |
| 86 |
endif |
| 87 |
|
| 88 |
-TEST_TARGETS = $(TESTCAL_TARGET) $(TESTTASK_TARGET) $(TESTBOOK_TARGET) $(TEST_TARGETS_2_24) |
| 89 |
+check_SCRIPTS = $(TESTCAL_TARGET) $(TESTTASK_TARGET) $(TESTBOOK_TARGET) $(TESTCACHE_TARGET) |
| 90 |
|
| 91 |
TESTCAL_TARGET = TestCal.exe |
| 92 |
TESTCAL_CSFILES = $(srcdir)/TestCal.cs |
| 93 |
|
| 94 |
$(TESTCAL_TARGET): $(TESTCAL_CSFILES) $(ASSEMBLY) |
| 95 |
- $(CSC) -debug -out:$@ $(CSFLAGS) $(TESTCAL_CSFILES) -r:$(ASSEMBLY) $(references) |
| 96 |
- |
| 97 |
-TESTCACHE_TARGET = TestCache.exe |
| 98 |
-TESTCACHE_CSFILES = $(srcdir)/TestCache.cs |
| 99 |
-$(TESTCACHE_TARGET): $(TESTCACHE_CSFILES) $(ASSEMBLY) |
| 100 |
- $(CSC) -debug -out:$@ $(CSFLAGS) $(TESTCACHE_CSFILES) -r:$(ASSEMBLY) $(references) |
| 101 |
+ $(CSC) -debug -out:$@ $(CSFLAGS) $(TESTCAL_CSFILES) -r:$(ASSEMBLY) $(check_references) |
| 102 |
|
| 103 |
TESTTASK_TARGET = TestTask.exe |
| 104 |
TESTTASK_CSFILES = $(srcdir)/TestTask.cs |
| 105 |
|
| 106 |
$(TESTTASK_TARGET): $(TESTTASK_CSFILES) $(ASSEMBLY) |
| 107 |
- $(CSC) -debug -out:$@ $(CSFLAGS) $(TESTTASK_CSFILES) -r:$(ASSEMBLY) $(references) |
| 108 |
+ $(CSC) -debug -out:$@ $(CSFLAGS) $(TESTTASK_CSFILES) -r:$(ASSEMBLY) $(check_references) |
| 109 |
|
| 110 |
TESTBOOK_TARGET = TestBook.exe |
| 111 |
TESTBOOK_CSFILES = $(srcdir)/TestBook.cs |
| 112 |
|
| 113 |
$(TESTBOOK_TARGET): $(TESTBOOK_CSFILES) $(ASSEMBLY) |
| 114 |
- $(CSC) -debug -out:$@ $(CSFLAGS) $(TESTBOOK_CSFILES) -r:$(ASSEMBLY) $(references) |
| 115 |
+ $(CSC) -debug -out:$@ $(CSFLAGS) $(TESTBOOK_CSFILES) -r:$(ASSEMBLY) $(check_references) |
| 116 |
+ |
| 117 |
+endif |
Archives