overlays/public-inbox: update for 1.9.0

3 files changed, 9 insertions, 37 deletions

diff --git a/overlays/patches/public-inbox/0001-view-don-t-show-page-if-no-links-follow-it.patch b/overlays/patches/public-inbox/0001-view-don-t-show-page-if-no-links-follow-it.patch
deleted file mode 100644
index 50625a0f780c..000000000000
--- a/overlays/patches/public-inbox/0001-view-don-t-show-page-if-no-links-follow-it.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 43a7993ca9a6cf3b410adf4449580033ff19a4c9 Mon Sep 17 00:00:00 2001
-From: Alyssa Ross <hi@alyssa.is>
-Date: Thu, 16 Jan 2020 18:08:33 +0000
-Subject: [PATCH 1/2] view: don't show `page:' if no links follow it
-
----
- lib/PublicInbox/View.pm | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
-index b90cb08b..193e9a48 100644
---- a/lib/PublicInbox/View.pm
-+++ b/lib/PublicInbox/View.pm
-@@ -1189,7 +1189,9 @@ sub pagination_footer ($$) {
- 		$next = $next ? "$next | " : '             | ';
- 		$prev .= qq[ | <a\nhref="$latest">latest</a>];
- 	}
--	"<hr><pre>page: $next$prev</pre>";
-+	if ($prev || $next) {
-+		"<hr><pre>page: $next$prev</pre>";
-+	}
- }
- 
- sub paginate_recent ($$) {
--- 
-2.35.1
-
diff --git a/overlays/patches/public-inbox/0002-wwwtext-make-source-info-configurable.patch b/overlays/patches/public-inbox/0001-wwwtext-make-source-info-configurable.patch
index 895b0925450c..401e3f8a72cc 100644
--- a/overlays/patches/public-inbox/0002-wwwtext-make-source-info-configurable.patch
+++ b/overlays/patches/public-inbox/0001-wwwtext-make-source-info-configurable.patch
@@ -1,7 +1,7 @@
-From f930ec868a8596b0d30305ce76f86ed625e40d0a Mon Sep 17 00:00:00 2001
+From 1fadaba96bd64ef113bfe37e14925b627ec2940e Mon Sep 17 00:00:00 2001
 From: Alyssa Ross <hi@alyssa.is>
 Date: Fri, 17 Jan 2020 15:21:42 +0000
-Subject: [PATCH 2/2] wwwtext: make source info configurable
+Subject: [PATCH] wwwtext: make source info configurable
 
 ---
  Documentation/public-inbox-config.pod |  6 ++++++
@@ -9,10 +9,10 @@ Subject: [PATCH 2/2] wwwtext: make source info configurable
  2 files changed, 24 insertions(+), 1 deletion(-)
 
 diff --git a/Documentation/public-inbox-config.pod b/Documentation/public-inbox-config.pod
-index 43e54ed4..195c2886 100644
+index d8504e61..420b5c01 100644
 --- a/Documentation/public-inbox-config.pod
 +++ b/Documentation/public-inbox-config.pod
-@@ -194,6 +194,12 @@ and the path may be "/dev/null" or any empty file.
+@@ -196,6 +196,12 @@ and the path may be "/dev/null" or any empty file.
  Multiple files may be specified and will be included in the
  order specified.
  
@@ -26,10 +26,10 @@ index 43e54ed4..195c2886 100644
  
  This may be set to C<none> to disable the use of SpamAssassin
 diff --git a/lib/PublicInbox/WwwText.pm b/lib/PublicInbox/WwwText.pm
-index 2b4e69fe..e3aec9e6 100644
+index c6957e81..fa22ab94 100644
 --- a/lib/PublicInbox/WwwText.pm
 +++ b/lib/PublicInbox/WwwText.pm
-@@ -302,6 +302,21 @@ note: .onion URLs require Tor: https://www.torproject.org/
+@@ -309,6 +309,21 @@ note: .onion URLs require Tor: https://www.torproject.org/
  EOM
  }
  
@@ -51,7 +51,7 @@ index 2b4e69fe..e3aec9e6 100644
  sub _mirror_help ($$) {
  	my ($ctx, $txt) = @_;
  	my $ibx = $ctx->{ibx};
-@@ -383,9 +398,11 @@ EOF
+@@ -390,9 +405,11 @@ EOF
  	_add_onion_note($txt);
  
  	my $code_url = prurl($ctx->{env}, $PublicInbox::WwwStream::CODE_URL);
@@ -65,5 +65,5 @@ index 2b4e69fe..e3aec9e6 100644
  }
  
 -- 
-2.35.1
+2.40.1
 
diff --git a/overlays/patches/public-inbox/default.nix b/overlays/patches/public-inbox/default.nix
index 37ee7ca4fab1..e2d53933132a 100644
--- a/overlays/patches/public-inbox/default.nix
+++ b/overlays/patches/public-inbox/default.nix
@@ -2,7 +2,6 @@
 
 public-inbox.overrideAttrs ({ patches ? [], ... }: {
   patches = patches ++ [
-    ./0001-view-don-t-show-page-if-no-links-follow-it.patch
-    ./0002-wwwtext-make-source-info-configurable.patch
+    ./0001-wwwtext-make-source-info-configurable.patch
   ];
 })