office/fbpdf: Updated for version 20220624_6276360.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 49 insertions, 77 deletions

diff --git a/office/fbpdf/fbpdf.SlackBuild b/office/fbpdf/fbpdf.SlackBuild
index 90cec8c86b..a026dd0b85 100644
--- a/office/fbpdf/fbpdf.SlackBuild
+++ b/office/fbpdf/fbpdf.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230117 bkw: update to latest git, 20220624_6276360.
 # 20210927 bkw:
 # - update to latest git (20200617_f590024).
 # - rework navigation.diff for this version.
@@ -21,7 +22,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=fbpdf
-VERSION=${VERSION:-20200617_f590024}
+VERSION=${VERSION:-20220624_6276360}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -75,10 +76,8 @@ sed -i "s,-O2,$SLKCFLAGS," Makefile
 # The navigation patch has been sent upstream. In my opinion, fbpdf is
 # needlessly difficult to use without it. Upstream never responded to
 # my email (not even to say "no"). It's staying here though.
-# The manpage patch explains the difference between fbpdf, fbpdf2, fjdjvu.
 if [ "${PRISTINE:-no}" != "yes" ]; then
   patch -p1 < $CWD/navigation.diff
-  patch -p1 < $CWD/manpage.diff
 fi
 
 mkdir -p $PKG/usr/bin
diff --git a/office/fbpdf/fbpdf.info b/office/fbpdf/fbpdf.info
index ccb1dea522..9059211280 100644
--- a/office/fbpdf/fbpdf.info
+++ b/office/fbpdf/fbpdf.info
@@ -1,8 +1,8 @@
 PRGNAM="fbpdf"
-VERSION="20200617_f590024"
+VERSION="20220624_6276360"
 HOMEPAGE="http://litcave.rudi.ir/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/fbpdf-20200617_f590024.tar.xz"
-MD5SUM="859f0297f26aac8c5444cfb6a27caa79"
+DOWNLOAD="https://slackware.uk/~urchlay/src/fbpdf-20220624_6276360.tar.xz"
+MD5SUM="fb6419730947a515d52ae0e3021be3e2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/fbpdf/manpage.diff b/office/fbpdf/manpage.diff
deleted file mode 100644
index 2564933970..0000000000
--- a/office/fbpdf/manpage.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Naur fbpdf-20200617_f590024/fbpdf.1 fbpdf-20200617_f590024.patched/fbpdf.1
---- fbpdf-20200617_f590024/fbpdf.1	2021-09-27 04:15:02.000000000 -0400
-+++ fbpdf-20200617_f590024.patched/fbpdf.1	2021-09-27 19:26:45.529385168 -0400
-@@ -1,4 +1,4 @@
--.TH "fbpdf" 1       "2018\-01\-05" ""     "General Commands Manual"
-+.TH "fbpdf" 1       "2021\-09\-27" ""     "SlackBuilds.org"
- .SH NAME
- .B fbpdf
- \- view PDF files on the frame buffer
-@@ -9,6 +9,30 @@
- [\fB\-z\fR \fIzoom_x10\fR]
- [\fB\-p\fR \fIpage_number\fR]
- .I file.pdf
-+.br
-+.B fbpdf2
-+[\fB\-r\fR \fIrotation\fR]
-+[\fB\-z\fR \fIzoom_x10\fR]
-+[\fB\-p\fR \fIpage_number\fR]
-+.I file.pdf
-+.br
-+.B fbdjvu
-+[\fB\-r\fR \fIrotation\fR]
-+[\fB\-z\fR \fIzoom_x10\fR]
-+[\fB\-p\fR \fIpage_number\fR]
-+.I file.djvu
-+.SH DESCRIPTION
-+.PP
-+.B fbpdf
-+is a framebuffer PDF viewer, using the mupdf rendering library.
-+.br
-+.B fbpdf2
-+is a framebuffer PDF viewer, using the poppler rendering library.
-+.br
-+.B fbdjvu
-+is a framebuffer DjVu viewer, using the djvulibre rendering library.
-+.PP
-+All 3 of these take the same options and use the same keyboard commands.
- .SH OPTIONS
- .PP
- \fB\-r\fR \fIrotation\fR	Set rotation to \fIrotation\fR degrees.
-@@ -16,10 +40,8 @@
- \fB\-z\fR \fIzoom_x10\fR	Set zoom to ten times \fIzoom_x10\fR percent.
- .br
- \fB\-p\fR \fIpage_number\fR	Open \fIfile.pdf\fR to page \fIpage_number\fR.
--.SH DESCRIPTION
--.PP
--.B fbpdf
--is a framebuffer PDF and djvu viewer.  The following table lists the
-+.SH KEYS
-+The following table lists the
- key-bindings available in \fBfbpdf\fR.  Most of them accept a numerical prefix;
- for instance, \fB^F\fR tells \fBfbpdf\fR to show the next page while \fB5^F\fR
- tells it to show the fifth next page.
-@@ -34,6 +56,7 @@
- o	set page number (for 'G' command only)
- O	set page number and go to current page
- z	zoom; prefix multiplied by 10 (i.e. '15z' = 150%)
-+\&=	same as z
- r	set rotation in degrees
- i	print some information
- I	invert colors
diff --git a/office/fbpdf/navigation.diff b/office/fbpdf/navigation.diff
index 07b066b604..8b75179f0e 100644
--- a/office/fbpdf/navigation.diff
+++ b/office/fbpdf/navigation.diff
@@ -1,21 +1,54 @@
-diff -Naur fbpdf-20200617_f590024/README fbpdf-20200617_f590024.patched/README
---- fbpdf-20200617_f590024/README	2021-09-27 04:15:02.000000000 -0400
-+++ fbpdf-20200617_f590024.patched/README	2021-09-29 02:31:51.610212471 -0400
+diff -Naur fbpdf-20220624_6276360/README fbpdf-20220624_6276360.patched/README
+--- fbpdf-20220624_6276360/README	2023-01-17 03:30:48.000000000 -0500
++++ fbpdf-20220624_6276360.patched/README	2023-01-17 14:37:43.861749405 -0500
 @@ -21,7 +21,9 @@
  G		go to page (the last page if no prefix)
  o		set page number (for 'G' command only)
  O		set page number and go to current page
 -z		zoom; prefix multiplied by 10 (i.e. '15z' = 150%)
-+z/=	zoom; prefix multiplied by 10 (i.e. '12z' = 120%). Default 15.
++z/=	zoom; prefix multiplied by 10 (i.e. '15z' = 150%)
 ++		increase zoom by 10%
 +-		decrease zoom by 10%
  r		set rotation in degrees
  i		print some information
  I		invert colors
-diff -Naur fbpdf-20200617_f590024/fbpdf.c fbpdf-20200617_f590024.patched/fbpdf.c
---- fbpdf-20200617_f590024/fbpdf.c	2021-09-27 04:15:02.000000000 -0400
-+++ fbpdf-20200617_f590024.patched/fbpdf.c	2021-09-29 16:07:26.245764122 -0400
-@@ -269,6 +269,7 @@
+diff -Naur fbpdf-20220624_6276360/fbpdf.1 fbpdf-20220624_6276360.patched/fbpdf.1
+--- fbpdf-20220624_6276360/fbpdf.1	2023-01-17 03:30:48.000000000 -0500
++++ fbpdf-20220624_6276360.patched/fbpdf.1	2023-01-17 14:43:46.755764548 -0500
+@@ -1,4 +1,4 @@
+-.TH FBPDF 1 "JUNE 2022"
++.TH "fbpdf" 1       "2023\-01\-17" ""     "SlackBuilds.org"
+ .SH NAME
+ fbpdf \- framebuffer PDF viewer
+ .SH SYNOPSIS
+@@ -110,6 +110,9 @@
+ .B <prefix>z
+ Zoom by a multiple of ten in percentage (i.e. '15z' = 150%)
+ .TP
++.B <prefix>=
++Same as z
++.TP
+ .B <prefix>Z
+ Set the default zoom level for 'z' command
+ .TP
+@@ -140,6 +143,13 @@
+ .B ^l
+ Redraw screen
+ .TP
++.B +
++Increase zoom by 10%
++.TP
++.TP
++.B \-
++Decrease zoom by 10%
++.TP
+ .B q
+ Quit program
+ .SH AUTHOR
+diff -Naur fbpdf-20220624_6276360/fbpdf.c fbpdf-20220624_6276360.patched/fbpdf.c
+--- fbpdf-20220624_6276360/fbpdf.c	2023-01-17 03:30:48.000000000 -0500
++++ fbpdf-20220624_6276360.patched/fbpdf.c	2023-01-17 14:39:18.695321315 -0500
+@@ -270,6 +270,7 @@
  				srow = prow;
  			break;
  		case 'z':
@@ -23,7 +56,7 @@ diff -Naur fbpdf-20200617_f590024/fbpdf.c fbpdf-20200617_f590024.patched/fbpdf.c
  			count *= 10;
  			zoom_page(getcount(zoom_def));
  			break;
-@@ -319,10 +320,20 @@
+@@ -320,10 +321,20 @@
  		case ' ':
  		case CTRLKEY('d'):
  			srow += srows * getcount(1) - step;
@@ -44,7 +77,7 @@ diff -Naur fbpdf-20200617_f590024/fbpdf.c fbpdf-20200617_f590024.patched/fbpdf.c
  			break;
  		case '[':
  			scol = pcol;
-@@ -342,6 +353,14 @@
+@@ -343,6 +354,15 @@
  			invert = !invert;
  			loadpage(num);
  			break;
@@ -56,6 +89,7 @@ diff -Naur fbpdf-20200617_f590024/fbpdf.c fbpdf-20200617_f590024.patched/fbpdf.c
 +			count = 0;
 +			if(zoom > 0) zoom_page(zoom - 1);
 +			break;
++
  		default:	/* no need to redraw */
  			continue;
  		}