From 54eae2da275ebbe9c0bb0e16c62a95676557a695 Mon Sep 17 00:00:00 2001 From: wen Date: Wed, 12 Feb 2014 14:31:58 +0000 Subject: - Apply a patch from upstream to fix pcre-8.34 incompatible: https://bugzilla.wikimedia.org/show_bug.cgi?id=58640 PR: 186607 Submitted by: Robbert Klarenbeek --- www/mediawiki121/Makefile | 1 + www/mediawiki121/files/patch-includes-MagicWord.php | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 www/mediawiki121/files/patch-includes-MagicWord.php (limited to 'www') diff --git a/www/mediawiki121/Makefile b/www/mediawiki121/Makefile index 6a15896bbe18..c64771d690cf 100644 --- a/www/mediawiki121/Makefile +++ b/www/mediawiki121/Makefile @@ -3,6 +3,7 @@ PORTNAME= mediawiki PORTVERSION= 1.21.5 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://dumps.wikimedia.org/mediawiki/${PORTVERSION:R}/ diff --git a/www/mediawiki121/files/patch-includes-MagicWord.php b/www/mediawiki121/files/patch-includes-MagicWord.php new file mode 100644 index 000000000000..3996e767d188 --- /dev/null +++ b/www/mediawiki121/files/patch-includes-MagicWord.php @@ -0,0 +1,13 @@ +--- includes/MagicWord.php.orig 2014-02-12 22:03:25.000000000 +0800 ++++ includes/MagicWord.php 2014-02-12 22:05:10.000000000 +0800 +@@ -704,7 +704,9 @@ + $magic = MagicWord::get( $name ); + $case = intval( $magic->isCaseSensitive() ); + foreach ( $magic->getSynonyms() as $i => $syn ) { +- $group = "(?P<{$i}_{$name}>" . preg_quote( $syn, '/' ) . ')'; ++ // Group name must start with a non-digit in PCRE 8.34+ ++ $it = strtr( $i, '0123456789', 'abcdefghij' ); ++ $group = "(?P<{$it}_{$name}>" . preg_quote( $syn, '/' ) . ')'; + if ( $this->baseRegex[$case] === '' ) { + $this->baseRegex[$case] = $group; + } else { -- cgit