summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--parallel-skip-rst-pdf-generation.patch50
3 files changed, 25 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f8af5afab449..f3fb318ca118 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = parallel-git
pkgdesc = A shell tool for executing jobs in parallel
- pkgver = 20210922.r0.123126f6
+ pkgver = 20220322.r0.58d14374
pkgrel = 1
url = https://www.gnu.org/software/parallel/
arch = i686
@@ -14,6 +14,6 @@ pkgbase = parallel-git
source = parallel::git+https://git.savannah.gnu.org/git/parallel.git
source = parallel-skip-rst-pdf-generation.patch
sha256sums = SKIP
- sha256sums = 68f6b51d3cad78498f96f2ab53287027492d26a8df056404323c27bdd1cc301f
+ sha256sums = 8bdee3bd4ef7de26cc63424b1276ace7c8c9e1a936937d4d752d5a827ed85f1e
pkgname = parallel-git
diff --git a/PKGBUILD b/PKGBUILD
index 3ee1bb08de84..ed45c78f1d2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Angel de Vicente <angel.vicente.garrido at gmail dot com>
pkgname="parallel-git"
-pkgver=20210922.r0.123126f6
+pkgver=20220322.r0.58d14374
pkgrel=1
pkgdesc="A shell tool for executing jobs in parallel"
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ source=("${pkgname%-git}::git+https://git.savannah.gnu.org/git/parallel.git"
"parallel-skip-rst-pdf-generation.patch")
sha256sums=('SKIP'
- '68f6b51d3cad78498f96f2ab53287027492d26a8df056404323c27bdd1cc301f')
+ '8bdee3bd4ef7de26cc63424b1276ace7c8c9e1a936937d4d752d5a827ed85f1e')
pkgver() {
cd "${pkgname%-git}"
diff --git a/parallel-skip-rst-pdf-generation.patch b/parallel-skip-rst-pdf-generation.patch
index 619ff42c767d..69acbbc98fab 100644
--- a/parallel-skip-rst-pdf-generation.patch
+++ b/parallel-skip-rst-pdf-generation.patch
@@ -1,14 +1,5 @@
-From 9ba90d396c4094e6fbbf0078017bced32fb14179 Mon Sep 17 00:00:00 2001
-From: Angel de Vicente <angel.de.vicente@iac.es>
-Date: Sun, 10 Oct 2021 10:11:28 +0100
-Subject: [PATCH] Avoid generation of .rst and .pdf
-
----
- src/Makefile.am | 119 +-----------------------------------------------
- 1 file changed, 2 insertions(+), 117 deletions(-)
-
diff --git a/src/Makefile.am b/src/Makefile.am
-index eb2e4239..6e21640c 100644
+index 787e12eb..f32a0861 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,15 +23,7 @@ doc_DATA = parallel.html env_parallel.html sem.html sql.html \
@@ -23,61 +14,61 @@ index eb2e4239..6e21640c 100644
- parallel.pdf env_parallel.pdf sem.pdf sql.pdf niceload.pdf \
- parallel_tutorial.pdf parallel_book.pdf parallel_design.pdf \
- parallel_alternatives.pdf parcat.pdf parset.pdf parsort.pdf \
-- parallel_cheat_bw.pdf
+- parallel_cheat_bw.pdf parallel_options_map.pdf
+ parset.texi parsort.texi
endif
web: sphinx
-@@ -245,106 +237,6 @@ parsort.texi: parsort
+@@ -245,110 +237,6 @@ parsort.texi: parsort
pod2texi --output="$(srcdir)"/parsort.texi "$(srcdir)"/parsort \
|| echo "Warning: pod2texi not found. Using old parsort.texi"
-parallel.rst: parallel.pod
-- pod2rst --outfile "$(srcdir)"/parallel.rst --infile="$(srcdir)"/parallel.pod \
+- ./pod2rst-fix < "$(srcdir)"/parallel.pod > "$(srcdir)"/parallel.rst \
- || echo "Warning: pod2rst not found. Using old parallel.rst"
-
-env_parallel.rst: env_parallel.pod
-- pod2rst --outfile "$(srcdir)"/env_parallel.rst --infile="$(srcdir)"/env_parallel.pod \
+- ./pod2rst-fix < "$(srcdir)"/env_parallel.pod > "$(srcdir)"/env_parallel.rst \
- || echo "Warning: pod2rst not found. Using old env_parallel.rst"
-
-parallel_tutorial.rst: parallel_tutorial.pod
-- pod2rst --outfile "$(srcdir)"/parallel_tutorial.rst --infile="$(srcdir)"/parallel_tutorial.pod \
+- ./pod2rst-fix < "$(srcdir)"/parallel_tutorial.pod > "$(srcdir)"/parallel_tutorial.rst \
- || echo "Warning: pod2rst not found. Using old parallel_tutorial.rst"
-
-parallel_book.rst: parallel_book.pod
-- pod2rst --outfile "$(srcdir)"/parallel_book.rst --infile="$(srcdir)"/parallel_book.pod \
+- ./pod2rst-fix "$(srcdir)"/parallel_book.pod > "$(srcdir)"/parallel_book.rst \
- || echo "Warning: pod2rst not found. Using old parallel_book.rst"
-
-parallel_design.rst: parallel_design.pod
-- pod2rst --outfile "$(srcdir)"/parallel_design.rst --infile="$(srcdir)"/parallel_design.pod \
+- ./pod2rst-fix "$(srcdir)"/parallel_design.pod > "$(srcdir)"/parallel_design.rst \
- || echo "Warning: pod2rst not found. Using old parallel_design.rst"
-
-parallel_alternatives.rst: parallel_alternatives.pod
-- pod2rst --outfile "$(srcdir)"/parallel_alternatives.rst --infile="$(srcdir)"/parallel_alternatives.pod \
+- ./pod2rst-fix "$(srcdir)"/parallel_alternatives.pod > "$(srcdir)"/parallel_alternatives.rst \
- || echo "Warning: pod2rst not found. Using old parallel_alternatives.rst"
-
-sem.rst: sem.pod
-- pod2rst --outfile "$(srcdir)"/sem.rst --infile="$(srcdir)"/sem.pod \
+- ./pod2rst-fix "$(srcdir)"/sem.pod > "$(srcdir)"/sem.rst \
- || echo "Warning: pod2rst not found. Using old sem.rst"
-
-sql.rst: sql
-- pod2rst --outfile "$(srcdir)"/sql.rst --infile="$(srcdir)"/sql \
+- ./pod2rst-fix "$(srcdir)"/sql > "$(srcdir)"/sql.rst \
- || echo "Warning: pod2rst not found. Using old sql.rst"
-
-niceload.rst: niceload.pod
-- pod2rst --outfile "$(srcdir)"/niceload.rst --infile="$(srcdir)"/niceload.pod \
+- ./pod2rst-fix "$(srcdir)"/niceload.pod > "$(srcdir)"/niceload.rst \
- || echo "Warning: pod2rst not found. Using old niceload.rst"
-
-parcat.rst: parcat.pod
-- pod2rst --outfile "$(srcdir)"/parcat.rst --infile="$(srcdir)"/parcat.pod \
+- ./pod2rst-fix "$(srcdir)"/parcat.pod > "$(srcdir)"/parcat.rst \
- || echo "Warning: pod2rst not found. Using old parcat.rst"
-
-parset.rst: parset.pod
-- pod2rst --outfile "$(srcdir)"/parset.rst --infile="$(srcdir)"/parset.pod \
+- ./pod2rst-fix "$(srcdir)"/parset.pod > "$(srcdir)"/parset.rst \
- || echo "Warning: pod2rst not found. Using old parset.rst"
-
-parsort.rst: parsort
-- pod2rst --outfile "$(srcdir)"/parsort.rst --infile="$(srcdir)"/parsort \
+- ./pod2rst-fix "$(srcdir)"/parsort > "$(srcdir)"/parsort.rst \
- || echo "Warning: pod2rst not found. Using old parsort.rst"
-
-parallel.pdf: parallel.pod
@@ -132,10 +123,14 @@ index eb2e4239..6e21640c 100644
- libreoffice --headless --convert-to pdf parallel_cheat_bw.fodt \
- || echo "Warning: libreoffice failed. Using old parallel_cheat_bw.pdf"
-
+-parallel_options_map.pdf: parallel.pod pod2graph
+- ./pod2graph parallel.pod > parallel_options_map.pdf \
+- || echo "Warning: pod2graph failed. Using old parallel_options_map.pdf"
+-
sem: parallel
ln -fs parallel sem
-@@ -358,14 +250,7 @@ DISTCLEANFILES = parallel.1 env_parallel.1 sem.1 sql.1 niceload.1 \
+@@ -362,14 +250,7 @@ DISTCLEANFILES = parallel.1 env_parallel.1 sem.1 sql.1 niceload.1 \
sem.texi sql.texi niceload.texi parallel_tutorial.texi \
parallel_book.texi parallel_design.texi \
parallel_alternatives.texi parcat.texi parset.texi \
@@ -146,11 +141,8 @@ index eb2e4239..6e21640c 100644
- parallel.pdf env_parallel.pdf sem.pdf sql.pdf niceload.pdf \
- parallel_tutorial.pdf parallel_book.pdf parallel_design.pdf \
- parallel_alternatives.pdf parcat.pdf parset.pdf parsort.pdf \
-- parallel_cheat_bw.pdf
+- parallel_cheat_bw.pdf parallel_options_map.pdf
+ parsort.texi
EXTRA_DIST = parallel sem sql niceload parcat parset parsort \
env_parallel env_parallel.ash env_parallel.bash \
---
-2.33.0
-