Date: Tuesday, January 28, 2014 @ 15:43:02
Author: spupykin
Revision: 104946
upgpkg: mediawiki 1.22.1-1
upd
Modified:
mediawiki/trunk/PKGBUILD
Deleted:
mediawiki/trunk/pcre.patch
------------+
PKGBUILD | 13 +++----------
pcre.patch | 25 -------------------------
2 files changed, 3 insertions(+), 35 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-01-28 14:40:38 UTC (rev 104945)
+++ PKGBUILD 2014-01-28 14:43:02 UTC (rev 104946)
@@ -4,9 +4,9 @@
pkgbase=mediawiki
pkgname=('mediawiki' 'mediawiki-math')
-pkgver=1.22.0
+pkgver=1.22.1
_basever=1.22
-pkgrel=3
+pkgrel=1
pkgdesc="MediaWiki engine"
arch=('any')
url="http://www.mediawiki.org/wiki/MediaWiki";
@@ -33,18 +33,11 @@
#
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
apache.example.conf)
-md5sums=('4f493d775251d6ad63f391738750397c'
+md5sums=('fc404fec677d0cb9d7a51bd1a900b5e6'
'b595f6a32b2380040ce5401701a6a3a2'
- 'b4e9279c8ae2e00677d53ee1bcc7ee1f'
'99c25f04d4093f3333db1be7624fe4e7')
-prepare() {
- cd $srcdir/$pkgname-$pkgver
- patch -p1 <$srcdir/pcre.patch
-}
-
package_mediawiki() {
cd $srcdir
install -vdm0755 $pkgdir/usr/share/webapps
Deleted: pcre.patch
===================================================================
--- pcre.patch 2014-01-28 14:40:38 UTC (rev 104945)
+++ pcre.patch 2014-01-28 14:43:02 UTC (rev 104946)
@@ -1,25 +0,0 @@
-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
-
