diff options
| author | Ørjan Malde <red@foxi.me> | 2024-08-08 22:56:15 +0200 |
|---|---|---|
| committer | Ørjan Malde <red@foxi.me> | 2024-08-08 22:56:15 +0200 |
| commit | 9c297c5747b058571be85ed3b707ec948ccea6b2 (patch) | |
| tree | 3e0974243f9c9e834c3d99420323d34e96794e8b | |
| parent | ca1af5863f2453241e57e4903d53ec84c0440a23 (diff) | |
| download | midipix_build-9c297c5747b058571be85ed3b707ec948ccea6b2.tar.bz2 midipix_build-9c297c5747b058571be85ed3b707ec948ccea6b2.tar.xz | |
groups.d/231.native_packages_etc.d/xpdf.package: bump to v4.05
Signed-off-by: Ørjan Malde <red@foxi.me>
| -rw-r--r-- | groups.d/231.native_packages_etc.d/xpdf.package | 7 | ||||
| -rw-r--r-- | patches/xpdf-4.03_pre.local.patch | 81 |
2 files changed, 4 insertions, 84 deletions
diff --git a/groups.d/231.native_packages_etc.d/xpdf.package b/groups.d/231.native_packages_etc.d/xpdf.package index bdd9fe9e..756dfdaf 100644 --- a/groups.d/231.native_packages_etc.d/xpdf.package +++ b/groups.d/231.native_packages_etc.d/xpdf.package @@ -1,11 +1,12 @@ : ${PKG_XPDF_DEPENDS:="fontconfig libz"}; -: ${PKG_XPDF_SHA256SUM:=0fe4274374c330feaadcebb7bd7700cb91203e153b26aa95952f02bf130be846}; -: ${PKG_XPDF_VERSION:=4.03}; +: ${PKG_XPDF_SHA256SUM:=92707ed5acb6584fbd73f34091fda91365654ded1f31ba72f0970022cf2a5cea}; +: ${PKG_XPDF_VERSION:=4.05}; : ${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 -DFREETYPE_INCLUDE_DIR_ft2build=${PREFIX_NATIVE}/include/ft2build - -DFONTCONFIG_LIBRARY=${PREFIX_NATIVE}/lib/libfontconfig.lib.a"}; + -DFONTCONFIG_LIBRARY=${PREFIX_NATIVE}/lib/libfontconfig.lib.a + -DCMAKE_CXX_FLAGS=-std=gnu++0x"}; ex_pkg_register "xpdf" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages"; diff --git a/patches/xpdf-4.03_pre.local.patch b/patches/xpdf-4.03_pre.local.patch deleted file mode 100644 index 4f329f68..00000000 --- a/patches/xpdf-4.03_pre.local.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -ru xpdf-4.03.orig/cmake-config.txt xpdf-4.03/cmake-config.txt ---- xpdf-4.03.orig/cmake-config.txt 2021-01-27 23:23:51.000000000 +0100 -+++ xpdf-4.03/cmake-config.txt 2021-07-21 21:24:10.085991109 +0200 -@@ -208,63 +208,6 @@ - find_package(PNG) - - -- -- --#--- look for Qt --find_package(Qt5Widgets QUIET) --if (Qt5Widgets_FOUND) -- find_package(Qt5Network) -- find_package(Qt5PrintSupport) --else () -- find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork) --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 () |