Date: Wednesday, January 22, 2014 @ 07:28:48 Author: spupykin Revision: 104505
Added: mediawiki/trunk/pcre.patch Modified: mediawiki/trunk/PKGBUILD ------------+ PKGBUILD | 2 +- pcre.patch | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-01-22 01:50:17 UTC (rev 104504) +++ PKGBUILD 2014-01-22 06:28:48 UTC (rev 104505) @@ -33,7 +33,7 @@ # mediawiki-math-${_basever}::git+https://git.wikimedia.org/git/mediawiki/extensions/Math.git#branch=REL${_basever/./_} source=("http://download.wikimedia.org/mediawiki/${_basever}/mediawiki-$pkgver.tar.gz" "mediawiki-math-${_basever}.tar.gz::https://codeload.github.com/wikimedia/mediawiki-extensions-Math/legacy.tar.gz/REL${_basever/./_}" - "pcre.patch::https://projects.archlinux.de/vhosts/wiki.archlinux.org.git/patch/?id=9937b8e6d6a8b4517c04c143daaf9ebd42ce8ba0" + pcre.patch apache.example.conf) md5sums=('4f493d775251d6ad63f391738750397c' 'b595f6a32b2380040ce5401701a6a3a2' Added: pcre.patch =================================================================== --- pcre.patch (rev 0) +++ pcre.patch 2014-01-22 06:28:48 UTC (rev 104505) @@ -0,0 +1,25 @@ +From 9937b8e6d6a8b4517c04c143daaf9ebd42ce8ba0 Mon Sep 17 00:00:00 2001 +From: Pierre Schmitz <pie...@archlinux.de> +Date: Fri, 3 Jan 2014 23:05:29 +0100 +Subject: Make MagicWordArray compatible with PCRE 8.34+ + +See https://git.wikimedia.org/commit/mediawiki%2Fcore.git/b9f291e8cd5bb1450f7b1031aa17cf7775aa7e96 + +diff --git a/includes/MagicWord.php b/includes/MagicWord.php +index 427a1ad..232f43e 100644 +--- a/includes/MagicWord.php ++++ b/includes/MagicWord.php +@@ -709,7 +709,9 @@ class MagicWordArray { + $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 v0.10 +