[mojomojo] Fix usage of a deprecated regular expression

Petr Pisar ppisar at fedoraproject.org
Tue Apr 29 11:06:10 UTC 2014


commit b0944ebaefc2df237af65511c12d51b1f0b1e0c9
Author: Petr Písař <ppisar at redhat.com>
Date:   Tue Apr 29 12:59:49 2014 +0200

    Fix usage of a deprecated regular expression

 ...itting-the-initial-is-deprecated-in-regex.patch |   29 ++++++++++++++++++++
 mojomojo.spec                                      |    5 +++
 2 files changed, 34 insertions(+), 0 deletions(-)
---
diff --git a/MojoMojo-1.10-Splitting-the-initial-is-deprecated-in-regex.patch b/MojoMojo-1.10-Splitting-the-initial-is-deprecated-in-regex.patch
new file mode 100644
index 0000000..562057b
--- /dev/null
+++ b/MojoMojo-1.10-Splitting-the-initial-is-deprecated-in-regex.patch
@@ -0,0 +1,29 @@
+From 505a9fe3ad80c940fa69dd84e841716dee9e69e9 Mon Sep 17 00:00:00 2001
+From: Soren Dossing <netcom at sauber.net>
+Date: Tue, 22 Apr 2014 13:09:36 +0900
+Subject: [PATCH] Splitting the initial '(?' is deprecated in regex
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ lib/MojoMojo/Formatter/Wiki.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/MojoMojo/Formatter/Wiki.pm b/lib/MojoMojo/Formatter/Wiki.pm
+index e8e4ae4..08c7845 100644
+--- a/lib/MojoMojo/Formatter/Wiki.pm
++++ b/lib/MojoMojo/Formatter/Wiki.pm
+@@ -83,7 +83,7 @@ sub _generate_non_wikiword_check {
+     # but why the question mark ('\?') at the end?
+     my $non_wikiword_chars =
+         ( join '', _explicit_start_delims() ) . $wikiword_escape . '\/' . '\?';
+-    return qr{( ?<! [$non_wikiword_chars] )}x;
++    return qr{(?<! [$non_wikiword_chars])}x;
+ }
+ 
+ my $non_wikiword_check = _generate_non_wikiword_check();
+-- 
+1.9.0
+
diff --git a/mojomojo.spec b/mojomojo.spec
index 1d1a0b0..1226148 100644
--- a/mojomojo.spec
+++ b/mojomojo.spec
@@ -17,6 +17,9 @@ Patch3:         mojomojo-no-swfupload.patch
 # Correct URI-unescaping with Encode ≥ 2.53, bug #1092015,
 # <https://github.com/mojomojo/mojomojo/issues/121>
 Patch4:         MojoMojo-1.10-normalize-name-as-a-byte-string.patch
+# Fix usage of a deprecated regular expression,
+# <https://github.com/mojomojo/mojomojo/pull/120>
+Patch5:         MojoMojo-1.10-Splitting-the-initial-is-deprecated-in-regex.patch
 
 BuildArch:      noarch
 
@@ -212,6 +215,7 @@ wiki page.
 %patch2 -p 1
 %patch3 -p 1
 %patch4 -p 1
+%patch5 -p 1
 
 # remove precomplied swfupload
 rm -rf root/static/flash/
@@ -295,6 +299,7 @@ CATALYST_CONFIG=t/var/mojomojo.yml make test
 %changelog
 * Tue Apr 29 2014 Petr Pisar <ppisar at redhat.com> - 1.10-3
 - Correct URI-unescaping with Encode ≥ 2.53 (bug #1092015)
+- Fix usage of a deprecated regular expression
 
 * Fri Sep 20 2013 Iain Arnell <iarnell at gmail.com> 1.10-2
 - remove bundled swfupload binaries (RHBZ#1000256)



More information about the perl-devel mailing list