[arch-commits] Commit in mediawiki/repos/community-any (7 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Tue Jan 28 14:43:18 UTC 2014


    Date: Tuesday, January 28, 2014 @ 15:43:17
  Author: spupykin
Revision: 104947

archrelease: copy trunk to community-any

Added:
  mediawiki/repos/community-any/PKGBUILD
    (from rev 104946, mediawiki/trunk/PKGBUILD)
  mediawiki/repos/community-any/apache.example.conf
    (from rev 104946, mediawiki/trunk/apache.example.conf)
  mediawiki/repos/community-any/mediawiki.install
    (from rev 104946, mediawiki/trunk/mediawiki.install)
Deleted:
  mediawiki/repos/community-any/PKGBUILD
  mediawiki/repos/community-any/apache.example.conf
  mediawiki/repos/community-any/mediawiki.install
  mediawiki/repos/community-any/pcre.patch

---------------------+
 PKGBUILD            |  165 +++++++++++++++++++++++---------------------------
 apache.example.conf |   16 ++--
 mediawiki.install   |   10 +--
 pcre.patch          |   25 -------
 4 files changed, 92 insertions(+), 124 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-28 14:43:02 UTC (rev 104946)
+++ PKGBUILD	2014-01-28 14:43:17 UTC (rev 104947)
@@ -1,86 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgbase=mediawiki
-pkgname=('mediawiki' 'mediawiki-math')
-pkgver=1.22.0
-_basever=1.22
-pkgrel=3
-pkgdesc="MediaWiki engine"
-arch=('any')
-url="http://www.mediawiki.org/wiki/MediaWiki"
-# + http://www.mediawiki.org/wiki/Extension:Math
-license=("GPL")
-depends=('php')
-makedepends=('git')
-optdepends=('texvc: for math rendering'
-	    'python2'
-	    'pcre: for regular expressions support'
-	    'php-intl: to handle Unicode normalization'
-	    'php-mysql: for MySQL database support'
-	    'php-pgsql: for PostgreSQL database support'
-	    'php-sqlite: for sqlite database support'
-	    'php-apc: for cache support'
-	    'php-xcache: for cache support'
-	    'memcached: for cache support'
-	    'php-gd: for thumbnails rendering'
-	    'imagemagick: for thumbnails rendering'
-	    'sendmail: for meail sending')
-backup=(etc/webapps/mediawiki/.htaccess)
-install=mediawiki.install
-options=(!strip)
-#	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'
-         'b595f6a32b2380040ce5401701a6a3a2'
-         'b4e9279c8ae2e00677d53ee1bcc7ee1f'
-         '99c25f04d4093f3333db1be7624fe4e7')
-
-prepare() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/pcre.patch
-}
-
-package_mediawiki() {
-  cd $srcdir
-  install -vdm0755 $pkgdir/usr/share/webapps
-  install -vdm0755 $pkgdir/etc/webapps/mediawiki
-  cp -a $pkgname-$pkgver $pkgdir/usr/share/webapps/mediawiki
-
-  echo "deny from all" >> $pkgdir/etc/webapps/mediawiki/.htaccess
-  ln -sf /etc/webapps/mediawiki/.htaccess $pkgdir/usr/share/webapps/mediawiki/.htaccess
-  install -vDm0644 $srcdir/apache.example.conf $pkgdir/etc/webapps/mediawiki/apache.example.conf
-
-  # move cache and images to /var
-  install -vdm0755 -o http -g http $pkgdir/var/cache/mediawiki
-  install -vdm0755 -o http -g http $pkgdir/var/lib/mediawiki
-
-  cd $pkgdir/usr/share/webapps/mediawiki
-
-  mv cache/.htaccess $pkgdir/var/cache/mediawiki/
-  rmdir cache
-  ln -sf /var/cache/mediawiki cache
-
-  mv images/* $pkgdir/var/lib/mediawiki/
-  mv images/.htaccess $pkgdir/var/lib/mediawiki/
-  rmdir images
-  ln -sf /var/lib/mediawiki images
-}
-
-package_mediawiki-math() {
-  depends=('mediawiki' 'texvc')
-  optdepends=()
-  backup=()
-  pkgdesc="MediaWiki math extension"
-  unset install
-
-  cd $srcdir
-  install -vdm0755 $pkgdir/usr/share/webapps/mediawiki/extensions
-#  cp -a mediawiki-math-${_basever} $pkgdir/usr/share/webapps/mediawiki/extensions/Math
-  cp -a wikimedia-mediawiki-extensions-Math-b3ad6b9 $pkgdir/usr/share/webapps/mediawiki/extensions/Math
-  ln -s /usr/bin/texvc $pkgdir/usr/share/webapps/mediawiki/extensions/Math/math/texvc
-}

Copied: mediawiki/repos/community-any/PKGBUILD (from rev 104946, mediawiki/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-01-28 14:43:17 UTC (rev 104947)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgbase=mediawiki
+pkgname=('mediawiki' 'mediawiki-math')
+pkgver=1.22.1
+_basever=1.22
+pkgrel=1
+pkgdesc="MediaWiki engine"
+arch=('any')
+url="http://www.mediawiki.org/wiki/MediaWiki"
+# + http://www.mediawiki.org/wiki/Extension:Math
+license=("GPL")
+depends=('php')
+makedepends=('git')
+optdepends=('texvc: for math rendering'
+	    'python2'
+	    'pcre: for regular expressions support'
+	    'php-intl: to handle Unicode normalization'
+	    'php-mysql: for MySQL database support'
+	    'php-pgsql: for PostgreSQL database support'
+	    'php-sqlite: for sqlite database support'
+	    'php-apc: for cache support'
+	    'php-xcache: for cache support'
+	    'memcached: for cache support'
+	    'php-gd: for thumbnails rendering'
+	    'imagemagick: for thumbnails rendering'
+	    'sendmail: for meail sending')
+backup=(etc/webapps/mediawiki/.htaccess)
+install=mediawiki.install
+options=(!strip)
+#	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/./_}"
+	apache.example.conf)
+md5sums=('fc404fec677d0cb9d7a51bd1a900b5e6'
+         'b595f6a32b2380040ce5401701a6a3a2'
+         '99c25f04d4093f3333db1be7624fe4e7')
+
+package_mediawiki() {
+  cd $srcdir
+  install -vdm0755 $pkgdir/usr/share/webapps
+  install -vdm0755 $pkgdir/etc/webapps/mediawiki
+  cp -a $pkgname-$pkgver $pkgdir/usr/share/webapps/mediawiki
+
+  echo "deny from all" >> $pkgdir/etc/webapps/mediawiki/.htaccess
+  ln -sf /etc/webapps/mediawiki/.htaccess $pkgdir/usr/share/webapps/mediawiki/.htaccess
+  install -vDm0644 $srcdir/apache.example.conf $pkgdir/etc/webapps/mediawiki/apache.example.conf
+
+  # move cache and images to /var
+  install -vdm0755 -o http -g http $pkgdir/var/cache/mediawiki
+  install -vdm0755 -o http -g http $pkgdir/var/lib/mediawiki
+
+  cd $pkgdir/usr/share/webapps/mediawiki
+
+  mv cache/.htaccess $pkgdir/var/cache/mediawiki/
+  rmdir cache
+  ln -sf /var/cache/mediawiki cache
+
+  mv images/* $pkgdir/var/lib/mediawiki/
+  mv images/.htaccess $pkgdir/var/lib/mediawiki/
+  rmdir images
+  ln -sf /var/lib/mediawiki images
+}
+
+package_mediawiki-math() {
+  depends=('mediawiki' 'texvc')
+  optdepends=()
+  backup=()
+  pkgdesc="MediaWiki math extension"
+  unset install
+
+  cd $srcdir
+  install -vdm0755 $pkgdir/usr/share/webapps/mediawiki/extensions
+#  cp -a mediawiki-math-${_basever} $pkgdir/usr/share/webapps/mediawiki/extensions/Math
+  cp -a wikimedia-mediawiki-extensions-Math-b3ad6b9 $pkgdir/usr/share/webapps/mediawiki/extensions/Math
+  ln -s /usr/bin/texvc $pkgdir/usr/share/webapps/mediawiki/extensions/Math/math/texvc
+}

Deleted: apache.example.conf
===================================================================
--- apache.example.conf	2014-01-28 14:43:02 UTC (rev 104946)
+++ apache.example.conf	2014-01-28 14:43:17 UTC (rev 104947)
@@ -1,8 +0,0 @@
-Alias /mediawiki "/usr/share/webapps/mediawiki"
-php_admin_value open_basedir "/usr/share/webapps/:/tmp/:/usr/bin/"
-<Directory "/usr/share/webapps/mediawiki">
-    AllowOverride All
-    Options FollowSymlinks
-    Order allow,deny
-    Allow from all
-</Directory>

Copied: mediawiki/repos/community-any/apache.example.conf (from rev 104946, mediawiki/trunk/apache.example.conf)
===================================================================
--- apache.example.conf	                        (rev 0)
+++ apache.example.conf	2014-01-28 14:43:17 UTC (rev 104947)
@@ -0,0 +1,8 @@
+Alias /mediawiki "/usr/share/webapps/mediawiki"
+php_admin_value open_basedir "/usr/share/webapps/:/tmp/:/usr/bin/"
+<Directory "/usr/share/webapps/mediawiki">
+    AllowOverride All
+    Options FollowSymlinks
+    Order allow,deny
+    Allow from all
+</Directory>

Deleted: mediawiki.install
===================================================================
--- mediawiki.install	2014-01-28 14:43:02 UTC (rev 104946)
+++ mediawiki.install	2014-01-28 14:43:17 UTC (rev 104947)
@@ -1,5 +0,0 @@
-post_upgrade() {
-  echo "-- Don't forget to run 'php maintenance/update.php' after upgrade"
-  echo "-- Mediawiki is in /usr/share/webapps now"
-  echo "-- Mediawiki-math is separate package now"
-}

Copied: mediawiki/repos/community-any/mediawiki.install (from rev 104946, mediawiki/trunk/mediawiki.install)
===================================================================
--- mediawiki.install	                        (rev 0)
+++ mediawiki.install	2014-01-28 14:43:17 UTC (rev 104947)
@@ -0,0 +1,5 @@
+post_upgrade() {
+  echo "-- Don't forget to run 'php maintenance/update.php' after upgrade"
+  echo "-- Mediawiki is in /usr/share/webapps now"
+  echo "-- Mediawiki-math is separate package now"
+}

Deleted: pcre.patch
===================================================================
--- pcre.patch	2014-01-28 14:43:02 UTC (rev 104946)
+++ pcre.patch	2014-01-28 14:43:17 UTC (rev 104947)
@@ -1,25 +0,0 @@
-From 9937b8e6d6a8b4517c04c143daaf9ebd42ce8ba0 Mon Sep 17 00:00:00 2001
-From: Pierre Schmitz <pierre at 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
-




More information about the arch-commits mailing list