Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/balsa/PKGBUILD
	community/bitcoin/PKGBUILD
	community/jack2/PKGBUILD
	community/kadu/PKGBUILD
	community/oss/PKGBUILD
	core/sudo/PKGBUILD
	extra/djvulibre/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/samba/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	libre/kdenetwork-kopete-libre/PKGBUILD
	multilib/jack2-multilib/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-sdl/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/zsnes/PKGBUILD
	testing/btrfs-progs/PKGBUILD
	testing/dnsutils/PKGBUILD
	testing/man-db/PKGBUILD
	testing/postgresql/PKGBUILD
	testing/postgresql/postgresql.install
	testing/postgresql/postgresql.service
	testing/procps-ng/PKGBUILD
	testing/procps-ng/sysctl.conf
	testing/sudo/PKGBUILD
	testing/xf86-video-nouveau/PKGBUILD
	testing/xf86-video-nouveau/xf86-video-nouveau.install

15 files changed, 321 insertions, 2 deletions

diff --git a/pcr/csync-owncloud/PKGBUILD b/pcr/csync-owncloud/PKGBUILD
new file mode 100644
index 000000000..daba8c568
--- /dev/null
+++ b/pcr/csync-owncloud/PKGBUILD
@@ -0,0 +1,53 @@
+# Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
+# https://github.com/zizzfizzix/pkgbuilds
+
+##############################################################
+#### The section below can be adjusted to suit your needs ####
+##############################################################
+
+# What type of build do you want?
+# See http://techbase.kde.org/Development/CMake/Addons_for_KDE#Buildtypes to check what is supported.
+# Default is RelWithDebInfo to help with debugging.
+
+_buildtype="RelWithDebInfo"
+
+##############################################################
+
+_name=csync
+pkgname=csync-owncloud
+pkgver=0.50.8
+pkgrel=1
+pkgdesc="A file synchronizer especially designed for you, the normal user."
+arch=("i686" "x86_64")
+url="http://www.csync.org"
+license=('GPL2')
+depends=('log4c' 'sqlite3' 'iniparser' 'neon' 'smbclient' 'libssh')
+makedepends=('cmake')
+#optdepends=('samba: smb support' 'libssh: sftp support')
+provides=('csync')
+conflicts=('csync')
+options=(!strip)
+source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2")
+md5sums=('322f6fa22ca0e8cd05f23dc0d075e7ca')
+
+# Clean options array to strip pkg if release buildtype is chosen
+if [[ ${_buildtype} == "Release" ]] || [[ ${_buildtype} == "release" ]]; then
+  options=()
+fi
+
+build() {
+  if [[ -e ${srcdir}/${_name}-${pkgver}-build ]]; then rm -rf ${srcdir}/${_name}-${pkgver}-build; fi
+  mkdir ${srcdir}/${_name}-${pkgver}-build
+  cd ${srcdir}/${_name}-${pkgver}-build
+  
+  cmake -DCMAKE_BUILD_TYPE=${_buildtype} \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DSYSCONF_INSTALL_DIR=/etc \
+        -DLOG_TO_CALLBACK=on \
+        ../${_name}-${pkgver}
+  make
+}
+package() {
+  cd ${srcdir}/${_name}-${pkgver}-build
+  make DESTDIR=${pkgdir} install
+}
diff --git a/pcr/log4c/PKGBUILD b/pcr/log4c/PKGBUILD
new file mode 100644
index 000000000..bfcb6bb53
--- /dev/null
+++ b/pcr/log4c/PKGBUILD
@@ -0,0 +1,22 @@
+# Contributor: rockerzz <rockerzz@gmail.com>
+#
+pkgname=log4c
+pkgver=1.2.1
+pkgrel=1
+pkgdesc="Logging FrameWork for C, as Log4j or Log4Cpp"
+url="http://log4c.sourceforge.net/"
+arch=('i686' 'x86_64')
+license="LGPL"
+depends=('gcc-libs')
+makedepends=( 'bash' 'make' 'gcc' )
+source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('ca5412b7515d8901714ab7892323adb6')
+options=('!libtool')
+
+build() {
+  cd $startdir/src/log4c-$pkgver
+  ./configure --prefix=/usr
+  make || return 1
+  make DESTDIR=$startdir/pkg install
+}
+
diff --git a/pcr/nexuiz-data/PKGBUILD b/pcr/nexuiz-data/PKGBUILD
new file mode 100644
index 000000000..edd338097
--- /dev/null
+++ b/pcr/nexuiz-data/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Xyne
+# Contributor: Rick Chen (stuffcorpse)
+# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
+# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
+# Contributor: Camille Moncelier <pix@devlife.org>
+
+pkgname=nexuiz-data
+_pkgsourcename=nexuiz
+pkgver=2.5.2
+_zipver=252
+pkgrel=1
+arch=('any')
+pkgdesc="Nexuiz game data"
+conflicts=('nexuiz<2.5.1-3')
+url="http://www.nexuiz.com/"
+license=("GPL")
+source=(http://downloads.sourceforge.net/${_pkgsourcename}/${_pkgsourcename}-${_zipver}.zip)
+md5sums=('d750bc328e58df8492f8d88bdcf818cb')
+
+build() {
+  _nexdir="$pkgdir/opt/nexuiz"
+  
+  _install_dir $srcdir/Nexuiz/Docs $_nexdir/docs
+  _install_dir $srcdir/Nexuiz/data $_nexdir/data
+  _install_dir $srcdir/Nexuiz/havoc $_nexdir/havoc
+  _install_dir $srcdir/Nexuiz/server $_nexdir/server
+  
+  find $_nexdir/server -name "*_windows.bat" -exec rm {} \;
+  find $_nexdir/server -name "*_mac.sh" -exec rm {} \;
+}
+
+function _install_dir {
+  _src_dir=$1
+  _dest_dir=$2
+  _n=${#_src_dir}
+  for _file in $(find $_src_dir -type f)
+  do
+    _dest_file=${_dest_dir}${_file:$_n}
+    install -Dm644 $_file $_dest_file
+  done
+}
diff --git a/pcr/nexuiz/PKGBUILD b/pcr/nexuiz/PKGBUILD
new file mode 100644
index 000000000..3b59cd617
--- /dev/null
+++ b/pcr/nexuiz/PKGBUILD
@@ -0,0 +1,56 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Xyne
+# Contributor: Rick Chen (stuffcorpse)
+# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
+# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
+# Contributor: Camille Moncelier <pix@devlife.org>
+
+pkgname=nexuiz
+pkgver=2.5.2
+_zipver=252
+pkgrel=2
+arch=('i686' 'x86_64')
+pkgdesc="a free software first person shooter"
+url="http://www.nexuiz.com/"
+license=("GPL")
+depends=('alsa-lib' 'curl' 'libjpeg>=8' 'libmodplug' 'libvorbis' 'libxpm' 'libxxf86dga' 'libxxf86vm' 'sdl' 'nexuiz-data' 'libpng>=1.4.0')
+makedepends=('mesa')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_zipver}.zip \
+        nexuiz-dedicated nexuiz-glx nexuiz-sdl nexuiz-glx.desktop \
+        nexuiz-sdl.desktop nexuiz.png libpng14.patch)
+md5sums=('d750bc328e58df8492f8d88bdcf818cb'
+         '19bfaa6e891d3309783e8366db485474'
+         '4d0ee9282a6fe153f82f7797decfd585'
+         '3e5ea741e8d55df8e7691c797c81ffa7'
+         '310f0577c39391f2d2f17cea446ce269'
+         '4561d3c5be4801399af515faf82ebcba'
+         '442fb62670bbe0a1b5370461052051a3'
+	 '60964348924ff777a92dbb171a86a1ed')
+
+build() {
+  _nexdir="$pkgdir/opt/nexuiz"
+  _enginesource_date="20091001"
+  mkdir -p "$_nexdir" || return 1
+  
+  cd $srcdir/Nexuiz
+  bsdtar -x -f sources/enginesource${_enginesource_date}.zip || return 1
+  cd darkplaces
+  patch -Np1 -i ${srcdir}/libpng14.patch || return 1
+  # patch -p1 < "$srcdir/nexuiz-libjpeg-fix.patch" || return 1
+  
+  # here's a working kludge to build all three binaries at once but don't use it ;)
+  # make CPUOPTIMIZATIONS="${CFLAGS}" nexuiz || make CPUOPTIMIZATIONS="${CFLAGS}" nexuiz || return 1
+  
+  # build the binaries separately instead to avoid truncated files
+  make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 cl-nexuiz || return 1
+  make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 sdl-nexuiz || return 1
+  make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 sv-nexuiz || return 1
+
+  # install the compiled binaries
+  install -Dm755 nexuiz-glx nexuiz-sdl nexuiz-dedicated -t $_nexdir || return 1
+
+  install -dm755 $pkgdir/usr/{bin,share/applications} || return 1
+  install -Dm755 $srcdir/nexuiz-{glx,sdl,dedicated} -t $pkgdir/usr/bin || return 1
+  install -Dm644 $srcdir/*.desktop -t $pkgdir/usr/share/applications || return 1
+  install -Dm644 $srcdir/nexuiz.png $pkgdir/usr/share/pixmaps/nexuiz.png || return 1
+}
diff --git a/pcr/nexuiz/libpng14.patch b/pcr/nexuiz/libpng14.patch
new file mode 100644
index 000000000..d6ce5ea76
--- /dev/null
+++ b/pcr/nexuiz/libpng14.patch
@@ -0,0 +1,39 @@
+diff -Nur darkplaces.old/image_png.c darkplaces/image_png.c
+--- darkplaces.old/image_png.c	2009-09-15 06:08:02.000000000 +0300
++++ darkplaces/image_png.c	2010-01-28 01:23:24.000000000 +0200
+@@ -36,7 +36,7 @@
+ static void*			(*qpng_create_info_struct)	(void*);
+ static void				(*qpng_read_info)			(void*, void*);
+ static void				(*qpng_set_expand)			(void*);
+-static void				(*qpng_set_gray_1_2_4_to_8)	(void*);
++static void				(*qpng_set_expand_gray_1_2_4_to_8)	(void*);
+ static void				(*qpng_set_palette_to_rgb)	(void*);
+ static void				(*qpng_set_tRNS_to_alpha)	(void*);
+ static void				(*qpng_set_gray_to_rgb)		(void*);
+@@ -61,7 +61,7 @@
+ 	{"png_create_info_struct",	(void **) &qpng_create_info_struct},
+ 	{"png_read_info",			(void **) &qpng_read_info},
+ 	{"png_set_expand",			(void **) &qpng_set_expand},
+-	{"png_set_gray_1_2_4_to_8",	(void **) &qpng_set_gray_1_2_4_to_8},
++	{"png_set_expand_gray_1_2_4_to_8",	(void **) &qpng_set_expand_gray_1_2_4_to_8},
+ 	{"png_set_palette_to_rgb",	(void **) &qpng_set_palette_to_rgb},
+ 	{"png_set_tRNS_to_alpha",	(void **) &qpng_set_tRNS_to_alpha},
+ 	{"png_set_gray_to_rgb",		(void **) &qpng_set_gray_to_rgb},
+@@ -110,7 +110,7 @@
+ #elif defined(MACOSX)
+ 		"libpng12.0.dylib",
+ #else
+-		"libpng12.so.0",
++		"libpng14.so.0",
+ 		"libpng.so", // FreeBSD
+ #endif
+ 		NULL
+@@ -311,7 +311,7 @@
+ 	{
+ 		qpng_set_gray_to_rgb(png);
+ 		if (my_png.BitDepth < 8)
+-			qpng_set_gray_1_2_4_to_8(png);
++			qpng_set_expand_gray_1_2_4_to_8(png);
+ 	}
+ 
+ 	if (qpng_get_valid(png, pnginfo, PNG_INFO_tRNS))
diff --git a/pcr/nexuiz/nexuiz-dedicated b/pcr/nexuiz/nexuiz-dedicated
new file mode 100644
index 000000000..bf517cce7
--- /dev/null
+++ b/pcr/nexuiz/nexuiz-dedicated
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /opt/nexuiz
+./nexuiz-dedicated $@
diff --git a/pcr/nexuiz/nexuiz-glx b/pcr/nexuiz/nexuiz-glx
new file mode 100644
index 000000000..5fad4db07
--- /dev/null
+++ b/pcr/nexuiz/nexuiz-glx
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /opt/nexuiz
+./nexuiz-glx $@
diff --git a/pcr/nexuiz/nexuiz-glx.desktop b/pcr/nexuiz/nexuiz-glx.desktop
new file mode 100644
index 000000000..8808c16db
--- /dev/null
+++ b/pcr/nexuiz/nexuiz-glx.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=2.5
+Encoding=UTF-8
+Name=Nexuiz (GLX)
+Comment=a free open-source first person shooter
+Icon=/usr/share/pixmaps/nexuiz.png
+Exec=/usr/bin/nexuiz-glx
+Terminal=false
+StartupNotify=false
+Categories=Game;
diff --git a/pcr/nexuiz/nexuiz-sdl b/pcr/nexuiz/nexuiz-sdl
new file mode 100644
index 000000000..36b6d5cc3
--- /dev/null
+++ b/pcr/nexuiz/nexuiz-sdl
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /opt/nexuiz
+./nexuiz-sdl $@
diff --git a/pcr/nexuiz/nexuiz-sdl.desktop b/pcr/nexuiz/nexuiz-sdl.desktop
new file mode 100644
index 000000000..019970e61
--- /dev/null
+++ b/pcr/nexuiz/nexuiz-sdl.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=2.5
+Encoding=UTF-8
+Name=Nexuiz (SDL)
+Comment=a free open-source first person shooter
+Icon=/usr/share/pixmaps/nexuiz.png
+Exec=/usr/bin/nexuiz-sdl
+Terminal=false
+StartupNotify=false
+Categories=Game;
diff --git a/pcr/nexuiz/nexuiz.png b/pcr/nexuiz/nexuiz.png
new file mode 100644
index 000000000..a0ec8b3d4
--- /dev/null
+++ b/pcr/nexuiz/nexuiz.png
diff --git a/pcr/owncloud-client/PKGBUILD b/pcr/owncloud-client/PKGBUILD
new file mode 100644
index 000000000..7e8dfa59a
--- /dev/null
+++ b/pcr/owncloud-client/PKGBUILD
@@ -0,0 +1,54 @@
+# Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
+# https://github.com/zizzfizzix/pkgbuilds
+
+##############################################################
+#### The section below can be adjusted to suit your needs ####
+##############################################################
+
+# What type of build do you want?
+# See http://techbase.kde.org/Development/CMake/Addons_for_KDE#Buildtypes to check what is supported.
+# Default is RelWithDebInfo to help with debugging.
+
+_buildtype="RelWithDebInfo"
+
+##############################################################
+
+_name=mirall
+pkgname=owncloud-client
+pkgver=1.0.5
+pkgrel=2
+pkgdesc="ownCloud client based on mirall"
+arch=('i686' 'x86_64')
+url="http://owncloud.org/"
+license=('GPL2')
+depends=('qt' 'csync-owncloud')
+makedepends=('cmake')
+provides=('mirall' 'owncloud-client')
+conflicts=('mirall-git')
+options=(!strip)
+install=owncloud-client.install
+backup=('etc/exclude.lst')
+source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2"
+        "${pkgname}.desktop")
+md5sums=('b7a96411f092bb16f88e3868a558032f'
+         'e223d162626c2ff54efebaa90a182d81')
+
+# Clean options array to strip pkg if release buildtype is chosen
+if [[ ${_buildtype} == "Release" ]] || [[ ${_buildtype} == "release" ]]; then
+  options=()
+fi
+
+build() {
+  if [[ -e ${srcdir}/${_name}-${pkgver}-build ]]; then rm -rf ${srcdir}/${_name}-${pkgver}-build; fi
+  mkdir ${srcdir}/${_name}-${pkgver}-build
+  cd ${srcdir}/${_name}-${pkgver}-build
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DCMAKE_BUILD_TYPE=${_buildtype} ../${_name}-${pkgver}
+  make
+}
+
+package() {
+  cd ${srcdir}/${_name}-${pkgver}-build
+  make DESTDIR=${pkgdir} install
+  install -Dm644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
+}
diff --git a/pcr/owncloud-client/owncloud-client.desktop b/pcr/owncloud-client/owncloud-client.desktop
new file mode 100644
index 000000000..005e52219
--- /dev/null
+++ b/pcr/owncloud-client/owncloud-client.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=ownCloud 2012 client
+GenericName=File Sync
+TryExec=owncloud
+Exec=owncloud %u
+Comment=ownCloud - Your Cloud, Your Data, Your Way!
+Icon=mirall
+Terminal=false
+Categories=Qt;Utility;
diff --git a/pcr/owncloud-client/owncloud-client.install b/pcr/owncloud-client/owncloud-client.install
new file mode 100644
index 000000000..1c0de2e4f
--- /dev/null
+++ b/pcr/owncloud-client/owncloud-client.install
@@ -0,0 +1,11 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
index d07972e54..334d32325 100644
--- a/pcr/zoneminder/PKGBUILD
+++ b/pcr/zoneminder/PKGBUILD
@@ -6,12 +6,12 @@
 
 pkgname=zoneminder
 pkgver=1.25.0
-pkgrel=13
+pkgrel=14
 pkgdesc="Capture, analyse, record and monitor video security cameras"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.zoneminder.com"
 license=('GPL')
-depends=('cambozola' 'apache' 'php' 'php-gd' 'php-mcrypt' 'mysql' 'pcre' 'openssl' 'ffmpeg' 'perl-libwww' 'perl-date-manip' 'perl-unicode-map' 'perl-dbi' 'perl-dbd-mysql' 'perl-io-stringy' 'perl-mime-lite' 'perl-timedate' 'perl-x10' 'perl-time-modules' 'perl-net-smtp-ssl' 'perl-sys-mmap' 'perl-net-sftp-foreign' 'perl-mime-tools' 'perl-io-tty' 'sudo' 'libv4l' 'libjpeg' 'gnutls' 'php-apache')
+depends=('cambozola' 'apache' 'php' 'php-gd' 'php-mcrypt' 'mysql' 'pcre' 'openssl' 'ffmpeg' 'perl-libwww' 'perl-date-manip' 'perl-unicode-map' 'perl-dbi' 'perl-dbd-mysql' 'perl-io-stringy' 'perl-mime-lite' 'perl-timedate' 'perl-x10' 'perl-time-modules' 'perl-net-smtp-ssl' 'perl-sys-mmap' 'perl-net-sftp-foreign' 'perl-mime-tools' 'perl-io-tty' 'libv4l' 'libjpeg' 'gnutls' 'php-apache')
 makedepends=()
 install=zoneminder.install
 source=("http://www.zoneminder.com/downloads/ZoneMinder-${pkgver}.tar.gz"