odf-converter/archpatch-odf-converter-2.diff

   1 diff -rud odf-converter-r5224.old/trunk/source/Shell/OdfConverter/Makefile odf-converter-r5224/trunk/source/Shell/OdfConverter/Makefile
   2 --- odf-converter-r5224.old/trunk/source/Shell/OdfConverter/Makefile    2009-06-15 12:26:53.136293718 -0400
   3 +++ odf-converter-r5224/trunk/source/Shell/OdfConverter/Makefile        2009-06-15 12:45:19.542225268 -0400
   4 @@ -2,7 +2,7 @@
   5  include $(top_srcdir)/build/common.mk
   6
   7  ifeq ($(OS),Cygwin)
   8 -MACHINE_CONFIG_FILE=--machine-config $(shell cygpath -m $(shell pkg-config --variable=prefix mono))/etc/mono/2.0/machine.config
   9 +MACHINE_CONFIG_FILE=--machine-config /etc/mono/2.0/machine.config
  10  CC=gcc -mno-cygwin
  11  EXEEXT=.exe
  12  PATHSEP=;
  13 @@ -16,7 +16,7 @@
  14  ifeq ($(OS),Darwin)
  15  MACHINE_CONFIG_FILE=
  16  else
  17 -MACHINE_CONFIG_FILE=--machine-config "`pkg-config --variable=prefix mono`/etc/mono/2.0/machine.config"
  18 +MACHINE_CONFIG_FILE=--machine-config /etc/mono/2.0/machine.config
  19  endif
  20  EXEEXT=
  21  PATHSEP=:
  22 @@ -72,7 +72,7 @@
  23             $(EXPORTDYNAMIC) \
  24             -Wl,--undefined=$(ZIPOPEN) -Wl,--undefined=$(UNZOPEN) \
  25             `pkg-config --libs-only-L mono` -L../../AdditionalTools/zlib123/contrib/minizip \
  26 -           -Wl,-Bstatic -lmono -lzlibwapi -Wl,-Bdynamic  \
  27 +           -Wl,-Bstatic -lmono -L../../../lib/zlibwapi.dll -Wl,-Bdynamic  \
  28             `pkg-config --libs-only-l mono | sed -e "s/\-lmono //"` \
  29             $(ZLIB) $(OTHERLIBS)
  30  endif
  31 diff -rud odf-converter-r5224.old/trunk/source/Shell/OdfConverter/OdfValidator.cs odf-converter-r5224/trunk/source/Shell/OdfConverter/OdfValidator.cs
  32 --- odf-converter-r5224.old/trunk/source/Shell/OdfConverter/OdfValidator.cs     2009-06-15 12:26:53.136293718 -0400
  33 +++ odf-converter-r5224/trunk/source/Shell/OdfConverter/OdfValidator.cs 2009-06-15 12:39:05.099138148 -0400
  34 @@ -49,9 +49,9 @@
  35
  36  #if MONO
  37         // Dummy validation class
  38 -       public class OdfValidator
  39 +       public class OdfValidator : IValidator
  40         {
  41 -               public OdfValidator(Report report)
  42 +               public OdfValidator(Object report)
  43                 {
  44                 }
  45                 public void validate(String fileName)
  46 diff -rud odf-converter-r5224.old/trunk/source/Spreadsheet/Converter/Makefile odf-converter-r5224/trunk/source/Spreadsheet/Converter/Makefile
  47 --- odf-converter-r5224.old/trunk/source/Spreadsheet/Converter/Makefile 2009-06-15 12:27:21.062335802 -0400
  48 +++ odf-converter-r5224/trunk/source/Spreadsheet/Converter/Makefile     2009-06-15 12:26:19.275673369 -0400
  49 @@ -30,12 +30,16 @@
  50         $(CSC) $(CSC_DEBUG) $(RESOURCE_FLAGS) -target:library \
  51                 -reference:../../Common/OdfZipUtils/OdfZipUtils.dll \
  52                 -reference:../../Common/OdfConverterLib/OdfConverterLib.dll \
  53 +               -reference:System.Drawing \
  54 +               -reference:System.Windows.Forms \
  55                 -out:$@ $(SOURCE)
  56
  57  SpreadsheetStatic.dll: $(SOURCE) Makefile $(OOX2ODF_RES) $(ODF2OOX_RES)
  58         $(CSC) $(CSC_DEBUG) $(RESOURCE_FLAGS) -target:library \
  59                 -reference:../../Common/OdfZipUtils/OdfZipUtilsStatic.dll \
  60                 -reference:../../Common/OdfConverterLib/OdfConverterLibStatic.dll \
  61 +               -reference:System.Drawing \
  62 +               -reference:System.Windows.Forms \
  63                 -out:$@ $(SOURCE)
  64
  65  clean-local: