upgrade to version 3.3.3

3 files changed, 6 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 949c73bbb0fd..6894182be7e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ne
 	pkgdesc = The nice editor, a fast small powerful and simple to use editor
-	pkgver = 3.3.2
+	pkgver = 3.3.3
 	pkgrel = 1
 	url = http://ne.di.unimi.it
 	arch = i686
@@ -8,9 +8,7 @@ pkgbase = ne
 	license = GPL3
 	depends = ncurses
 	depends = texinfo
-	source = https://github.com/vigna/ne/archive/3.3.2.tar.gz
-	source = info2src.pl.patch
-	sha512sums = 591be3eb44419ce5fec8c2a02c06aab95dc7d04aa8eb191219588af1b8851ae86e11b8eace25fa970817ac6451c991354e8c20d591dd4fb45114e1cdb6dd1ec6
-	sha512sums = 0c95be21e40572d3feb5db4e73fea67616a5a8b8d4570511bc9267b0ed59c75b2169881faa23adcec8e4f16ea771ba28c12f90b2876672bda3d39796d894a089
+	source = https://github.com/vigna/ne/archive/3.3.3.tar.gz
+	sha512sums = 977c5497c213526f796bbba540dbeb585eca248d5eded41063ceb57981a33b7d1954ae1c7a39287ff88288a05d7811630ca887e8ef7f08f237d19a9ba4be2d29
 
 pkgname = ne
diff --git a/PKGBUILD b/PKGBUILD
index 457ffddd4bde..7510930aa8df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,22 +4,15 @@
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=ne
-pkgver=3.3.2
+pkgver=3.3.3
 pkgrel=1
 pkgdesc='The nice editor, a fast small powerful and simple to use editor'
 arch=(i686 x86_64)
 url='http://ne.di.unimi.it'
 license=(GPL3)
 depends=(ncurses texinfo)
-source=("https://github.com/vigna/${pkgname}/archive/${pkgver}.tar.gz"
-        "info2src.pl.patch")
-sha512sums=('591be3eb44419ce5fec8c2a02c06aab95dc7d04aa8eb191219588af1b8851ae86e11b8eace25fa970817ac6451c991354e8c20d591dd4fb45114e1cdb6dd1ec6'
-            '0c95be21e40572d3feb5db4e73fea67616a5a8b8d4570511bc9267b0ed59c75b2169881faa23adcec8e4f16ea771ba28c12f90b2876672bda3d39796d894a089')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}"/info2src.pl.patch
-}
+source=("https://github.com/vigna/${pkgname}/archive/${pkgver}.tar.gz")
+sha512sums=('977c5497c213526f796bbba540dbeb585eca248d5eded41063ceb57981a33b7d1954ae1c7a39287ff88288a05d7811630ca887e8ef7f08f237d19a9ba4be2d29')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/info2src.pl.patch b/info2src.pl.patch
deleted file mode 100644
index 128ffd6b69d0..000000000000
--- a/info2src.pl.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 90ae494711a06944f0027224cf6a4b4a812d1e95 Mon Sep 17 00:00:00 2001
-From: Todd Lewis <utoddl@gmail.com>
-Date: Fri, 16 Dec 2022 16:33:40 -0500
-Subject: [PATCH] pick smarter quotes if possible; support texinfo 7.0+
-
----
- src/info2src.pl | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/info2src.pl b/src/info2src.pl
-index 53935c0..56d4964 100755
---- a/src/info2src.pl
-+++ b/src/info2src.pl
-@@ -1,6 +1,8 @@
- #!/usr/bin/env perl
- 
- use strict;
-+use utf8;
-+use open ':std', ':encoding(UTF-8)';
- $| = 1;
- 
- # Todd M. Lewis <utoddl@gmail.com>
-@@ -65,7 +67,11 @@
-     my @line = <INFO>;
-     close INFO;
-     my $line = join '', @line;
--    $line =~ s<\*note *(\s*)(.+?)::> <$1`$2'>gis;
-+
-+    # Pick left- and right-quote depending on whether our docs contain u+2018 and u+2019 already.
-+    my ($lq, $rq) = ($line =~ m/‘.+?’/) ? ('‘', '’') : ("'", "'");
-+
-+    $line =~ s<\*note *(\s*)(.+?)::> <$1$lq$2$rq>gis;
- 
-     my $state = 'searching';
-     my $command;
-@@ -74,7 +80,7 @@
-         chomp;
-         if ( $state eq 'searching' )
-             {
--              next unless ( m/^(Syntax: )['`](([^ ]+).*)'\s*$/ );
-+              next unless ( m/^(Syntax: )[‘'`](([^ ]+).*)[’']\s*$/ );
-               $command = uc $3;
-               $commands{$command}->{"cmd"}     = "$3";
-               $commands{$command}->{"text"}[0] = "$1$2";
-@@ -93,7 +99,7 @@
- 
-               # print "---2 read \"$_\"\n";
- 
--              if ( m/^(Abbreviation: )['`](.+)'/ )
-+              if ( m/^(Abbreviation: )[‘'`](.+)[’']/ )
-                   {
-                     $commands{$command}->{"abbr"} = "$2";
-                     push @{$commands{$command}->{"text"}}, "$1$2";