diff options
| author | Remko van der Vossen | 2021-04-16 21:32:41 +0200 |
|---|---|---|
| committer | Remko van der Vossen | 2021-04-16 21:32:41 +0200 |
| commit | 278954b07ac39656787648e87d447d2caae67171 (patch) | |
| tree | 429899f38e5d53c602a9e4b89ec8b26597e77fd6 | |
| parent | 5534039dfa603545c8b2caca0b0f6b7ee8ede122 (diff) | |
xpdf: version 4.03
| -rwxr-xr-x | doc/xpdf/DETAILS | 4 | ||||
| -rw-r--r-- | doc/xpdf/HISTORY | 3 | ||||
| -rw-r--r-- | doc/xpdf/patches/noqt.patch | 23 |
3 files changed, 18 insertions, 12 deletions
diff --git a/doc/xpdf/DETAILS b/doc/xpdf/DETAILS index 6f53462a67..020f8dbe66 100755 --- a/doc/xpdf/DETAILS +++ b/doc/xpdf/DETAILS @@ -1,11 +1,11 @@ . "${GRIMOIRE}/CMAKE_FUNCTIONS" SPELL=xpdf - VERSION=4.02 + VERSION=4.03 SECURITY_PATCH=8 SOURCE=$SPELL-$VERSION.tar.gz SOURCE2=$SOURCE.sig SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - SOURCE_URL[0]="https://xpdfreader-dl.s3.amazonaws.com/${SOURCE}" + SOURCE_URL[0]="https://dl.xpdfreader.com/${SOURCE}" SOURCE2_URL[0]=${SOURCE_URL[0]}.sig WEB_SITE="https://www.xpdfreader.com/" SOURCE_GPG="xpdf.gpg:$SOURCE2:UPSTREAM_KEY" diff --git a/doc/xpdf/HISTORY b/doc/xpdf/HISTORY index 9f59f7c06d..f97eddcce4 100644 --- a/doc/xpdf/HISTORY +++ b/doc/xpdf/HISTORY @@ -1,3 +1,6 @@ +2021-04-16 Remko van der Vossen <wich@sourcemage.org> + * DETAILS, patches/noqt.patch: version 4.03 + 2019-10-07 Pavel Vinogradov <public@sourcemage.org> * BUILD: default_build -> cmake_build to build tools statically diff --git a/doc/xpdf/patches/noqt.patch b/doc/xpdf/patches/noqt.patch index 879104f314..8e5ef1f26e 100644 --- a/doc/xpdf/patches/noqt.patch +++ b/doc/xpdf/patches/noqt.patch @@ -1,6 +1,6 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt +diff -Naur xpdf-4.03-orig/CMakeLists.txt xpdf-4.03/CMakeLists.txt +--- xpdf-4.03-orig/CMakeLists.txt 2021-01-27 23:23:51.000000000 +0100 ++++ xpdf-4.03/CMakeLists.txt 2021-04-16 21:29:07.764217289 +0200 @@ -18,7 +18,6 @@ add_subdirectory(fofi) add_subdirectory(splash) @@ -20,20 +20,23 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt 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 @@ - - +diff -Naur 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-04-16 21:29:55.164217289 +0200 +@@ -207,64 +207,6 @@ + #--- look for libpng + 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 REQUIRED) +- find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork) -endif () -if(Qt5Widgets_FOUND) - message(STATUS "Qt5 found") |