doc/xpdf: version 4.02

4 files changed, 98 insertions, 1 deletions

diff --git a/doc/xpdf/DETAILS b/doc/xpdf/DETAILS
index 941f190354..6f53462a67 100755
--- a/doc/xpdf/DETAILS
+++ b/doc/xpdf/DETAILS
@@ -1,6 +1,6 @@
 . "${GRIMOIRE}/CMAKE_FUNCTIONS"
            SPELL=xpdf
-         VERSION=4.01.01
+         VERSION=4.02
   SECURITY_PATCH=8
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
diff --git a/doc/xpdf/HISTORY b/doc/xpdf/HISTORY
index 1200b3910e..d68f1c4304 100644
--- a/doc/xpdf/HISTORY
+++ b/doc/xpdf/HISTORY
@@ -1,3 +1,7 @@
+2019-09-26 Pavel Vinogradov <public@sourcemage.org>
+	* DETAILS: version 4.02
+	* PRE_BUILD, patches/noqt.patch: added to build without Qt
+
 2019-08-21 Ismael Luceno <ismael@sourcemage.org>
 	* BUILD: Fixed building of the UI
 
diff --git a/doc/xpdf/PRE_BUILD b/doc/xpdf/PRE_BUILD
new file mode 100755
index 0000000000..eb8afce7ff
--- /dev/null
+++ b/doc/xpdf/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build  &&
+cd  "${SOURCE_DIRECTORY}" &&
+
+if ! is_depends_enabled "${SPELL}" "qtbase"; then
+  apply_patch_dir patches
+fi
diff --git a/doc/xpdf/patches/noqt.patch b/doc/xpdf/patches/noqt.patch
new file mode 100644
index 0000000000..879104f314
--- /dev/null
+++ b/doc/xpdf/patches/noqt.patch
@@ -0,0 +1,87 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -18,7 +18,6 @@
+ add_subdirectory(fofi)
+ add_subdirectory(splash)
+ add_subdirectory(xpdf)
+-add_subdirectory(xpdf-qt)
+ 
+ if (NOT HAVE_FREETYPE_H)
+   message(WARNING "Couldn't find FreeType -- will not build pdftoppm, pdftopng, pdftohtml, or xpdf.")
+@@ -28,10 +27,6 @@
+   message(WARNING "Couldn't find libpng -- will not build pdftopng or pdftohtml.")
+ endif ()
+ 
+-if (NOT QT4_FOUND AND NOT Qt5Widgets_FOUND)
+-  message(WARNING "Couldn't find Qt4 or Qt5 -- will not build xpdf.")
+-endif ()
+-
+ if (NOT MULTITHREADED)
+   message(WARNING "Multithreading is disabled -- will not build xpdf.")
+ endif ()
+diff --git a/cmake-config.txt b/cmake-config.txt
+--- a/cmake-config.txt
++++ b/cmake-config.txt
+@@ -188,61 +188,6 @@
+ 
+ 
+ 
+-#--- look for Qt
+-find_package(Qt5Widgets QUIET)
+-if (Qt5Widgets_FOUND)
+-  find_package(Qt5Network)
+-  find_package(Qt5PrintSupport)
+-else ()
+-  find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED)
+-endif ()
+-if(Qt5Widgets_FOUND)
+-  message(STATUS "Qt5 found")
+-  if (XPDFWIDGET_PRINTING)
+-    set(QT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5PrintSupport_INCLUDE_DIRS}")
+-    set(QT_DEFINITIONS "${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS} ${Qt5PrintSupport_DEFINITIONS}")
+-    set(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::PrintSupport)
+-  else ()
+-    set(QT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}")
+-    set(QT_DEFINITIONS "${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS}")
+-    set(QT_LIBRARIES Qt5::Widgets Qt5::Network)
+-  endif ()
+-  if (XPDFWIDGET_PRINTING)
+-    if (APPLE)
+-      set(EXTRA_QT_LIBRARIES "-framework ApplicationServices")
+-    elseif (UNIX)
+-      find_package(Cups)
+-      if (CUPS_FOUND)
+-        set(EXTRA_QT_LIBRARIES ${CUPS_LIBRARIES})
+-      else ()
+-        set (XPDFWIDGET_PRINTING OFF)
+-      endif ()
+-    else ()
+-      set(EXTRA_QT_LIBRARIES "")
+-    endif ()
+-  endif ()
+-  # remove "-fPIE" here because we added "-fPIC" above
+-  string(REPLACE "-fPIE" "" QT_CFLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+-elseif(QT4_FOUND)
+-  message(STATUS "Qt4 found")
+-  if (XPDFWIDGET_PRINTING)
+-    if (APPLE)
+-      set(EXTRA_QT_LIBRARIES "-framework ApplicationServices")
+-    elseif (UNIX)
+-      find_package(Cups)
+-      if (CUPS_FOUND)
+-        set(EXTRA_QT_LIBRARIES ${CUPS_LIBRARIES})
+-      else ()
+-        set (XPDFWIDGET_PRINTING OFF)
+-      endif ()
+-    else ()
+-      set(EXTRA_QT_LIBRARIES "")
+-    endif ()
+-  endif ()
+-else()
+-  message(STATUS "No Qt library found")
+-endif()
+-
+ #--- look for libpaper
+ find_library(PAPER_LIBRARY
+              NAMES paper libpaper