Remove now unused libxml2 dependency

3rdparty/cmake/FindLibXML2.cmake

@@ -1,29 +0,0 @@
-# - Try to find LibXml2
-# Once done this will define
-#  LIBXML2_FOUND - System has LibXml2
-#  LIBXML2_INCLUDE_DIRS - The LibXml2 include directories
-#  LIBXML2_LIBRARIES - The libraries needed to use LibXml2
-#  LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2
-
-find_package(PkgConfig)
-pkg_check_modules(PC_LIBXML QUIET libxml-2.0)
-set(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER})
-
-find_path(LIBXML2_INCLUDE_DIR libxml/xpath.h
-          HINTS ${PC_LIBXML_INCLUDEDIR} ${PC_LIBXML_INCLUDE_DIRS}
-          PATH_SUFFIXES libxml2 )
-
-find_library(LIBXML2_LIBRARY NAMES xml2 libxml2
-             HINTS ${PC_LIBXML_LIBDIR} ${PC_LIBXML_LIBRARY_DIRS} )
-
-set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY} )
-set(LIBXML2_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR} )
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(LibXml2  DEFAULT_MSG
-                                  LIBXML2_LIBRARY LIBXML2_INCLUDE_DIR)
-
-mark_as_advanced(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARY )
-

CMakeLists.txt

@@ -30,7 +30,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/3rdparty/cmake)
 
 #find_program( QT_QMAKE_EXECUTABLE NAMES qmake5 qmake-qt5 qmake-mac )
 find_package( Qt5 5.5.0 COMPONENTS Core Gui Network Widgets WebKitWidgets Xml XmlPatterns LinguistTools REQUIRED )
-find_package( LibXML2 )
 
 file( GLOB FB2_HEAD source/*.hpp     )
 file( GLOB FB2_SRCS source/*.cpp     )
@@ -72,16 +71,9 @@ add_executable(fb2edit ${FB2_SRCS} ${FB2_HEAD} ${UI_HEADERS} ${MOC_SRCS} ${RCC_S
 include_directories(${CMAKE_BINARY_DIR})
 target_link_libraries(fb2edit PUBLIC
     Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets Qt5::WebKitWidgets Qt5::Xml Qt5::XmlPatterns
-    ${LIBXML2_LIBRARIES}
     )
 #add_definitions(${QT_DEFINITIONS})
 
-include_directories(${LIBXML2_INCLUDE_DIRS})
-if (LIBXML2_FOUND) 
-    add_definitions(${LIBXML2_DEFINITIONS})
-    add_definitions(-DFB2_USE_LIBXML2)
-endif (LIBXML2_FOUND) 
-   
 #############################################################################
 # You can change the install location by 
 # running cmake like this:

debian/control

@@ -2,7 +2,7 @@ Source: fb2edit
 Section: x11
 Priority: optional
 Maintainer: Kandrashin Denis <mail@lintest.ru>
-Build-Depends: debhelper (>= 7), cmake, cdbs, libqt4-dev (>= 4.6), libxml2-dev
+Build-Depends: debhelper (>= 7), cmake, cdbs, libqt4-dev (>= 4.6)
 Standards-Version: 3.8.0
 Homepage: http://fb2edit.lintest.ru
 

fb2edit.pro

@@ -80,14 +80,6 @@ OTHER_FILES += \
     3rdparty/fb2/FictionBookGenres.xsd \
     3rdparty/fb2/FictionBook2.1.xsd
 
-if (unix) {
-
-    DEFINES += FB2_USE_LIBXML2
-    INCLUDEPATH += /usr/include/libxml2
-    LIBS += -lxml2
-
-}
-
 FORMS += \
     source/fb2find.ui \
     source/fb2setup.ui

rpmbuild/fb2edit.spec

@@ -26,7 +26,6 @@ BuildRequires:  pkgconfig(QtGui) >= 4.6.0
 BuildRequires:  pkgconfig(QtNetwork) >= 4.6.0
 BuildRequires:  pkgconfig(QtWebKit) >= 4.6.0
 BuildRequires:  pkgconfig(QtXml) >= 4.6.0
-BuildRequires:  pkgconfig(libxml-2.0)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %if 0%{?suse_version}

source/fb2read.cpp

@@ -50,32 +50,20 @@ bool FbReadThread::parse()
     connect(&handler, SIGNAL(error(int,int,QString)), parent(), SIGNAL(error(int,int,QString)));
     connect(&handler, SIGNAL(fatal(int,int,QString)), parent(), SIGNAL(fatal(int,int,QString)));
 
-#ifdef FB2_USE_LIBXML2
     XML2::XmlReader reader;
-#else
-    QXmlSimpleReader reader;
-#endif
 
     reader.setContentHandler(&handler);
     reader.setLexicalHandler(&handler);
     reader.setErrorHandler(&handler);
 
-#ifdef FB2_USE_LIBXML2
     if (m_device) {
         return reader.parse(m_device);
     } else {
         return reader.parse(m_source);
     }
-#else
-    if (m_device) {
-        m_source = new QXmlInputSource();
-        m_source->setData(m_device->readAll());
-    }
-    return reader.parse(m_source);
-#endif
 }
 
-/*
+#if 0
 FbReadThread::FbReadThread(QObject *parent, const QString &filename, const QString &xml)
     : QThread(parent)
     , m_temp(0)
@@ -98,8 +86,6 @@ void FbReadThread::run()
     if (parse()) emit html(m_html);
 }
 
-#ifdef FB2_USE_LIBXML2
-
 bool FbReadThread::parse()
 {
     QXmlStreamWriter writer(&m_html);
@@ -121,36 +107,8 @@ bool FbReadThread::parse()
         return reader.parse(source);
     }
 }
-
-#else
-
-bool FbReadThread::parse()
-{
-    QXmlStreamWriter writer(&m_html);
-    FbReadHandler handler(*this, writer);
-    connect(&handler, SIGNAL(binary(QString,QByteArray)), this, SLOT(data(QString,QByteArray)));
-    QXmlSimpleReader reader;
-    reader.setContentHandler(&handler);
-    reader.setLexicalHandler(&handler);
-    reader.setErrorHandler(&handler);
-    QXmlInputSource source;
-    if (m_xml.isEmpty()) {
-        QFile file(m_filename);
-        if (!file.open(QFile::ReadOnly | QFile::Text)) {
-            qCritical() << QObject::tr("Cannot read file %1: %2.").arg(m_filename).arg(file.errorString());
-            return false;
-        }
-        source.setData(file.readAll());
-    } else {
-        source.setData(m_xml);
-    }
-    return reader.parse(source);
-}
-
 #endif
 
-*/
-
 //---------------------------------------------------------------------------
 //  FbReadHandler::RootHandler
 //---------------------------------------------------------------------------
@@ -373,11 +331,7 @@ bool FbReadHandler::load(QObject *page, QString &source, QString &html)
 
     connect(&handler, SIGNAL(binary(QString,QByteArray)), page, SLOT(binary(QString,QByteArray)));
 
-#ifdef FB2_USE_LIBXML2
     XML2::XmlReader reader;
-#else
-    QXmlSimpleReader reader;
-#endif
 
     reader.setContentHandler(&handler);
     reader.setLexicalHandler(&handler);

source/fb2xml2.cpp

@@ -1,7 +1,5 @@
 #include "fb2xml2.h"
 
-#ifdef FB2_USE_LIBXML2
-
 #include <cstring>
 #include <QtDebug>
 
@@ -189,5 +187,3 @@ bool XmlReader::parse(QIODevice *input)
 }
 
 } // namespace XML2
-
-#endif // FB2_USE_LIBXML2

source/fb2xml2.h

@@ -1,8 +1,6 @@
 #ifndef FB2XML2_H
 #define FB2XML2_H
 
-#ifdef FB2_USE_LIBXML2
-
 #include <QtXml>
 #include "fb2xml.hpp"
 
@@ -43,6 +41,4 @@ private:
 
 } // namespace XML2
 
-#endif // FB2_USE_LIBXML2
-
 #endif // FB2XML2_H

ubuntu.sh

@@ -26,11 +26,10 @@ mkdir ../osc_${PROJECT}
 mv ../*squeeze* ../osc_${PROJECT}
 cp ../${PROJECT}_${VERSION}.orig.tar.bz2 ../osc_${PROJECT}
 
-cat ../../debian/control | sed 's/libxml2-dev/libqtwebkit-dev, libxml2-dev/' > debian/control
+cat ../../debian/control | sed 's/cdbs/cdbs, libqtwebkit-dev/' > debian/control
 for DISTRIB in $LIST;
 do
   echo "${PROJECT} (${VERSION}-${DISTRIB}${NUMBER}) ${DISTRIB}; urgency=low" > debian/changelog
   cat ../../debian/changelog | sed '1d'>> debian/changelog
   debuild -S -sa
 done
-