groups/231.native_packages_etc.group: xpdf: bump to v4.03

Signed-off-by: Ørjan Malde <red@foxi.me>

3 files changed, 16 insertions, 81 deletions

diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index 80a50297..9890f70e 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -471,8 +471,8 @@ zstd")";
 : ${PKG_XORRISO_URL:=https://www.gnu.org/software/xorriso/xorriso-${PKG_XORRISO_VERSION}.tar.gz};
 : ${PKG_XORRISO_IN_TREE:=1};
 : ${PKG_XPDF_DEPENDS:="fontconfig libz"};
-: ${PKG_XPDF_SHA256SUM:=52d51dc943b9614b8da66e8662b3031a3c82dc25bfc792eac6b438aa36d549a4};
-: ${PKG_XPDF_VERSION:=4.02};
+: ${PKG_XPDF_SHA256SUM:=0fe4274374c330feaadcebb7bd7700cb91203e153b26aa95952f02bf130be846};
+: ${PKG_XPDF_VERSION:=4.03};
 : ${PKG_XPDF_URL:=https://dl.xpdfreader.com/xpdf-${PKG_XPDF_VERSION}.tar.gz};
 : ${PKG_XPDF_CMAKE_ARGS_EXTRA:="
 	-DFREETYPE_LIBRARY=${PREFIX_NATIVE}/lib/libfreetype.lib.a
diff --git a/patches/xpdf-4.02_pre.local.patch b/patches/xpdf-4.02_pre.local.patch
deleted file mode 100644
index c894b0b9..00000000
--- a/patches/xpdf-4.02_pre.local.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -ru xpdf-4.02.orig/cmake-config.txt xpdf-4.02/cmake-config.txt
---- xpdf-4.02.orig/cmake-config.txt	2019-09-25 21:54:33.000000000 +0200
-+++ xpdf-4.02/cmake-config.txt	2020-07-03 18:17:21.191267235 +0200
-@@ -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
-diff -ru xpdf-4.02.orig/CMakeLists.txt xpdf-4.02/CMakeLists.txt
---- xpdf-4.02.orig/CMakeLists.txt	2019-09-25 21:54:33.000000000 +0200
-+++ xpdf-4.02/CMakeLists.txt	2020-07-03 18:16:19.639269162 +0200
-@@ -28,10 +28,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/patches/xpdf-4.03_pre.local.patch b/patches/xpdf-4.03_pre.local.patch
new file mode 100644
index 00000000..e9327954
--- /dev/null
+++ b/patches/xpdf-4.03_pre.local.patch
@@ -0,0 +1,14 @@
+diff -ru xpdf-4.02.orig/CMakeLists.txt xpdf-4.02/CMakeLists.txt
+--- xpdf-4.02.orig/CMakeLists.txt	2019-09-25 21:54:33.000000000 +0200
++++ xpdf-4.02/CMakeLists.txt	2020-07-03 18:16:19.639269162 +0200
+@@ -28,10 +28,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 ()