- 2.0.0.9

[packages/firefox.git] / mozilla-firefox-addon-tidy.patch

diff --git a/mozilla-firefox-addon-tidy.patch b/mozilla-firefox-addon-tidy.patch
index 5fc2ea82d943429c48f0a2dbe3c41bc63690919a..ea297218f376db4baa73bb299166d8938c9afd20 100644 (file)
--- a/mozilla-firefox-addon-tidy.patch
+++ b/mozilla-firefox-addon-tidy.patch
@@ -37,19 +37,39 @@
    AC_DEFINE(MOZ_PHOENIX)
    ;;
  
---- mozilla/extensions/tidy/spvalid/Makefile.in~       2007-06-04 18:14:32.143983411 +0300
-+++ mozilla/extensions/tidy/spvalid/Makefile.in        2007-06-04 18:14:33.784020668 +0300
-@@ -49,7 +49,7 @@
- EXTRA_DSO_LDOPTS = \
-                 $(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
+--- mozilla/extensions/tidy/src/Makefile.in~   2007-09-04 23:38:53.000000000 +0300
++++ mozilla/extensions/tidy/src/Makefile.in    2007-09-04 23:49:39.434545403 +0300
+@@ -104,7 +104,7 @@
+ 
+ EXTRA_DSO_LDOPTS += \
                  $(NSPR_LIBS) \
 -                $(LIB_PREFIX)osp.$(LIB_SUFFIX) \
 +                -losp \
                  $(NULL)
  
- LIBS            = \
---- mozilla/extensions/tidy/spvalid/SpValid.cpp~       2007-06-04 18:16:53.647197763 +0300
-+++ mozilla/extensions/tidy/spvalid/SpValid.cpp        2007-06-04 18:16:55.107230927 +0300
+ include $(topsrcdir)/config/rules.mk
+--- mozilla/extensions/tidy/src/Makefile.in~   2007-09-04 23:49:39.000000000 +0300
++++ mozilla/extensions/tidy/src/Makefile.in    2007-09-04 23:50:13.205311926 +0300
+@@ -111,6 +111,6 @@
+ 
+ INCLUDES += -I$(srcdir)/../tidy/include 
+ INCLUDES += -I$(srcdir)/../tidy/src 
+-INCLUDES += -I$(srcdir)/../opensp/include 
++INCLUDES += -I/usr/include/OpenSP
+ INCLUDES += -I$(srcdir)/.
+ 
+--- mozilla/extensions/tidy/src/Makefile.in~   2007-09-05 01:41:08.000000000 +0300
++++ mozilla/extensions/tidy/src/Makefile.in    2007-09-05 12:21:13.420348101 +0300
+@@ -103,6 +103,7 @@
+ endif
+ 
+ EXTRA_DSO_LDOPTS += \
++                $(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) $(DIST)/lib/$(LIB_PREFIX)xpcom.so \
+                 $(NSPR_LIBS) \
+                 -losp \
+                 $(NULL)
+--- mozilla/extensions/tidy/src/SpValid.cpp~   2007-08-27 10:38:12.000000000 +0300
++++ mozilla/extensions/tidy/src/SpValid.cpp    2007-09-04 23:53:25.049666582 +0300
 @@ -9,7 +9,7 @@
  #ifdef WIN32
  #include "../opensp/include/config.h"
@@ -59,14 +79,22 @@
  #endif
  
  #include "nsMemory.h"
---- mozilla/extensions/tidy/src/Makefile.in~   2007-06-04 17:18:56.188246299 +0300
-+++ mozilla/extensions/tidy/src/Makefile.in    2007-06-04 18:19:42.941042959 +0300
-@@ -83,7 +83,7 @@
- EXTRA_DSO_LDOPTS = \
-                 $(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
-                 $(NSPR_LIBS) \
--                ../spvalid/$(LIB_PREFIX)osp.$(LIB_SUFFIX) \
-+                -losp \
-                 $(NULL)
+@@ -19,13 +19,13 @@
+ 
+ #include <stdlib.h>
+ 
+-#include "../opensp/include/MessageEventHandler.h"
+-#include "NsgmlsMessages.h"
+-#include "../opensp/include/sptchar.h"
++#include <OpenSP/MessageEventHandler.h>
++#include <OpenSP/nsgmls/NsgmlsMessages.h>
++#include <OpenSP/sptchar.h>
+ #include "SpValid.h"
+-#include "../opensp/include/InternalInputSource.h"
++#include <OpenSP/InternalInputSource.h>
+ 
+-#include "../opensp/include/Parser.h"
++#include <OpenSP/lib/Parser.h>
  
- LIBS            = \
+ #ifdef SP_NAMESPACE
+ using namespace SP_NAMESPACE;