Merge branch 'master' of ssh://projects.parabola.nu:1863/~git/abslibre/abslibre

11 files changed, 78 insertions, 169 deletions

diff --git a/pcr/galera/PKGBUILD b/pcr/galera/PKGBUILD
index de023c24a..9b3d8f124 100644
--- a/pcr/galera/PKGBUILD
+++ b/pcr/galera/PKGBUILD
@@ -2,17 +2,23 @@
 # Contributor: Nico Suarez <nicodoggie@gmail.com>
 
 pkgname=galera
-pkgver=25.3.9
+pkgver=25.3.10
 pkgrel=1
 pkgdesc='Galera WSREP provider'
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2', 'custom:OpenSSL Linking Exception')
+license=('GPL2' 'custom:OpenSSL Linking Exception')
 depends=('openssl')
-makedepends=('boost>=1.57' 'check' 'scons' 'patch')
+makedepends=('boost>=1.58' 'check' 'scons' 'patch')
 url='http://www.codership.com'
 options=('!libtool')
 source=(https://github.com/codership/galera/archive/release_${pkgver}.tar.gz)
-md5sums=('d044c0ca6b6831c9a84683a5c0803000')
+sha512sums=('c08420b72e446c93645012ec04465c4cb65152bd3eaa840142fafdcb6945f76e77e2be00cf68930227656b78c25cd5ce36ebe823d6fcbcd320e6ae91b3b38a5c')
+
+prepare() {
+  cd "$pkgname-release_$pkgver"
+  # makes build fail on 25.3.10
+  sed "s/-Werror//g" -i SConstruct
+}
 
 build(){
   cd "$pkgname-release_$pkgver"
diff --git a/pcr/mariadb-galera/PKGBUILD b/pcr/mariadb-galera/PKGBUILD
index b569fa01a..db811db47 100644
--- a/pcr/mariadb-galera/PKGBUILD
+++ b/pcr/mariadb-galera/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id$
+# $Id: PKGBUILD 238754 2015-05-09 12:28:18Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 
 pkgbase=mariadb-galera
 #pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb-galera')
 pkgname='mariadb-galera'
-pkgver=10.0.16
+pkgver=10.0.19
 _pkgver=${pkgver/.a/a}
 pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('GPL')
 url='https://mariadb.com/kb/en/galera/'
 makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre' 'jemalloc' 'galera')
-source=(http://ftp.wa.co.za/pub/mariadb/${pkgbase}-${pkgver}/source/${pkgbase}-${pkgver}.tar.gz
+source=(https://downloads.mariadb.org/interstitial/${pkgbase}-$pkgver/source/${pkgbase}-$pkgver.tar.gz
         mariadb.service
         mariadb-post.sh
         mariadb-tmpfile.conf)
+sha512sums=('9acba0d851c8bdfe0b28e3ec3dc9a21a41c8f283322d73a3c05ac10b9e9400302b9e6fe47d0d5ef73307254af715bc3ed144acaa325ce6c78841ddd14ee754c7'
+            'adab89d2978a9cc249ac56ce62cf4d23b98c0d693fe9f770912e44aef6425624552d8b51b5df226dfe325a6cc8f97f985b4dfd0b961abf08b1b6515b6a470aa2'
+            'e20bd243d7d35bcefa802ea222b73b9451cb393fb17bdd2ba3ed2294853e54e06f176f6b6bf16a12f9dcb72b08499a3611712c99064ccbfd6b85b727b69e8ef6'
+            '04e7a1b4b1007d8c0a15285408834bf6a9b59fbce55e34fbc52857a90091c0b67c89d032e0ae8a6f990e726bad5a7f53106dff7ba41e09e5ba2ff343d00e486f')
 
 prepare() {
-  sed -i 's/_SVID_SOURCE/_DEFAULT_SOURCE/' \
-    mariadb-$pkgver/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake
+  :
+#  sed -i 's/_SVID_SOURCE/_DEFAULT_SOURCE/' \
+#    mariadb-$pkgver/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake
 }
 
 build() {
@@ -123,7 +128,8 @@ package_mariadb-galera() {
   pkgdesc='Fast SQL database server, drop-in replacement for MySQL with Galera replication'
   backup=('etc/mysql/my.cnf')
   install=mariadb.install
-  depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre' 'galera' 'jemalloc')
+  depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre' 'galera' 'jemalloc'
+           'lz4')
   optdepends=('perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission')
   conflicts=('mysql' 'mariadb')
   provides=("mysql=$pkgver" "mariadb=$pkgver")
@@ -137,6 +143,9 @@ package_mariadb-galera() {
   install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
   install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
 
+  install -dm700 var/lib/mysql
+  chown -R 89:89 var/lib/mysql &>/dev/null
+
   # provided by libmariadbclient
   cd "$pkgdir"
   rm -f usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
@@ -155,11 +164,3 @@ package_mariadb-galera() {
   rm -f -r usr/{data,mysql-test,sql-bench}
   rm -f usr/share/man/man1/mysql-test-run.pl.1
 }
-md5sums=('eaf628a5d4edba6a3e84c66403ebdde9'
-         'd488fffa9f62f9949c4aa1bb6e6db692'
-         'b79e65a5aa536e6b5bc60988eb0b78a2'
-         '2fa6e456964d4ff5e6d4f9ff0126aed6')
-md5sums=('b3110fd96e44c5ced9f71251e2f19e0b'
-         'd488fffa9f62f9949c4aa1bb6e6db692'
-         'b79e65a5aa536e6b5bc60988eb0b78a2'
-         '2fa6e456964d4ff5e6d4f9ff0126aed6')
diff --git a/pcr/mariadb-galera/mariadb.install b/pcr/mariadb-galera/mariadb.install
index 68bcc14e4..1ca233beb 100644
--- a/pcr/mariadb-galera/mariadb.install
+++ b/pcr/mariadb-galera/mariadb.install
@@ -1,17 +1,10 @@
-if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then
-  datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p")
-fi
-[[ -z $datadir ]] && datadir=/var/lib/mysql
-
 post_install(){
   groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
+  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
 
-  if [[ ! -e $datadir ]]; then
-    install -dm700 $datadir
-    usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir
-    chown -R mysql:mysql var/lib/mysql &>/dev/null
-  fi
+  echo ":: You need to initialize the MariaDB data directory prior to starting"
+  echo "   the service. This can be done with mysql_install_db command, e.g.:"
+  echo "   mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql"
 
   usr/bin/systemd-tmpfiles --create mysql.conf
 
@@ -23,11 +16,12 @@ https://mariadb.com/kb/en/mariadb/documentation/replication/galera/getting-start
 
 post_upgrade(){
   getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
-  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
+  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql \
+    -s /bin/false mysql &>/dev/null
 
   if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
     for x in data/*; do
-      cp -r $x $datadir/
+      cp -r $x var/lib/mysql
     done
     rm -rf data
   fi
@@ -42,13 +36,3 @@ post_upgrade(){
     echo "   running mysql_upgrade afterwards."
   fi
 }
-
-post_remove(){
-  if getent passwd mysql >/dev/null 2>&1; then
-    userdel mysql
-  fi
-
-  if getent group mysql >/dev/null 2>&1; then
-    groupdel mysql
-  fi
-}
diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD
deleted file mode 100644
index 4cfbbb1fa..000000000
--- a/pcr/renpy/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# Maintainer (Arch): AlexanderR <rvacheva at nxt dot ru>
-# Contributor (Arch): zhn <zhangn1985 AT gmail com>
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-
-pkgbase=renpy
-pkgname=($pkgbase python2-$pkgbase)
-pkgver=6.18.3
-pkgrel=1
-pkgdesc="Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell stories with the computer. This package contains both player and development tools"
-arch=('i686' 'x86_64' 'mips64el')
-license=MIT
-url="http://www.$pkgbase.org/"
-depends=('ttf-dejavu')
-makedepends=('cython' 'ffmpeg' 'freetype2>=2.5.1' 'fribidi' 'glew' 'python2>=2.7' 'python2-pygame>=1.9.1')
-conflicts=("${pkgbase}64" "$pkgbase-bin")
-replaces=("${pkgbase}64")
-source=("http://www.$pkgbase.org/dl/$pkgver/$pkgbase-$pkgver-source.tar.bz2"
-        "$pkgbase.desktop" "$pkgbase."{sh,csh} "$pkgbase-launcher.sh")
-sha512sums=('7ea99adaf1fbea7a499790fb5b37349fc797f383fb633956a43955c80885b259e26570469c430f4c4c103e62444f60082690489ee6400809f5e9024693261e55'
-            '1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5'
-            '2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df'
-            'bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09'
-            '727f9f16e1cff76c279d6e1578572a92c7b21ec34c6cb2841a04ac7b5cf6d2836487293744a9541993ee2e3a8dae927feb4e78f1afd01a748f5489090453cdd7')
-
-export CPPFLAGS="$CPPFLAGS $(pkg-config freetype2 --cflags) $(pkg-config glib-2.0 --cflags)"
-
-prepare() {
-  cd $srcdir/$pkgbase-$pkgver-source
-
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' $pkgbase.py module/setup.py
-
-  msg 'fonts are provided by ttf-dejavu'
-  cd $pkgname
-  rm -v common/DejaVuSans.ttf common/DejaVuSans.txt
-}
-
-build() {
-  cd $srcdir/$pkgbase-$pkgver-source
-  python2 module/setup.py build
-}
-
-package_renpy() {
-  depends+=("python2-$pkgbase=$pkgver")
-  arch=('any')
-  install=$pkgbase.install
-
-  cd $pkgbase-$pkgver-source
-
-  install -vd $pkgdir/{usr/share/{$pkgbase,doc/$pkgbase},etc/profile.d}
-  install -vm755 $srcdir/$pkgbase.{sh,csh} $pkgdir/etc/profile.d
-  install -vDm755 $srcdir/$pkgbase-launcher.sh $pkgdir/usr/bin/$pkgbase
-  install -vDm644 $srcdir/$pkgbase.desktop $pkgdir/usr/share/applications/$pkgbase.desktop
-
-  cp -va launcher $pkgbase{,.py} templates the_question tutorial $pkgdir/usr/share/$pkgbase
-  ln -vs $pkgbase/common $pkgdir/usr/share/$pkgbase/common
-  cp -va doc/* $pkgdir/usr/share/doc/$pkgbase
-
-  install -vDm644 launcher/game/images/logo.png $pkgdir/usr/share/pixmaps/$pkgbase.png
-  install -vDm644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgbase/LICENSE
-
-  chgrp -vR games $pkgdir/usr/share/$pkgbase/{the_question,tutorial}
-  chmod -vR g+w $pkgdir/usr/share/$pkgbase/{the_question,tutorial}
-}
-
-package_python2-renpy() {
-  pkgdesc="Platform-dependant Ren'Py libraries"
-  depends=('ffmpeg' 'freetype2>=2.5.1' 'fribidi' 'glew' 'python2-pygame>=1.9.1')
-  provides=("python-$pkgbase=$pkgver")
-  conflicts=("python-$pkgbase")
-  replaces=("python-$pkgbase")
-
-  cd $pkgbase-$pkgver-source
-
-  msg "install $pkgname"
-  python2 module/setup.py install --root=$pkgdir/ --prefix=/usr --optimize=1
-  install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/pcr/renpy/renpy-launcher.sh b/pcr/renpy/renpy-launcher.sh
deleted file mode 100644
index 605c0c1fd..000000000
--- a/pcr/renpy/renpy-launcher.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-mkdir -p ~/renpy_projects
-cd ~/renpy_projects
-exec env python2 -OO /usr/share/renpy/renpy.py "$@"
diff --git a/pcr/renpy/renpy.csh b/pcr/renpy/renpy.csh
deleted file mode 100644
index 71269b48c..000000000
--- a/pcr/renpy/renpy.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv RENPY_BASE /usr/share/renpy/
diff --git a/pcr/renpy/renpy.desktop b/pcr/renpy/renpy.desktop
deleted file mode 100644
index 5cd64ea94..000000000
--- a/pcr/renpy/renpy.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Ren'Py
-GenericName= renpy 
-GenericName[fr]= renpy
-Comment=A programming language and runtime, intended to ease the creation of visual-novel type games. 
-Comment[fr]=Un langage de programmation et un exécutable conçus pour faciliter la création de jeux de type "visual-novel"
-Icon=renpy.png
-Exec=renpy
-Categories=Game;AdventureGame;
-
diff --git a/pcr/renpy/renpy.install b/pcr/renpy/renpy.install
deleted file mode 100644
index bfe161cdb..000000000
--- a/pcr/renpy/renpy.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-  ln -vsf /usr/share/doc/renpy /usr/share/renpy/doc
-
-  cat << EOF
-This package sets global environment variable RENPY_BASE, forcing all RenPy
-games, including incompatible ones, to use system-wide interpreter. Undefine
-this variable to launch games, you downloaded somewhere, with their built-in
-versions of interpreter.
-
-To run two example games: The Question and RenPy Tutorial you should be
-member of "games" group.
-EOF
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  rm -v /usr/share/renpy/doc
-}
diff --git a/pcr/renpy/renpy.sh b/pcr/renpy/renpy.sh
deleted file mode 100644
index 32b2e6d29..000000000
--- a/pcr/renpy/renpy.sh
+++ /dev/null
@@ -1 +0,0 @@
-export RENPY_BASE=/usr/share/renpy/
diff --git a/pcr/ruby-yard/PKGBUILD b/pcr/ruby-yard/PKGBUILD
index ffa8f9e9a..958f80e46 100644
--- a/pcr/ruby-yard/PKGBUILD
+++ b/pcr/ruby-yard/PKGBUILD
@@ -1,25 +1,24 @@
-# Contributor (Arch): Jerome Leclanche <jerome@leclan.ch>
-# Contributor (Arch): Matt Harrison <matt at mistbyte dot com>
-# Contributor (Arch): Renzo Carbonara <gnuk0001@gmail.com>
-# Maintainer        : Omar Vega Ramos <ovruni@gnu.org.pe>
+# Maintainer (Arch): Jerome Leclanche <jerome@leclan.ch>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 _gemname=yard
 pkgname=ruby-$_gemname
-pkgver=0.8.7.4
+pkgver=0.8.7.6
 pkgrel=1
 pkgdesc="Documentation tool for consistent and usable documentation in Ruby."
-arch=('any')
+arch=("any")
 url="http://yardoc.org"
-license=('MIT')
-depends=('ruby')
-makedepends=('rubygems')
+license=("MIT")
+depends=("ruby")
+makedepends=("rubygems")
 source=("http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem")
 noextract=("$_gemname-$pkgver.gem")
-sha256sums=('e65a26f9b9dc6e2aa9b1d1d2e1a45bee3edf540a6a7e6c30fa6aa1df7f7a29b4')
+sha256sums=("3da10884b94fa25b7476f619b1d2cfb61290e10673965c545975630cd88a46b6")
+
 
 package() {
 	cd "$srcdir"
-	local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+	local _gemdir="$(ruby -rubygems -e"puts Gem.default_dir")"
 	gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" "$_gemname-$pkgver.gem"
 	install -D "$pkgdir$_gemdir/gems/${_gemname}-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/pcr/webp-npapi/PKGBUILD b/pcr/webp-npapi/PKGBUILD
new file mode 100644
index 000000000..9e11ddc87
--- /dev/null
+++ b/pcr/webp-npapi/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
+
+pkgname=webp-npapi
+pkgver=1.0.0.0
+pkgrel=1
+pkgdesc="A WebP plugin for NPAPI-compliant browsers on GNU/Linux"
+arch=('i686' 'x86_64' 'mips64el')
+url="https://code.google.com/p/webp-npapi-linux/"
+license=('APACHE')
+depends=('libwebp')
+makedepends=('subversion' 'gtk2')
+source=('webp-npapi::svn+https://webp-npapi-linux.googlecode.com/svn/trunk/'
+        'ftp://gnu.mirror.iweb.com/icecat/4.0/icecat-4.0.tar.xz')
+md5sums=('SKIP'
+         '04548bfd70e6a66cd75cdb1f1fc81eb4')
+options=('!makeflags')
+
+prepare() {
+  cd "$srcdir/webp-npapi"
+  sed -i 's|[.][.][/][.][.][/]include[/]|../icecat-4.0/modules/plugin/base/public/|g;
+         ' webp-npapi.h \
+           CPlugin.h           
+}
+
+build() {
+  cd "$srcdir/webp-npapi"
+  make all
+}
+
+package() {
+  cd "$srcdir/webp-npapi"
+  install -d "$pkgdir/usr/lib/mozilla/plugins/"
+  install -m644 *.so "$pkgdir/usr/lib/mozilla/plugins/"
+}