diff options
| author | Ørjan Malde <red@foxi.me> | 2020-07-03 19:56:01 +0200 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-07-03 18:57:14 +0100 |
| commit | 5a79529eaa3e2952afb1ed29e3ab30d8e7cdb36b (patch) | |
| tree | 9f6814713dd6ece981563de7f1c2c806b0a9906d /patches/xpdf-4.02_pre.local.patch | |
| parent | a5c457a45d6a98a4228a458a6926d9016dc5fa62 (diff) | |
| download | midipix_build-5a79529eaa3e2952afb1ed29e3ab30d8e7cdb36b.tar.bz2 midipix_build-5a79529eaa3e2952afb1ed29e3ab30d8e7cdb36b.tar.xz | |
groups/231.native_packages_etc.group: adds xpdf v4.02
Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
Diffstat (limited to 'patches/xpdf-4.02_pre.local.patch')
| -rw-r--r-- | patches/xpdf-4.02_pre.local.patch | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/patches/xpdf-4.02_pre.local.patch b/patches/xpdf-4.02_pre.local.patch new file mode 100644 index 00000000..c894b0b9 --- /dev/null +++ b/patches/xpdf-4.02_pre.local.patch @@ -0,0 +1,79 @@ +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 () |