[kdewebdev] fix build failure with libxml2-2.9

[Than Ngo]

commit 96d10e8eac3b24cc9e3991875239316ff36b2a5c
Author: Than Ngo <than at redhat.com>
Date:   Fri Mar 8 17:45:00 2013 +0100

    fix build failure with libxml2-2.9

 kdewebdev-3.5.10-docbParseFile.patch |   53 ++++++++++++++++++++++++++++++++++
 kdewebdev.spec                       |    8 ++++-
 2 files changed, 60 insertions(+), 1 deletions(-)
---
diff --git a/kdewebdev-3.5.10-docbParseFile.patch b/kdewebdev-3.5.10-docbParseFile.patch
new file mode 100644
index 0000000..5fe3ccd
--- /dev/null
+++ b/kdewebdev-3.5.10-docbParseFile.patch
@@ -0,0 +1,53 @@
+diff -up kdewebdev-3.5.10/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp.me kdewebdev-3.5.10/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
+--- kdewebdev-3.5.10/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp.me	2013-03-08 17:43:18.396187560 +0100
++++ kdewebdev-3.5.10/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp	2013-03-08 17:43:44.315120188 +0100
+@@ -82,9 +82,6 @@
+ #include <libxml/xmlerror.h>
+ #include <libxml/HTMLtree.h>
+ #include <libxml/xmlIO.h>
+-#ifdef LIBXML_DOCB_ENABLED
+-#include <libxml/DOCBparser.h>
+-#endif
+ #ifdef LIBXML_XINCLUDE_ENABLED
+ #include <libxml/xinclude.h>
+ #endif
+@@ -973,13 +970,6 @@ xsldbgLoadXmlData(void)
+                             NULL);
+     else
+ #endif
+-#ifdef LIBXML_DOCB_ENABLED
+-    if (optionsGetIntOption(OPTIONS_DOCBOOK))
+-        doc = docbParseFile((char *)
+-                            optionsGetStringOption(OPTIONS_DATA_FILE_NAME),
+-                            NULL);
+-    else
+-#endif
+ 
+ #if LIBXML_VERSION >= 20600
+         doc = xmlSAXParseFile(&mySAXHandler,
+@@ -1025,11 +1015,6 @@ xsldbgLoadXmlTemporary(const xmlChar * p
+         doc = htmlParseFile((char *) path, NULL);
+     else
+ #endif
+-#ifdef LIBXML_DOCB_ENABLED
+-    if (optionsGetIntOption(OPTIONS_DOCBOOK))
+-        doc = docbParseFile((char *) path, NULL);
+-    else
+-#endif
+         doc = xmlSAXParseFile(&mySAXhdlr, (char *) path, 0);
+     if (doc == NULL) {
+         xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").arg(xsldbgUrl(path)));
+diff -up kdewebdev-3.5.10/kxsldbg/xsldbgmain.cpp.me kdewebdev-3.5.10/kxsldbg/xsldbgmain.cpp
+--- kdewebdev-3.5.10/kxsldbg/xsldbgmain.cpp.me	2013-03-08 17:44:00.780077549 +0100
++++ kdewebdev-3.5.10/kxsldbg/xsldbgmain.cpp	2013-03-08 17:44:06.587062539 +0100
+@@ -73,10 +73,6 @@ static const KCmdLineOptions options[] =
+     { "html", 		I18N_NOOP("The input document is(are) an HTML file(s)"), 0},
+ #endif
+ 
+-#ifdef LIBXML_DOCB_ENABLED
+-    { "docbook", 	I18N_NOOP("The input document is SGML docbook"), 0},
+-#endif
+-
+     { "nonet", 		I18N_NOOP("Disable the fetching DTDs or entities over network"), 0},
+ 
+ #ifdef LIBXML_CATALOG_ENABLED
diff --git a/kdewebdev.spec b/kdewebdev.spec
index 7a63605..9c39e0f 100644
--- a/kdewebdev.spec
+++ b/kdewebdev.spec
@@ -5,7 +5,7 @@ Name:    kdewebdev
 Summary: Web development applications 
 Epoch:   6
 Version: 3.5.10
-Release: 17%{?dist}
+Release: 18%{?dist}
 
 License: GPLv2
 Url:     http://kdewebdev.org/ 
@@ -29,6 +29,8 @@ Patch3: kdewebdev-3.5.10-fix-freehand-crash.patch
 Patch4: kdewebdev-3.5.10-gcc46.patch
 # fix build failure with automake-1.13
 Patch5: automake-missing.patch
+# docbParseFile is dropped in libxml2-2.9 amd later
+Patch6: kdewebdev-3.5.10-docbParseFile.patch
 
 %if %{make_cvs}
 BuildRequires: automake libtool
@@ -91,6 +93,7 @@ Requires: kdelibs3%{?_isa} >= %{version}
 %patch3 -p1 -b .fix-freehand-crash
 %patch4 -p1 -b .gcc46
 %patch5 -p1 -b .automake
+%patch6 -p1 -b .docbParseFile
 
 install -m644 -p %{SOURCE5} kxsldbg/
 
@@ -209,6 +212,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Mar 08 2013 Than Ngo <than at redhat.com> - 3.5.10-18
+- fix build failure with libxml2-2.9
+
 * Thu Mar 07 2013 Than Ngo <than at redhat.com> - 3.5.10-17
 - fix build failure with automake-1.13