Sun Sep 23 01:11:08 PDT 2012

11 files changed, 194 insertions, 30 deletions

diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 9b85d9dfe..469e1175f 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166615 2012-09-13 08:59:14Z andrea $
+# $Id: PKGBUILD 166927 2012-09-22 09:45:48Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -31,10 +31,16 @@ makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
              'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw'
              'openjpeg' 'kdegraphics-okular' 'pstoedit')
 groups=('calligra')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('b4f1532d802a6c97fbcfa6a0467b7216')
+source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
+        'lcms24.patch')
+md5sums=('b4f1532d802a6c97fbcfa6a0467b7216'
+         '42065ccf5617fc340b29d6bfbe9fa32f')
 
 build() {
+  cd ${pkgbase}-${pkgver}
+  patch -p1 -i "${srcdir}"/lcms24.patch
+  cd ..
+
   mkdir build
   cd build
   cmake ../${pkgbase}-${pkgver} \
diff --git a/extra/calligra/lcms24.patch b/extra/calligra/lcms24.patch
new file mode 100644
index 000000000..b2427aff1
--- /dev/null
+++ b/extra/calligra/lcms24.patch
@@ -0,0 +1,12 @@
+--- a/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h
++++ b/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h
+@@ -22,6 +22,8 @@
+ 
+ #include <LcmsColorSpace.h>
+ #include <KoColorSpaceTraits.h>
++
++#define TYPE_XYZA_FLT         (FLOAT_SH(1)|COLORSPACE_SH(PT_XYZ)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(4))
+ 
+ #include <KoColorModelStandardIds.h>
+ 
+
diff --git a/extra/gperftools/PKGBUILD b/extra/gperftools/PKGBUILD
new file mode 100644
index 000000000..c8ad827ae
--- /dev/null
+++ b/extra/gperftools/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 166940 2012-09-22 20:23:08Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Thomas Jost <schnouki@schnouki.net>
+# Contributor: JaDa <jada@archlinux.us>
+# Contributor: Joaquim Pedro <osmano807@gmail.com>
+# Contributor: Jan Rüegg <rggjan@gmail.com>
+
+pkgname=gperftools
+pkgver=2.0
+pkgrel=4
+pkgdesc="Fast, multi-threaded malloc() and nifty performance analysis tools"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/gperftools/"
+license=('BSD')
+depends=('perl')
+optdepends=('graphviz: pprof graph generation'
+            'gv: pprof postscript generation')
+options=('!libtool')
+source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+sha256sums=('7de3dd91f018825b1e7d332af1edace15c6211f430186febede1835069861080')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  # fix for glibc 2.16
+  sed -i 's:siginfo_t:siginfo:' src/base/linuxthreads.cc
+
+  ./configure --prefix=/usr --enable-frame-pointers
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD
new file mode 100644
index 000000000..23b59b1da
--- /dev/null
+++ b/extra/leveldb/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 166942 2012-09-22 20:23:58Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Contributor: feydaykyn <feydaykyn@yahoo.fr>
+
+pkgname=leveldb
+pkgver=1.5.0
+pkgrel=4
+pkgdesc="A fast and lightweight key/value database library"
+arch=('i686' 'x86_64')
+url="https://code.google.com/p/leveldb/"
+license=('BSD')
+depends=('gperftools' 'snappy')
+source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+sha1sums=('b5b45ff74065f242c37f465b13dafb925972ca43')
+
+build() {
+  # buildsys doesn't play nicely with -Wl,--as-needed
+  LDFLAGS=-Wl,-O1,--sort-common,-z,relro
+
+  make -C "$pkgname-$pkgver"
+}
+
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  install -dm755 \
+      "$pkgdir"/usr/{include/leveldb,lib} \
+      "$pkgdir"/usr/share/doc/"$pkgname"
+
+  # libraries
+  install -m755 -t "$pkgdir/usr/lib" libleveldb.so.1.5 libleveldb.a
+  cp -P libleveldb.so{,.1} "$pkgdir/usr/lib"
+
+  # headers
+  install -m644 -t "$pkgdir/usr/include/leveldb" include/leveldb/*
+
+  # documentation
+  cp -r doc/* "$pkgdir/usr/share/doc/$pkgname"
+
+  # license
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD
index c4d5cd01b..79ca5d5fb 100644
--- a/extra/nx/PKGBUILD
+++ b/extra/nx/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162757 2012-06-29 15:32:58Z andyrtr $
+# $Id: PKGBUILD 166924 2012-09-22 09:16:46Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.14
+pkgver=3.5.0.15
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://wiki.x2go.org/"
@@ -14,11 +14,11 @@ makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from
              )
 source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
         nx-x11.ld.so.conf.d)
-md5sums=('f20f5a12e15849bae8a1f2d7b44830ab'
+md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0'
          'f2ec60c7e2d81bef2f7292d2b33681a6')
 
 build() {
-  cd "${srcdir}/nx-libs_$pkgver"
+  cd "${srcdir}/nx-libs-$pkgver"
   make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
   # fake install
   mkdir $srcdir/fakeinstall
@@ -47,7 +47,7 @@ package_nxproxy() {
   ln -sv /usr/lib/nx/bin/nxproxy .
   
   # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxproxy ${pkgdir}/usr/bin
+  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxproxy ${pkgdir}/usr/bin
   chmod +x ${pkgdir}/usr/bin/nxproxy
   cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1
 }
@@ -79,7 +79,7 @@ package_nx-x11() {
   ln -sv /usr/lib/nx/bin/nxauth .
   
   # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxauth ${pkgdir}/usr/bin
+  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxauth ${pkgdir}/usr/bin
   chmod +x ${pkgdir}/usr/bin/nxauth
   
   install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf"
@@ -96,10 +96,10 @@ package_nxagent() {
   ln -sv /usr/lib/nx/bin/nxagent .
   
   # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin
+  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxagent ${pkgdir}/usr/bin
   chmod +x ${pkgdir}/usr/bin/nxagent
   # required nxcompshad libs
-  cp -a ${srcdir}/nx-libs_$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx
+  cp -a ${srcdir}/nx-libs-$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx
   cd ${pkgdir}/usr/lib/nx
   ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3
   ln -sv libXcompshad.so.3.5.0 libXcompshad.so
diff --git a/extra/snappy/PKGBUILD b/extra/snappy/PKGBUILD
new file mode 100644
index 000000000..fbd7a1ac5
--- /dev/null
+++ b/extra/snappy/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 166939 2012-09-22 20:17:43Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Contributor: Antony Male <antony dot male at geemail dot com>>
+
+pkgname=snappy
+pkgver=1.0.5
+pkgrel=2
+pkgdesc='A fast compressor/decompressor library'
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/snappy/"
+license=('BSD')
+depends=('glibc' 'gcc-libs')
+checkdepends=('zlib')
+options=('!libtool')
+source=("http://snappy.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+md5sums=('4c0af044e654f5983f4acbf00d1ac236')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  # compile without assertions
+  CXXFLAGS+=\ -DNDEBUG
+
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  # compile without assertions
+  CXXFLAGS+=\ -DNDEBUG
+
+  make -C "$pkgname-$pkgver" check
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  install -m644 -D COPYING "$pkgdir/usr/share/licenses/snappy/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/taglib/PKGBUILD b/extra/taglib/PKGBUILD
index f87fb8423..4a5debbc0 100644
--- a/extra/taglib/PKGBUILD
+++ b/extra/taglib/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 163967 2012-07-23 03:03:00Z allan $
+# $Id: PKGBUILD 166944 2012-09-22 20:46:26Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Ike Devolder <ike.devolder@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=taglib
-pkgver=1.7.2
-pkgrel=2
+pkgver=1.8
+pkgrel=1
 pkgdesc="A Library for reading and editing the meta-data of several popular audio formats"
 arch=('i686' 'x86_64')
 url="http://developer.kde.org/~wheeler/taglib.html"
@@ -13,12 +14,11 @@ license=('LGPL' 'MPL')
 depends=('sh' 'zlib' 'gcc-libs')
 makedepends=('cmake' 'pkg-config')
 options=('!libtool')
-source=("http://developer.kde.org/~wheeler/files/src/$pkgname-$pkgver.tar.gz"
-        'ape-idev2.patch')
+source=("https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('dcb8bd1b756f2843e18b1fdf3aaeee15')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/ape-idev2.patch
 
   cd "${srcdir}"
   mkdir build
@@ -35,5 +35,3 @@ package() {
   cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('b0a9e797d3833fb933c7c3176de3d720'
-         'c7c165d99acf01456351ba39ff7056cb')
diff --git a/extra/tftp-hpa/PKGBUILD b/extra/tftp-hpa/PKGBUILD
index 6f33be75b..97e98dc0d 100644
--- a/extra/tftp-hpa/PKGBUILD
+++ b/extra/tftp-hpa/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 151760 2012-03-02 09:20:56Z tpowa $
+# $Id: PKGBUILD 166932 2012-09-22 13:11:31Z thomas $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Contributor: Jose Javier  <jojapa@terra.es>
 pkgname=tftp-hpa
 pkgver=5.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Official tftp server"
 arch=('i686' 'x86_64')
-url="http://www.kernel.org/pub/software/network/tftp/"
+url="http://www.kernel.org/pub/software/network/tftp/tftp-hpa/"
 license=('BSD')
 depends=('readline>=6.0.00')
 conflicts=('netkit-tftp')
@@ -15,7 +15,16 @@ source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgve
        tftpd.rc 
        tftpd.conf 
        LICENSE
+       tftpd.service
+       tftpd.socket
        tftp-hpa-0.49-fortify-strcpy-crash.patch)
+md5sums=('3de3038e7c2bf6fc5d496825893ac8e7'
+         '83fbb6f52205d95951a3c059e5351ca2'
+         'f41f484f94e91175e9183e872a2bff3b'
+         '6ce21e27b6fdc1a1adf85c81e42aeecf'
+         '165b98f814f74568635a720e674d7f18'
+         'a23369ea33be8b4a5427ec2cfc5373dd'
+         '22e8629ef19bc276a102c5d4d284c1bd')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -29,14 +38,12 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}" 
   make INSTALLROOT="${pkgdir}" install
   install -d "${pkgdir}/etc/rc.d"
-  install -d "${pkgdir}/var/tftpboot"
+  install -d "${pkgdir}/srv/tftp"
   install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd"
   install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd"
-  rm "${pkgdir}/usr/share/man/man8/tftpd.8"
+  install -D -m655 "${srcdir}/tftpd.service" "${pkgdir}/usr/lib/systemd/system/tftpd.service"
+  install -D -m655 "${srcdir}/tftpd.socket" "${pkgdir}/usr/lib/systemd/system/tftpd.socket"
   install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  # Remove conflict with iputils
+  rm "${pkgdir}/usr/share/man/man8/tftpd.8"  
 }
-md5sums=('3de3038e7c2bf6fc5d496825893ac8e7'
-         '83fbb6f52205d95951a3c059e5351ca2'
-         '414a79dc891bced056d99a9bb790fc9e'
-         '6ce21e27b6fdc1a1adf85c81e42aeecf'
-         '22e8629ef19bc276a102c5d4d284c1bd')
diff --git a/extra/tftp-hpa/tftpd.conf b/extra/tftp-hpa/tftpd.conf
index 4705cc3a9..a4329f608 100644
--- a/extra/tftp-hpa/tftpd.conf
+++ b/extra/tftp-hpa/tftpd.conf
@@ -1,4 +1,4 @@
 #
 # Parameters to be passed to TFTPD
 #
-TFTPD_ARGS="-l -s /var/tftpboot" 
+TFTPD_ARGS="-l -s /srv/tftp/"
diff --git a/extra/tftp-hpa/tftpd.service b/extra/tftp-hpa/tftpd.service
new file mode 100644
index 000000000..62562343d
--- /dev/null
+++ b/extra/tftp-hpa/tftpd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=hpa's original TFTP daemon
+
+[Service]
+ExecStart=/usr/sbin/in.tftpd -s /srv/tftp/
+StandardInput=socket
+StandardOutput=inherit
+StandardError=journal
diff --git a/extra/tftp-hpa/tftpd.socket b/extra/tftp-hpa/tftpd.socket
new file mode 100644
index 000000000..0315ed608
--- /dev/null
+++ b/extra/tftp-hpa/tftpd.socket
@@ -0,0 +1,5 @@
+[Socket]
+ListenDatagram=69
+
+[Install]
+WantedBy=sockets.target