Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (278954b07ac39656787648e87d447d2caae67171)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (278954b07ac39656787648e87d447d2caae67171)
  • Date: Fri, 16 Apr 2021 19:34:06 +0000

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

doc/xpdf/DETAILS | 4 ++--
doc/xpdf/HISTORY | 3 +++
doc/xpdf/patches/noqt.patch | 23 +++++++++++++----------
3 files changed, 18 insertions(+), 12 deletions(-)

New commits:
commit 278954b07ac39656787648e87d447d2caae67171
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

xpdf: version 4.03

diff --git a/doc/xpdf/DETAILS b/doc/xpdf/DETAILS
index 6f53462..020f8db 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 9f59f7c..f97eddc 100644
--- a/doc/xpdf/HISTORY
+++ b/doc/xpdf/HISTORY
@@ -1,3 +1,6 @@
+2021-04-16 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS, patches/noqt.patch: version 4.03
+
2019-10-07 Pavel Vinogradov <public AT 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 879104f..8e5ef1f 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")



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (278954b07ac39656787648e87d447d2caae67171), Remko van der Vossen, 04/16/2021

Archive powered by MHonArc 2.6.24.

Top of Page