mozilla-firefox-addon-tidy.patch

   1 --- mozilla/allmakefiles.sh~    2007-04-03 22:04:34.000000000 +0300
   2 +++ mozilla/allmakefiles.sh     2007-06-04 14:02:26.641218344 +0300
   3 @@ -1561,6 +1561,14 @@
   4          sql ) MAKEFILES_extensions="$MAKEFILES_extensions
   5              $MAKEFILES_sql"
   6              ;;
   7 +
   8 +        tidy ) MAKEFILES_extensions="$MAKEFILES_extensions
   9 +            extensions/tidy/Makefile
  10 +            extensions/tidy/src/Makefile
  11 +            extensions/tidy/test/Makefile
  12 +            extensions/tidy/spvalid/Makefile
  13 +            " ;;
  14 +
  15          schema-validation ) MAKEFILES_extensions="$MAKEFILES_extensions
  16              extensions/schema-validation/Makefile
  17              extensions/schema-validation/public/Makefile
  18 --- mozilla/configure~  2007-06-04 14:32:43.192411445 +0300
  19 +++ mozilla/configure   2007-06-04 17:01:47.504921162 +0300
  20 @@ -13168,7 +13168,7 @@
  21    MOZ_PHOENIX=1
  22    MOZ_SAFE_BROWSING=1
  23    MOZ_APP_VERSION=$FIREFOX_VERSION
  24 -  MOZ_EXTENSIONS_DEFAULT=" cookie xml-rpc xmlextras pref transformiix universalchardet webservices inspector gnomevfs auth permissions reporter spellcheck"
  25 +  MOZ_EXTENSIONS_DEFAULT=" tidy cookie xml-rpc xmlextras pref transformiix universalchardet webservices inspector gnomevfs auth permissions reporter spellcheck"
  26    cat >> confdefs.h <<\EOF
  27  #define MOZ_PHOENIX 1
  28  EOF
  29 --- mozilla/configure.in~       2007-06-04 14:32:42.892404643 +0300
  30 +++ mozilla/configure.in        2007-06-04 17:02:06.255346400 +0300
  31 @@ -4329,7 +4329,7 @@
  32    MOZ_PHOENIX=1
  33    MOZ_SAFE_BROWSING=1
  34    MOZ_APP_VERSION=$FIREFOX_VERSION
  35 -  MOZ_EXTENSIONS_DEFAULT=" cookie xml-rpc xmlextras pref transformiix universalchardet webservices inspector gnomevfs auth permissions reporter spellcheck"
  36 +  MOZ_EXTENSIONS_DEFAULT=" tidy cookie xml-rpc xmlextras pref transformiix universalchardet webservices inspector gnomevfs auth permissions reporter spellcheck"
  37    AC_DEFINE(MOZ_PHOENIX)
  38    ;;
  39
  40 --- mozilla/extensions/tidy/spvalid/Makefile.in 2007-06-04 18:14:33.784020668 +0300
  41 +++ mozilla/extensions/tidy/spvalid/Makefile.in 2007-06-04 19:23:03.277335685 +0300
  42 @@ -49,7 +49,7 @@
  43  EXTRA_DSO_LDOPTS = \
  44                  $(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
  45                  $(NSPR_LIBS) \
  46 -                $(LIB_PREFIX)osp.$(LIB_SUFFIX) \
  47 +                -losp \
  48                  $(NULL)
  49
  50  LIBS            = \
  51 @@ -64 +64 @@
  52 -INCLUDES += -I$(srcdir)/../opensp/include
  53 \ No newline at end of file
  54 +INCLUDES += -I/usr/include/OpenSP
  55 --- mozilla/extensions/tidy/spvalid/SpValid.cpp 2007-06-04 18:16:55.107230927 +0300
  56 +++ mozilla/extensions/tidy/spvalid/SpValid.cpp 2007-06-04 19:30:11.547080063 +0300
  57 @@ -9,7 +9,7 @@
  58  #ifdef WIN32
  59  #include "../opensp/include/config.h"
  60  #else
  61 -#include "../opensp/config.h"
  62 +#include <OpenSP/config.h>
  63  #endif
  64
  65  #include "nsMemory.h"
  66 @@ -19,13 +19,13 @@
  67
  68  #include <stdlib.h>
  69
  70 -#include "MessageEventHandler.h"\r
  71 -#include "NsgmlsMessages.h"
  72 -#include "sptchar.h"\r
  73 +#include <OpenSP/MessageEventHandler.h>
  74 +#include <OpenSP/nsgmls/NsgmlsMessages.h>
  75 +#include <OpenSP/sptchar.h>
  76  #include "SpValid.h"
  77  #include "InternalInputSource.h"\r
  78
  79 -#include "../lib/Parser.h"\r
  80 +#include <OpenSP/lib/Parser.h>
  81  ;\r
  82  #ifdef SP_NAMESPACE\r
  83  using namespace SP_NAMESPACE;\r
  84 --- mozilla/extensions/tidy/src/Makefile.in     2007-06-04 18:19:42.941042959 +0300
  85 +++ mozilla/extensions/tidy/src/Makefile.in     2007-06-04 23:29:29.111109183 +0300
  86 @@ -82,8 +82,9 @@
  87  # separate libraries linked in.
  88  EXTRA_DSO_LDOPTS = \
  89                  $(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
  90 +                $(DIST)/lib/libxpcom_core.so \
  91                  $(NSPR_LIBS) \
  92 -                ../spvalid/$(LIB_PREFIX)osp.$(LIB_SUFFIX) \
  93 +                -losp \
  94                  $(NULL)
  95
  96  LIBS            = \
  97 --- mozilla/extensions/tidy/spvalid/SpValid.h~  2007-06-04 19:30:14.137138981 +0300
  98 +++ mozilla/extensions/tidy/spvalid/SpValid.h   2007-06-04 19:30:15.877178562 +0300
  99 @@ -5,8 +5,8 @@
 100  #define Nsgmls_INCLUDED 1\r
 101  \r
 102  #include "SpResult.h"\r
 103 -#include "ParserApp.h"\r
 104 -#include "Boolean.h"\r
 105 +#include <OpenSP/ParserApp.h>\r
 106 +#include <OpenSP/Boolean.h>\r
 107
 108  #ifdef SP_NAMESPACE
 109  using namespace SP_NAMESPACE;