-
-
Save ceidways/44c907c20621fd601a25eaa61889d1c8 to your computer and use it in GitHub Desktop.
AUR chocolate-doom update to 3.1.1
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/.SRCINFO b/.SRCINFO | |
| index 68775f8..9fd0455 100644 | |
| --- a/.SRCINFO | |
| +++ b/.SRCINFO | |
| @@ -1,6 +1,6 @@ | |
| pkgbase = chocolate-doom | |
| pkgdesc = Historically-accurate Doom, Heretic, Hexen, and Strife ports. | |
| - pkgver = 3.1.0 | |
| + pkgver = 3.1.1 | |
| pkgrel = 1 | |
| url = http://www.chocolate-doom.org/ | |
| install = chocolate-doom.install | |
| @@ -23,9 +23,7 @@ pkgbase = chocolate-doom | |
| replaces = chocolate-heretic | |
| replaces = chocolate-hexen | |
| replaces = chocolate-strife | |
| - source = https://github.com/chocolate-doom/chocolate-doom/archive/refs/tags/chocolate-doom-3.1.0.tar.gz | |
| - source = 0001-man-docgen-Use-raw-string-literals-for-regular-expre.patch | |
| - b2sums = 4e311985e1c20d2d5bf0cc6ef3e860c78a0d1e413ca398800bcdcf86f43727e48f1306e7e9c8878e3313e9ca2e7ba3d48eddd220ef5def06230caf32fe0890fb | |
| - b2sums = 32382739724d1fead2c25af21821193326f2f85af8138005a3dccfd9fc65057430ce26063526472ff3d72aa2cd7cac044544859c5aff3fae66a4d76dc96f1c08 | |
| + source = https://github.com/chocolate-doom/chocolate-doom/archive/refs/tags/chocolate-doom-3.1.1.tar.gz | |
| + b2sums = df95d149eb33dd2f0cec53e4d1cb854941a9cbedd5e4ecc7b88022a358729734bce68f5c015ab6ef1929825976d1be1d1da200aa57383fa7ff776c7a8064385e | |
| pkgname = chocolate-doom | |
| diff --git a/0001-man-docgen-Use-raw-string-literals-for-regular-expre.patch b/0001-man-docgen-Use-raw-string-literals-for-regular-expre.patch | |
| deleted file mode 100644 | |
| index a19eca9..0000000 | |
| --- a/0001-man-docgen-Use-raw-string-literals-for-regular-expre.patch | |
| +++ /dev/null | |
| @@ -1,124 +0,0 @@ | |
| -From 38a54af87bf29f9a830d1b2636d28018a7a7a527 Mon Sep 17 00:00:00 2001 | |
| -From: Mike Swanson <mikeonthecomputer@gmail.com> | |
| -Date: Sat, 3 Aug 2024 10:20:21 -0700 | |
| -Subject: [PATCH] man/docgen: Use raw string literals for regular expressions | |
| -MIME-Version: 1.0 | |
| -Content-Type: text/plain; charset=UTF-8 | |
| -Content-Transfer-Encoding: 8bit | |
| - | |
| -Regular expressions use the \ character frequently as part of their | |
| -normal operations, but Python tries to interpret them in standard | |
| -strings as escape sequences. It especially complained about “invalid | |
| -escape sequence” \s, \S, and \#. Using raw strings forces Python to | |
| -make no attempt to parse escape sequences and they instead get passed | |
| -directly into the re library. | |
| ---- | |
| - man/docgen | 24 ++++++++++++------------ | |
| - 1 file changed, 12 insertions(+), 12 deletions(-) | |
| - | |
| -diff --git a/man/docgen b/man/docgen | |
| -index 19e3b4bca..dffc1d6ab 100755 | |
| ---- a/man/docgen | |
| -+++ b/man/docgen | |
| -@@ -36,7 +36,7 @@ import glob | |
| - import getopt | |
| - | |
| - TEXT_WRAP_WIDTH = 78 | |
| --INCLUDE_STATEMENT_RE = re.compile("@include\s+(\S+)") | |
| -+INCLUDE_STATEMENT_RE = re.compile(r"@include\s+(\S+)") | |
| - | |
| - # Use appropriate stdout function for Python 2 or 3 | |
| - | |
| -@@ -209,7 +209,7 @@ class Parameter: | |
| - if len(text) <= 0: | |
| - pass | |
| - elif text[0] == "@": | |
| -- match = re.match('@(\S+)\s*(.*)', text) | |
| -+ match = re.match(r'@(\S+)\s*(.*)', text) | |
| - | |
| - if not match: | |
| - raise "Malformed option line: %s" % text | |
| -@@ -253,7 +253,7 @@ class Parameter: | |
| - if self.platform: | |
| - result += "[%s only] " % self.platform | |
| - | |
| -- escaped = re.sub('\\\\', '\\\\\\\\', self.text) | |
| -+ escaped = re.sub(r'\\', r'\\\\', self.text) | |
| - | |
| - result += escaped + self._games_only_text() + "\n" | |
| - | |
| -@@ -315,7 +315,7 @@ class Parameter: | |
| - # Build the complete text for the argument | |
| - # Split the description into words and add a word at a time | |
| - result = "" | |
| -- words = [word for word in re.split('\s+', description) if word] | |
| -+ words = [word for word in re.split(r'\s+', description) if word] | |
| - maxlen = TEXT_WRAP_WIDTH - indent | |
| - outlines = [[]] | |
| - for word in words: | |
| -@@ -345,7 +345,7 @@ def read_wikipages(): | |
| - for line in f: | |
| - line = line.rstrip() | |
| - | |
| -- line = re.sub('\#.*$', '', line) | |
| -+ line = re.sub(r'\#.*$', '', line) | |
| - | |
| - if not re.match(r'^\s*$', line): | |
| - wikipages.append(line) | |
| -@@ -378,7 +378,7 @@ def add_parameter(param, line, config_file): | |
| - | |
| - # Is this documenting a command line parameter? | |
| - | |
| -- match = re.search('(M_CheckParm(WithArgs)|M_ParmExists)?\s*\(\s*"(.*?)"', | |
| -+ match = re.search(r'(M_CheckParm(WithArgs)|M_ParmExists)?\s*\(\s*"(.*?)"', | |
| - line) | |
| - | |
| - if match: | |
| -@@ -389,7 +389,7 @@ def add_parameter(param, line, config_file): | |
| - | |
| - # Documenting a configuration file variable? | |
| - | |
| -- match = re.search('CONFIG_VARIABLE_\S+\s*\(\s*(\S+?)\),', line) | |
| -+ match = re.search(r'CONFIG_VARIABLE_\S+\s*\(\s*(\S+?)\),', line) | |
| - | |
| - if match: | |
| - param.name = match.group(1) | |
| -@@ -413,7 +413,7 @@ def process_file(filename): | |
| - | |
| - # Ignore empty lines | |
| - | |
| -- if re.match('\s*$', line): | |
| -+ if re.match(r'\s*$', line): | |
| - continue | |
| - | |
| - # Currently reading a doc comment? | |
| -@@ -421,7 +421,7 @@ def process_file(filename): | |
| - if param: | |
| - # End of doc comment | |
| - | |
| -- if not re.match('\s*//', line): | |
| -+ if not re.match(r'\s*//', line): | |
| - waiting_for_checkparm = True | |
| - | |
| - # The first non-empty line after the documentation comment | |
| -@@ -433,14 +433,14 @@ def process_file(filename): | |
| - else: | |
| - # More documentation text | |
| - | |
| -- munged_line = re.sub('\s*\/\/\s*', '', line, 1) | |
| -- munged_line = re.sub('\s*$', '', munged_line) | |
| -+ munged_line = re.sub(r'\s*\/\/\s*', '', line, 1) | |
| -+ munged_line = re.sub(r'\s*$', '', munged_line) | |
| - param.add_text(munged_line) | |
| - | |
| - # Check for start of a doc comment | |
| - | |
| - if re.search("//!", line): | |
| -- match = re.search("@begin_config_file\s*(\S+)", line) | |
| -+ match = re.search(r"@begin_config_file\s*(\S+)", line) | |
| - | |
| - if match: | |
| - # Beginning a configuration file | |
| --- | |
| -2.46.0 | |
| - | |
| diff --git a/PKGBUILD b/PKGBUILD | |
| index 709e5b7..c9a0e81 100644 | |
| --- a/PKGBUILD | |
| +++ b/PKGBUILD | |
| @@ -2,7 +2,7 @@ | |
| pkgname=chocolate-doom | |
| pkgdesc="Historically-accurate Doom, Heretic, Hexen, and Strife ports." | |
| -pkgver=3.1.0 | |
| +pkgver=3.1.1 | |
| pkgrel=1 | |
| arch=('x86_64' 'aarch64') | |
| url="http://www.chocolate-doom.org/" | |
| @@ -18,10 +18,8 @@ conflicts=(chocolate-common | |
| chocolate-hexen | |
| chocolate-strife) | |
| replaces=(${conflicts[@]}) | |
| -source=(https://github.com/${pkgname}/${pkgname}/archive/refs/tags/${pkgname}-${pkgver}.tar.gz | |
| - 0001-man-docgen-Use-raw-string-literals-for-regular-expre.patch) | |
| -b2sums=('4e311985e1c20d2d5bf0cc6ef3e860c78a0d1e413ca398800bcdcf86f43727e48f1306e7e9c8878e3313e9ca2e7ba3d48eddd220ef5def06230caf32fe0890fb' | |
| - '32382739724d1fead2c25af21821193326f2f85af8138005a3dccfd9fc65057430ce26063526472ff3d72aa2cd7cac044544859c5aff3fae66a4d76dc96f1c08') | |
| +source=(https://github.com/${pkgname}/${pkgname}/archive/refs/tags/${pkgname}-${pkgver}.tar.gz) | |
| +b2sums=('df95d149eb33dd2f0cec53e4d1cb854941a9cbedd5e4ecc7b88022a358729734bce68f5c015ab6ef1929825976d1be1d1da200aa57383fa7ff776c7a8064385e') | |
| prepare() { | |
| cd "${pkgname}-${pkgname}-${pkgver}" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment