diff options
282 files changed, 10297 insertions, 195 deletions
diff --git a/community-staging/lightspark/PKGBUILD b/community-staging/lightspark/PKGBUILD new file mode 100644 index 000000000..f64e7e5d1 --- /dev/null +++ b/community-staging/lightspark/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgname=lightspark +pkgver=0.5.2.1 +pkgrel=3 +pkgdesc='An alternative Flash Player for Linux.' +arch=('i686' 'x86_64') +url='http://lightspark.sourceforge.net' +license=('LGPL3') +conflicts=('lightspark-git') +depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'gtkglext' 'desktop-file-utils' 'libxml++' 'libxml2') +makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'fontconfig') +optdepends=('gnash-gtk: fallback support') +install="lightspark.install" +source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tar.gz" + 'llvm29.diff') +md5sums=('ac2233a83e8bf0b305563bbce322cd76' + '5f717d1d9ead478184ca68f6ac068099') + +build() { + cd lightspark-${pkgver} + patch -Np0 -i ${srcdir}/llvm29.diff + cd ${srcdir} + + rm -rf build + mkdir build + cd build + + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCOMPILE_PLUGIN=1 \ + -DCMAKE_BUILD_TYPE=Release \ + -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \ + ../lightspark-${pkgver} + + make +} + +package() { + cd build + + make DESTDIR=${pkgdir} install +} diff --git a/community-staging/lightspark/lightspark.install b/community-staging/lightspark/lightspark.install new file mode 100644 index 000000000..75e2b7b55 --- /dev/null +++ b/community-staging/lightspark/lightspark.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/community-staging/lightspark/llvm29.diff b/community-staging/lightspark/llvm29.diff new file mode 100644 index 000000000..f859852af --- /dev/null +++ b/community-staging/lightspark/llvm29.diff @@ -0,0 +1,12 @@ +--- CMakeLists.txt.old 2011-11-01 22:07:52.475608726 +0000 ++++ CMakeLists.txt 2011-11-01 22:08:52.046241925 +0000 +@@ -152,7 +152,8 @@ + MESSAGE(FATAL_ERROR "LLVM >=2.8 is required!") + ENDIF(${LLVM_STRING_VERSION} VERSION_LESS 2.8) + IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9) +- MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!") ++ #MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!") ++ ADD_DEFINITIONS(-DLLVM_29) + ENDIF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9) + IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.8) + ADD_DEFINITIONS(-DLLVM_28) diff --git a/community-staging/mapnik/PKGBUILD b/community-staging/mapnik/PKGBUILD new file mode 100644 index 000000000..9492ea85e --- /dev/null +++ b/community-staging/mapnik/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 59376 2011-11-23 21:18:44Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: David Dent <thewinch@gmail.com> +# Contributor: orbisvicis <orbisvicis@gmail.com> + +pkgname=mapnik +pkgver=0.7.1 +pkgrel=12 +pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps." +arch=('i686' 'x86_64') +url="http://mapnik.org/" +license=('LGPL') +depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2' + 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo' + 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool') + # already in core ('zlib' 'sqlite3') +optdepends=('libxslt: Web Map Service' + 'python-lxml: Web Map Service' + 'python-imaging: Web Map Service' + 'python-nose: Web Map Service' + 'apache: Web Map Service' + 'mod_fastcgi: Web Map Service - or:' + 'mod_fcgid: Web Map Service - or:' + 'mod_wsgi: Web Map Service' + ) +makedepends=('scons' 'boost') # already in core ('pkg-config') +conflicts=('mapnik-svn') +install="mapnik.install" +source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('8f65fda2a792518d6f6be8a85f62fc73') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + #patch SConstruct so libs end up in /usr/lib not /usr/lib64 on X86_64 + sed -i -e "/LIBDIR_SCHEMA=/s/lib64/lib/" SConstruct + + sed -i 's/-ansi -Wall/-ansi -DBOOST_FILESYSTEM_VERSION=2 -Wall/' SConstruct + + scons configure \ + PREFIX="/usr" \ + INPUT_PLUGINS=all \ + DESTDIR="$pkgdir" + scons +} +package(){ + cd "$srcdir/$pkgname-$pkgver" + scons install + + # fix permissions on SCons-autogenerated files + chmod 644 "${pkgdir}/usr/lib/python2.7/site-packages/mapnik/paths.py" +} diff --git a/community-staging/mapnik/mapnik.install b/community-staging/mapnik/mapnik.install new file mode 100644 index 000000000..46f265d5b --- /dev/null +++ b/community-staging/mapnik/mapnik.install @@ -0,0 +1,11 @@ +post_install() { + /sbin/ldconfig +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/mongodb/PKGBUILD b/community-staging/mongodb/PKGBUILD new file mode 100644 index 000000000..aac341450 --- /dev/null +++ b/community-staging/mongodb/PKGBUILD @@ -0,0 +1,72 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Mathias Stearn <mathias@10gen.com> +# Contributor: Alec Thomas + +pkgname=mongodb +pkgver=2.0.1 +pkgrel=3 +pkgdesc='A high-performance, open source, schema-free document-oriented database.' +arch=('i686' 'x86_64') +url='http://www.mongodb.org' +license=('AGPL3') +depends=('boost-libs') +makedepends=('scons' 'boost') +#checkdepends=('python2-pymongo') +optdepends=('libpcap: needed for mongosniff') +backup=('etc/mongodb.conf') +install="mongodb.install" +source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" + 'mongodb.rc' + 'mongodb.conf') +md5sums=('cb8579074b7c9752eb382a2094ac4523' + '9c67e00f4626ad761a8f7d4e037a54d7' + '4839fe1d638187ca3226e8267b947318') + +build() { + export SCONSFLAGS="$MAKEFLAGS" + + cd mongodb-src-r${pkgver} + + # fix python name for smoke tests + sed \ + -e 's/python/&2/' \ + -i SConstruct + + scons \ + all \ + --full +} + +<<COMMENT +check() { + export SCONSFLAGS="$MAKEFLAGS" + + cd mongodb-src-r${pkgver} + + scons \ + smokeAll \ + --smokedbprefix=${srcdir} +} +COMMENT + +package() { + export SCONSFLAGS="$MAKEFLAGS" + + cd mongodb-src-r${pkgver} + + scons \ + install \ + --full \ + --prefix=${pkgdir}/usr + + install -D -m755 ${srcdir}/mongodb.rc \ + ${pkgdir}/etc/rc.d/mongodb + install -D -m644 ${srcdir}/mongodb.conf \ + ${pkgdir}/etc/mongodb.conf + install -d -m700 ${pkgdir}/var/lib/mongodb + install -d -m755 ${pkgdir}/var/log/mongodb + + if [ -d ${pkgdir}/usr/lib64 ]; then + mv ${pkgdir}/usr/lib64 ${pkgdir}/usr/lib + fi +} diff --git a/community-staging/mongodb/mongodb.conf b/community-staging/mongodb/mongodb.conf new file mode 100644 index 000000000..c5272b7f2 --- /dev/null +++ b/community-staging/mongodb/mongodb.conf @@ -0,0 +1,8 @@ +# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details +# Run mongod --help to see a list of options + +bind_ip = 127.0.0.1 +quiet = true +dbpath = /var/lib/mongodb +logpath = /var/log/mongodb/mongod.log +logappend = true diff --git a/community-staging/mongodb/mongodb.install b/community-staging/mongodb/mongodb.install new file mode 100755 index 000000000..3922c12ef --- /dev/null +++ b/community-staging/mongodb/mongodb.install @@ -0,0 +1,32 @@ +# vim: syntax=sh + +post_install() { + useradd -r -g daemon -d /var/lib/mongodb -s /bin/bash mongodb + chown -R mongodb:daemon /var/lib/mongodb + chown -R mongodb:daemon /var/log/mongodb + + if [ "$(arch)" != "x86_64" ] + then + echo '==> Warning: the 32 bit version of MongoDB is limited to about 2GB of data.' + echo '==> See http://blog.mongodb.org/post/137788967/32-bit-limitations' + fi +} + +post_upgrade() { + chown -R mongodb:daemon /var/lib/mongodb + chown -R mongodb:daemon /var/log/mongodb + + if [ "$(vercmp $2 1.8.2-3)" -lt 0 ] + then + # have to fix my fudge up in 1.8.2-2 and 1.8.2-3 + # added july 5th, 2011 + usermod -s /bin/bash mongodb >& /dev/null + echo 'The dbpath has changed from /var/state/mongodb to /var/lib/mongodb' + echo 'Make sure you move your data files to the new dbpath before you start/restart mongodb' + echo 'The logpath has changed from /var/log/mongod to /var/log/mongodb/mongod.log' + fi +} + +pre_remove() { + userdel mongodb +} diff --git a/community-staging/mongodb/mongodb.rc b/community-staging/mongodb/mongodb.rc new file mode 100755 index 000000000..30f2bbf79 --- /dev/null +++ b/community-staging/mongodb/mongodb.rc @@ -0,0 +1,39 @@ +#!/bin/bash +# vim: syntax=sh + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=$(pidof /usr/bin/mongod) +case "$1" in + start) + stat_busy "Starting mongodb" + [ -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --fork" > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon mongodb + stat_done + fi + ;; + stop) + stat_busy "Stopping mongodb" + [ ! -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --shutdown" &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon mongodb + while [ ! -z "$(pidof /usr/bin/mongod)" ]; do + sleep 1; + done + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/mygui/PKGBUILD b/community-staging/mygui/PKGBUILD new file mode 100644 index 000000000..d66acff59 --- /dev/null +++ b/community-staging/mygui/PKGBUILD @@ -0,0 +1,77 @@ +# $Id: PKGBUILD 59340 2011-11-23 18:54:28Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Andrew Belitsky <belitsky.a@gmail.com> +pkgbase=mygui +pkgname=('mygui' 'mygui-docs') +pkgver=3.2.0rc1 +pkgrel=10 +pkgdesc="A multilayer and overlappable GUI System for OGRE" +arch=('i686' 'x86_64') +url="http://mygui.info/" +license=('LGPL') +depends=('boost-libs' 'ogre' 'ois') +makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu') +install=mygui.install +source=("http://downloads.sourceforge.net/my-gui/MyGUI_3.2.0_RC1.zip") +md5sums=('1ac1340148e81ad49a26c8a87acefc6b') + +build() { + cd $srcdir/MyGUI_3.2.0_RC1 + + # change CMake config so demos install to /opt + sed -i 's:"bin:"../opt/MYGUI:' CMake/Utils/MyGUIConfigTargets.cmake + sed -i -e 's:../share:/usr/share:' \ + -e 's:"bin":"../opt/MYGUI":' \ + CMake/InstallResources.cmake + + # get a clean build dir + [[ -d build ]] && rm -rf build + mkdir build && cd build + + # generate CMake Makefile + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMYGUI_INSTALL_SAMPLES=TRUE \ + -DMYGUI_INSTALL_TOOLS=TRUE \ + -DMYGUI_INSTALL_DOCS=TRUE \ + -DMYGUI_INSTALL_MEDIA=TRUE \ + -DCMAKE_BUILD_TYPE=Release # set=Debug for debugging version + + # compile + make + + # generate docs + if [[ $(which dot) && $(which doxygen) ]]; then + make api-docs 2>/dev/null + fi +} + +package_mygui() { + optdepends=('mygui-docs: documentation') + + cd $srcdir/MyGUI_3.2.0_RC1 + + cd build + + # install the whole bunch + make DESTDIR="$pkgdir" install + + # make demos work + chown root:users $pkgdir/opt/MYGUI + chmod 775 $pkgdir/opt/MYGUI +} + +package_mygui-docs() { + pkgdesc="Documentation for mygui" + depends=() + + cd $srcdir/MyGUI_3.2.0_RC1 + + cd build + + # install docs + install -d $pkgdir/usr/share/doc/ + cp -r Docs/html $pkgdir/usr/share/doc/MYGUI +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/mygui/mygui.install b/community-staging/mygui/mygui.install new file mode 100644 index 000000000..8db799a0e --- /dev/null +++ b/community-staging/mygui/mygui.install @@ -0,0 +1,3 @@ +post_install() { + echo "To view the MyGUI samples, go to /opt/MYGUI/ and run the samples individually" +} diff --git a/community-staging/qbittorrent/PKGBUILD b/community-staging/qbittorrent/PKGBUILD new file mode 100644 index 000000000..5bafe2707 --- /dev/null +++ b/community-staging/qbittorrent/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 59330 2011-11-23 15:37:18Z tdziedzic $ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> + +pkgname=qbittorrent +pkgver=2.9.2 +pkgrel=4 +pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" +arch=('i686' 'x86_64') +url="http://www.qbittorrent.org/" +license=('GPL') +depends=('qt' 'libtorrent-rasterbar' 'xdg-utils') +makedepends=('boost' 'geoip') +optdepends=('python2: needed for search' + 'geoip: improves peer country resolution') +install='qbittorrent.install' +source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz") +md5sums=('0c2188e0065be57e50c06f5934d5f7a2') + +build() { + cd qbittorrent-${pkgver} + + sed -i \ + -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find ./ -name '*.py') + + ./configure \ + --prefix=/usr + + make +} + +package() { + cd qbittorrent-${pkgver} + + make INSTALL_ROOT=${pkgdir} install +} diff --git a/community-staging/qbittorrent/qbittorrent.install b/community-staging/qbittorrent/qbittorrent.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/community-staging/qbittorrent/qbittorrent.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/community-staging/schroot/PKGBUILD b/community-staging/schroot/PKGBUILD new file mode 100644 index 000000000..666bd7032 --- /dev/null +++ b/community-staging/schroot/PKGBUILD @@ -0,0 +1,70 @@ +# $Id: PKGBUILD 59379 2011-11-23 21:20:11Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> + +pkgname=schroot +pkgver=1.4.23 +pkgrel=3 +pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)." +url="http://packages.qa.debian.org/s/schroot.html" +license=('GPL3') +depends=('pam' 'lockdev' 'boost' 'e2fsprogs') +optdepends=('btrfs-progs-unstable' 'lvm2') +arch=('i686' 'x86_64') +conflicts=('dchroot') +replaces=('dchroot') +provides=('schroot' 'sbuild' 'dchroot') +backup=('etc/schroot/schroot.conf' + 'etc/schroot/arch32/config' + 'etc/schroot/arch32/copyfiles' + 'etc/schroot/arch32/mount' + 'etc/schroot/arch32/nssdatabases') +options=(!libtool) +source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2" + 'pam.d.schroot.patch' + 'arch32-example' + 'arch32-config' + 'arch32-copyfiles' + 'arch32-mount' + 'arch32-nssdatabases') +md5sums=('73873e0fee83a45655ed8efa246a1e26' + 'a8d77cac806a0a9adef3f93cdbeb280a' + '1e34db5387c4e5de911e15d8a9208bdb' + '5a3f7b839c7e0b8933748da7c5b6385b' + '06db41d42f9fce5449a28feb76ded556' + 'f0d5d5b5e34a860f6f90b5628c680f46' + 'af1da6edd8c8c0dafeeb2c2c4e0c840b') + +build() { + cd ${pkgname}-${pkgver} + export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-dchroot \ + --enable-lvm-snapshot \ + --enable-btrfs-snapshot \ + BTRFS=/sbin/btrfs \ + BTRFSCTL=/sbin/btrfsctl \ + LVCREATE=/sbin/lvcreate \ + LVREMOVE=/sbin/lvremove + # --enable-csbuild + make +} + +check() { + cd ${pkgname}-${pkgver} + make -k check +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR=$pkgdir install + install -dm 755 ${pkgdir}/etc/schroot/arch32 + install -m 644 ${srcdir}/arch32-{config,mount,copyfiles,nssdatabases} ${pkgdir}/etc/schroot/arch32 + rename 'arch32-' '' ${pkgdir}/etc/schroot/arch32/* + install -m 644 ${srcdir}/arch32-example ${pkgdir}/etc/schroot/chroot.d/arch32.conf.example + patch -i ${srcdir}/pam.d.schroot.patch ${pkgdir}/etc/pam.d/schroot +} diff --git a/community-staging/schroot/arch32-config b/community-staging/schroot/arch32-config new file mode 100644 index 000000000..0ee72d522 --- /dev/null +++ b/community-staging/schroot/arch32-config @@ -0,0 +1,11 @@ +# Default settings for chroot setup and exec scripts. +# See schroot-script-config(5) for further details. + +# Filesystems to mount inside the chroot. +FSTAB="/etc/schroot/arch32/mount" + +# Files to copy from the host system into the chroot. +COPYFILES="/etc/schroot/arch32/copyfiles" + +# System databases to copy into the chroot +NSSDATABASES="/etc/schroot/arch32/nssdatabases" diff --git a/community-staging/schroot/arch32-copyfiles b/community-staging/schroot/arch32-copyfiles new file mode 100644 index 000000000..88f093ceb --- /dev/null +++ b/community-staging/schroot/arch32-copyfiles @@ -0,0 +1,7 @@ +/etc/group +/etc/hosts +/etc/passwd +/etc/resolv.conf +/etc/rc.conf +/etc/localtime +/etc/locale.gen diff --git a/community-staging/schroot/arch32-example b/community-staging/schroot/arch32-example new file mode 100644 index 000000000..3f059e3c0 --- /dev/null +++ b/community-staging/schroot/arch32-example @@ -0,0 +1,10 @@ +[arch32] +description=Arch32 +type=directory +directory=/opt/arch32 +#users=username +groups=users +root-groups=root +script-config=arch32/config +personality=linux32 +#aliases=32,i686 diff --git a/community-staging/schroot/arch32-mount b/community-staging/schroot/arch32-mount new file mode 100644 index 000000000..075d6e451 --- /dev/null +++ b/community-staging/schroot/arch32-mount @@ -0,0 +1,12 @@ +# mount.defaults: static file system information for chroots. +# Note that the mount point will be prefixed by the chroot path +# (CHROOT_PATH) +# +# <file system> <mount point> <type> <options> <dump> <pass> +proc /proc proc defaults 0 0 +/dev /dev none rw,bind 0 0 +#/dev/pts /dev/pts none rw,bind 0 0 +tmpfs /dev/shm tmpfs defaults 0 0 +/sys /sys none rw,bind 0 0 +/tmp /tmp none rw,bind 0 0 +/home /home none rw,bind 0 0 diff --git a/community-staging/schroot/arch32-nssdatabases b/community-staging/schroot/arch32-nssdatabases new file mode 100644 index 000000000..815ddce3f --- /dev/null +++ b/community-staging/schroot/arch32-nssdatabases @@ -0,0 +1,6 @@ +# System databases to copy into the chroot from the host system. +# +# <database name> +passwd +shadow +group diff --git a/community-staging/schroot/pam.d.schroot.patch b/community-staging/schroot/pam.d.schroot.patch new file mode 100644 index 000000000..528acb5f7 --- /dev/null +++ b/community-staging/schroot/pam.d.schroot.patch @@ -0,0 +1,15 @@ +@@ -23,13 +23,6 @@ + # time restrainst on schroot usage. + # account requisite pam_time.so + +-# The standard Unix authentication modules, used with +-# NIS (man nsswitch) as well as normal /etc/passwd and +-# /etc/shadow entries. +-@include common-auth +-@include common-account +-@include common-session +- + # Sets up user limits, please uncomment and read /etc/security/limits.conf + # to enable this functionality. + # session required pam_limits.so + diff --git a/community-staging/smalltalk/PKGBUILD b/community-staging/smalltalk/PKGBUILD new file mode 100644 index 000000000..91e402011 --- /dev/null +++ b/community-staging/smalltalk/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 59387 2011-11-23 22:54:36Z stephane $ +# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# Contributor: mrshpot <mrshpot at gmail dot com> +# Contributor: Michael Fellinger <m.fellinger@gmail.com> + +pkgname=smalltalk +pkgver=3.2.4 +pkgrel=3 +pkgdesc='A free implementation of Smalltalk-80 by the GNU project' +url='http://smalltalk.gnu.org/' +license=('GPL' 'LGPL') +arch=('i686' 'x86_64') +options=('!libtool') + +depends=('gmp' 'libffi' 'libsigsegv' 'readline') +makedepends=('gdbm' 'gtk2' 'sqlite3' 'tk' 'zip') + +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('a36a7c9beddca08dc492b500738efc82') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/smalltalk \ + --with-imagedir=/var/lib/smalltalk \ + --enable-gtk=yes \ + --with-system-libffi \ + --with-system-libsigsegv \ + --with-readline \ + --with-tcl --with-tk \ + --with-x --without-emacs + make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="$pkgdir" install + + # fix manpage symlink + rm -f $pkgdir/usr/share/man/man1/gst-reload.1 + ln -s gst-load.1 $pkgdir/usr/share/man/man1/gst-reload.1 +} diff --git a/community-staging/springlobby/PKGBUILD b/community-staging/springlobby/PKGBUILD new file mode 100644 index 000000000..9ca9df44b --- /dev/null +++ b/community-staging/springlobby/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 59348 2011-11-23 20:11:36Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: DuGi <dugi@irc.pl> + +pkgname=springlobby +pkgver=0.139 +pkgrel=3 +pkgdesc="A free cross-platform lobby client for the Spring RTS project." +arch=('i686' 'x86_64') +url="http://springlobby.info/" +license=('GPL2') +depends=('wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs') +optdepends=('sdl' 'sdl_sound' 'sdl_mixer') +makedepends=('boost' 'asio' 'cmake') +source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 + springlobby.desktop + springlobby.png) +md5sums=('48c572117338277068c67ec1ff7d514f' + '45f8b59d033931d02e734fe3bd7777dd' + '1f388187539aeb0358b51995e26ed890') + +build() { + cd $srcdir/${pkgname}-$pkgver + + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + + sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt + + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DOPTION_SOUND=false + make +} + +package() { + cd $srcdir/${pkgname}-$pkgver + + make DESTDIR=$pkgdir install + + install -m755 -d $pkgdir/usr/share/applications + install -m644 $srcdir/springlobby.desktop $pkgdir/usr/share/applications + + install -m755 -d -p $pkgdir/usr/share/pixmaps + install -m644 $srcdir/springlobby.png $pkgdir/usr/share/pixmaps +} + +# vim: sw=2:ts=2 et: diff --git a/community-staging/springlobby/springlobby.desktop b/community-staging/springlobby/springlobby.desktop new file mode 100644 index 000000000..1dce96b90 --- /dev/null +++ b/community-staging/springlobby/springlobby.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=SpringLobby +Comment=Lobby for Spring. An open source RTS with similar gameplay to TA +Exec=springlobby +Icon=springlobby.png +Terminal=false +Type=Application +Categories=Application;Game;StrategyGame; diff --git a/community-staging/springlobby/springlobby.png b/community-staging/springlobby/springlobby.png Binary files differnew file mode 100644 index 000000000..89c7ab0ac --- /dev/null +++ b/community-staging/springlobby/springlobby.png diff --git a/community-staging/twinkle/PKGBUILD b/community-staging/twinkle/PKGBUILD new file mode 100644 index 000000000..90cf4d6aa --- /dev/null +++ b/community-staging/twinkle/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 59381 2011-11-23 21:20:51Z spupykin $ +# Maintainer: +# Contributor: Jeff Mickey <jeff@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> +# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> + +pkgname=twinkle +pkgver=1.4.2 +pkgrel=12 +pkgdesc="A softphone for voice over IP and instant messaging communications using the SIP protocol" +arch=('i686' 'x86_64') +url="http://www.twinklephone.com/" +license=('GPL') +depends=('file' 'speex' 'boost-libs' 'libsndfile' 'commoncpp2' 'libxml2' 'libx11' + 'qt3' 'libzrtpcpp') +makedepends=('pkg-config' 'boost') +source=(http://www.xs4all.nl/~mfnboer/${pkgname}/download/${pkgname}-${pkgver}.tar.gz) +md5sums=('d70c8972f296ffd998c7fb698774705b') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + . /etc/profile.d/qt3.sh + ./configure --prefix=/usr \ + --without-kde \ + --with-speex + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -D -m644 twinkle.desktop ${pkgdir}/usr/share/applications/twinkle.desktop +} diff --git a/community-staging/twinkle/twinkle.desktop b/community-staging/twinkle/twinkle.desktop new file mode 100644 index 000000000..e85a32e51 --- /dev/null +++ b/community-staging/twinkle/twinkle.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Twinkle +Comment=A SIP softphone for Qt +Icon=/usr/share/twinkle/twinkle48.png +Exec=twinkle +Terminal=false +Type=Application +Categories=Network; +StartupNotify=false diff --git a/community-staging/wt/PKGBUILD b/community-staging/wt/PKGBUILD new file mode 100644 index 000000000..1d8d97356 --- /dev/null +++ b/community-staging/wt/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 59383 2011-11-23 21:21:37Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Denis Martinez <deuns.martinez@gmail.com> + +pkgname=wt +pkgver=3.1.11 +pkgrel=2 +pkgdesc="a C++ library and application server for developing and deploying web applications" +arch=('i686' 'x86_64') +url="http://www.webtoolkit.eu/" +license=('GPL') +depends=('boost-libs>=1.36') +makedepends=('boost>=1.36' 'cmake>=2.8' + 'postgresql-libs' 'zlib' 'fcgi' 'sqlite3' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt') +optdepends=('openssl: for SSL support in built-in webserver' + 'zlib: for compression in HTTP protocol' + 'fcgi: for FastCGI support' + 'postgresql-libs: for PostgreSQL Dbo support' + 'sqlite3: for Sqlite3 Dbo support' + 'libharu: for PDF generation (WPdfImage)' + 'graphicsmagick: for raster image support (WRasterImage)' + 'pango: for advanced font rendering (WRasterImage)' + 'mysql++: for the hangman example' + 'qt: for the Wt/Qt interopability example (wtwithqt)') +backup=('etc/wt/wt_config.xml') +source=(http://downloads.sourceforge.net/witty/$pkgname-${pkgver}.tar.gz) +md5sums=('0e1701db78a899d1f7e943098678cc7a') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + mkdir -p build + cd build + cmake -DCONNECTOR_HTTP=ON -DCMAKE_INSTALL_PREFIX=/usr \ + -DWEBUSER=http -DWEBGROUP=http -DRUNDIR=/var/run/wt -DDEPLOYROOT=/var/www/wt \ + -DUSE_SYSTEM_SQLITE3=ON -DCMAKE_EXE_LINKER_FLAGS="-lboost_random" \ + -DDESTDIR=${pkgdir} -DWT_CMAKE_FINDER_INSTALL_DIR="share/cmake-2.8/Modules" .. + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver}/build + make DESTDIR=${pkgdir} install +} diff --git a/community-staging/wt/wt-boost-1.47.patch b/community-staging/wt/wt-boost-1.47.patch new file mode 100644 index 000000000..919e1371f --- /dev/null +++ b/community-staging/wt/wt-boost-1.47.patch @@ -0,0 +1,11 @@ +diff -wbBur wt-3.1.10.q/src/CMakeLists.txt wt-3.1.10/src/CMakeLists.txt +--- wt-3.1.10.q/src/CMakeLists.txt 2011-07-26 00:58:19.000000000 +0400 ++++ wt-3.1.10/src/CMakeLists.txt 2011-06-24 18:51:54.000000000 +0400 +@@ -236,6 +236,7 @@ + web/TimeUtil.C + web/XSSFilter.C + web/XSSUtils.C ++web/random_device.cpp + web/base64.cpp + Plain_html.C + Boot_html.C diff --git a/community-staging/xemacs/PKGBUILD b/community-staging/xemacs/PKGBUILD new file mode 100644 index 000000000..b56f475b3 --- /dev/null +++ b/community-staging/xemacs/PKGBUILD @@ -0,0 +1,65 @@ +# $Id: PKGBUILD 59385 2011-11-23 22:33:44Z stephane $ +# Maintainer: juergen <juergen@archlinux.org> +# Contributor : Stéphane Gaudreault <stephane@archlinux.org> + +pkgname=xemacs +pkgver=21.5.31 +pkgrel=3 +pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs" +arch=('i686' 'x86_64') +url="http://www.xemacs.org/" +license=('GPL') +depends=('db' 'libpng' 'libtiff' 'gpm' 'desktop-file-utils' 'libxaw' 'gdbm' 'giflib') +optdepends=('xorg-fonts-75dpi: X bitmap fonts needed for the interface' + 'xorg-fonts-100dpi: X bitmap fonts needed for the interface') +makedepends=('xbitmaps') +install=xemacs.install +source=(http://ftp.xemacs.org/pub/xemacs/beta/$pkgname-$pkgver.tar.gz + xemacs.desktop + xemacs-21.5.29-optimization-bug.patch) +md5sums=('0185fe905d0b8d8d094d9b60cf262d4a' + 'a4d3d5c0aa2c7ce7bec491f809ca3694' + 'eb061b10ea3bbe1026df5326ae1618e3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + +# Fix problem caused by improper optimization with GCC>=4.1.2 on i686 +# (and possibly other arches). See +# http://tracker.xemacs.org/XEmacs/its/issue354 +# for the upstream bug report. + patch -Np0 -i ../xemacs-21.5.29-optimization-bug.patch + + ./configure --build="${CHOST}" --prefix=/usr --with-dynamic \ + --without-postgresql --with-athena=xaw \ + --enable-database=berkdb --without-ldap \ + --enable-menubars=lucid --enable-scrollbars=lucid \ + --enable-widgets=athena --enable-dialogs=athena \ + --enable-external-widget \ + --with-jpeg --with-png --with-tiff \ + --with-ncurses --with-pop --with-xfs --disable-sound \ + --infodir=/usr/share/info \ + --with-mule \ + --mandir=/usr/share/man/man1 + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -j1 prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man/man1" infodir="${pkgdir}/usr/share/info" install gzip-el + + rm "${pkgdir}"/usr/bin/{b2m,ctags,etags} + rm "${pkgdir}"/usr/share/man/man1/{ctags.1,etags.1} + + # fix FS#7927 + install -d -m755 "${pkgdir}/usr/share/pixmaps" + install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + ln -sf /usr/share/xemacs-${pkgver%.*}-b${pkgver##*.}/etc/xemacs-icon.xpm "${pkgdir}/usr/share/pixmaps/xemacs-icon.xpm" + + # correct permissions + chown -R root:root "${pkgdir}" + + rm "${pkgdir}"/usr/share/info/{info.info,texinfo.info-2,cl.info,texinfo.info-1,texinfo.info,standards.info,widget.info} +} +# vim: ts=2 sw=2 et ft=sh diff --git a/community-staging/xemacs/xemacs-21.5.29-optimization-bug.patch b/community-staging/xemacs/xemacs-21.5.29-optimization-bug.patch new file mode 100644 index 000000000..32a1a02c2 --- /dev/null +++ b/community-staging/xemacs/xemacs-21.5.29-optimization-bug.patch @@ -0,0 +1,14 @@ +Work around a GCC optimization bug as described in +http://tracker.xemacs.org/XEmacs/its/issue354 + +--- src/dumper.c.~1~ 2008-01-26 09:54:11.000000000 +0100 ++++ src/dumper.c 2008-05-03 10:17:03.000000000 +0200 +@@ -2584,7 +2584,7 @@ + #endif /* !WIN32_NATIVE */ + + +-static int ++int + pdump_file_try (Wexttext *exe_path) + { + Wexttext *w = exe_path + wext_strlen (exe_path); diff --git a/community-staging/xemacs/xemacs.desktop b/community-staging/xemacs/xemacs.desktop new file mode 100644 index 000000000..257c56947 --- /dev/null +++ b/community-staging/xemacs/xemacs.desktop @@ -0,0 +1,34 @@ +[Desktop Entry] +Name=XEmacs Text Editor +Name[bg]=редактор XEmacs +Name[ca]=Editor XEmacs +Name[cs]=Editor XEmacs +Name[da]=XEmacs tekstredigerer +Name[de]=XEmacs Texteditor +Name[eo]=La redaktilo XEmakso +Name[es]=Emacs para X +Name[et]=Emacs X'i kasutajaliidesega +Name[fi]=XEmacs editori +Name[fr]=Éditeur XEmacs +Name[hu]=XEmacs szövegszerkesztő +Name[is]=XEmacs-ritill +Name[it]=Emacs per X +Name[ja]=XEmacs テキスト・エディター +Name[mk]=Софистицираниот XEmacs уредувач +Name[no]=XEmacs-tekstredigerer +Name[pt]=Editor XEmacs +Name[ro]=Editorul XEmacs +Name[ru]=Редактор XEmacs +Name[sk]=Editor XEmacs +Name[sl]=Urejevalnik XEmacs +Name[uk]=Редактор XEmacs +GenericName=Text Editor +Comment=Edit text +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +Exec=xemacs %f +Icon=/usr/share/pixmaps/xemacs-icon.xpm +Type=Application +Terminal=false +Categories=Development;TextEditor; +Encoding=UTF-8 +StartupWMClass=Emacs diff --git a/community-staging/xemacs/xemacs.install b/community-staging/xemacs/xemacs.install new file mode 100644 index 000000000..a04ee187f --- /dev/null +++ b/community-staging/xemacs/xemacs.install @@ -0,0 +1,35 @@ +infodir=usr/share/info +filelist=(beta.info.gz custom.info.gz + emodules.info.gz external-widget.info.gz + internals.info-1.gz internals.info-2.gz + internals.info-3.gz internals.info-4.gz + internals.info-5.gz internals.info.gz + lispref.info-1.gz lispref.info-10.gz + lispref.info-2.gz lispref.info-3.gz + lispref.info-4.gz lispref.info-5.gz + lispref.info-6.gz lispref.info-7.gz + lispref.info-8.gz lispref.info-9.gz + lispref.info.gz new-users-guide.info.gz + term.info.gz termcap.info.gz + xemacs-faq.info-1.gz xemacs-faq.info-2.gz + xemacs-faq.info.gz xemacs.info-1.gz + xemacs.info-2.gz xemacs.info-3.gz + xemacs.info-4.gz xemacs.info.gz) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done + update-desktop-database -q +} diff --git a/community/gecko-mediaplayer/PKGBUILD b/community/gecko-mediaplayer/PKGBUILD index 03eda7afa..e4c890fa3 100644 --- a/community/gecko-mediaplayer/PKGBUILD +++ b/community/gecko-mediaplayer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 51299 2011-07-06 15:48:09Z lfleischer $ +# $Id: PKGBUILD 59322 2011-11-23 15:17:06Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: fancris3 <fancris3 at aol.com> @@ -6,7 +6,7 @@ pkgname=gecko-mediaplayer pkgver=1.0.4 -pkgrel=1 +pkgrel=2 pkgdesc='Browser plugin that uses gnome-mplayer to play media in a web browser.' arch=('i686' 'x86_64') url='http://code.google.com/p/gecko-mediaplayer/' @@ -14,13 +14,17 @@ license=('GPL') depends=("gnome-mplayer>=${pkgver}" 'dbus-glib') makedepends=('xulrunner' 'pkgconfig') replaces=('mplayer-plugin') -source=("http://gecko-mediaplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('7bb7665f8a1e6832907d052863e8f7aa') +source=("http://gecko-mediaplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" + 'firefox-8.patch') +md5sums=('7bb7665f8a1e6832907d052863e8f7aa' + 'e58a8fc33c1cf7a2453e1f6612acf028') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --without-gconf + patch -p1 -i ../firefox-8.patch + + ./configure --prefix=/usr --sysconfdir=/etc --without-gconf --enable-new-libxul make } diff --git a/community/gecko-mediaplayer/firefox-8.patch b/community/gecko-mediaplayer/firefox-8.patch new file mode 100644 index 000000000..d4db7afd3 --- /dev/null +++ b/community/gecko-mediaplayer/firefox-8.patch @@ -0,0 +1,48 @@ +diff -Naur gecko-mediaplayer-1.0.5b1-old/src/np_entry.cpp gecko-mediaplayer-1.0.5b1-new/src/np_entry.cpp +--- gecko-mediaplayer-1.0.5b1-old/src/np_entry.cpp 2011-09-20 20:48:04.000000000 +0300 ++++ gecko-mediaplayer-1.0.5b1-new/src/np_entry.cpp 2011-11-22 15:57:46.751354874 +0200 +@@ -80,9 +80,9 @@ + + #endif /* XP_WIN */ + +-char *NPP_GetMIMEDescription(); ++const char *NPP_GetMIMEDescription(); + +-char *NP_GetMIMEDescription() ++const char *NP_GetMIMEDescription() + { + return NPP_GetMIMEDescription(); + } +diff -Naur gecko-mediaplayer-1.0.5b1-old/src/npp_gate.cpp gecko-mediaplayer-1.0.5b1-new/src/npp_gate.cpp +--- gecko-mediaplayer-1.0.5b1-old/src/npp_gate.cpp 2011-09-20 20:48:04.000000000 +0300 ++++ gecko-mediaplayer-1.0.5b1-new/src/npp_gate.cpp 2011-11-22 15:58:02.473353591 +0200 +@@ -44,7 +44,7 @@ + #include "plugin_types.h" + #include "plugin_setup.h" + +-char *NPP_GetMIMEDescription(void) ++const char *NPP_GetMIMEDescription(void) + { + return GetMIMEDescription(); + } +diff -Naur gecko-mediaplayer-1.0.5b1-old/src/npupp.h gecko-mediaplayer-1.0.5b1-new/src/npupp.h +--- gecko-mediaplayer-1.0.5b1-old/src/npupp.h 2011-09-20 20:48:04.000000000 +0300 ++++ gecko-mediaplayer-1.0.5b1-new/src/npupp.h 2011-11-22 15:56:32.262360950 +0200 +@@ -684,7 +684,7 @@ + + NPError OSCALL NP_Shutdown(); + +- char *NP_GetMIMEDescription(); ++ const char *NP_GetMIMEDescription(); + + #ifdef __cplusplus + } +@@ -700,7 +700,7 @@ + + /* plugin meta member functions */ + +- NP_EXPORT(char *) NP_GetMIMEDescription(void); ++ NP_EXPORT(const char *) NP_GetMIMEDescription(void); + NP_EXPORT(NPError) NP_Initialize(NPNetscapeFuncs *, NPPluginFuncs *); + NP_EXPORT(NPError) NP_Shutdown(void); + NP_EXPORT(NPError) NP_GetValue(void *future, NPPVariable aVariable, void *aValue); diff --git a/community/gri/PKGBUILD b/community/gri/PKGBUILD index 19ba1e79a..bfbbb3451 100644 --- a/community/gri/PKGBUILD +++ b/community/gri/PKGBUILD @@ -1,16 +1,18 @@ +# $Id: PKGBUILD 59365 2011-11-23 20:42:48Z andrea $ +# Maintainer: # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: big_gie nbigaouette . at . gmail.com -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=gri pkgver=2.12.23 pkgrel=1 -pkgdesc="A script-based language for scientific graphics programming." +pkgdesc="A script-based language for scientific graphics programming" arch=('i686' 'x86_64') license=('GPL') url="http://gri.sourceforge.net/" depends=('perl') -makedepends=('ghostscript' 'gzip' 'imagemagick') +makedepends=('ghostscript' 'gzip' 'imagemagick' 'texlive-bin') source=(http://downloads.sourceforge.net/gri/$pkgname-$pkgver.tar.gz) install=gri.install md5sums=('eabd37f80ac51f7aef83a89234fb6522') @@ -20,6 +22,7 @@ build() { ./configure --prefix=/usr make } + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install diff --git a/community/gri/gri.install b/community/gri/gri.install index 9252cc494..578968e39 100644 --- a/community/gri/gri.install +++ b/community/gri/gri.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(gri.info.gz) post_install() { diff --git a/community/gsmartcontrol/PKGBUILD b/community/gsmartcontrol/PKGBUILD index b1a9ce27f..2a4035393 100644 --- a/community/gsmartcontrol/PKGBUILD +++ b/community/gsmartcontrol/PKGBUILD @@ -2,12 +2,14 @@ pkgname=gsmartcontrol pkgver=0.8.6 -pkgrel=1 +pkgrel=2 pkgdesc="A graphical user interface for the smartctl hard disk drive health inspection tool." arch=('i686' 'x86_64') url="http://gsmartcontrol.berlios.de/home/index.php/en/Home" license=('GPL3') -depends=('smartmontools' 'pcre' 'gtkmm' 'libglademm' 'glib2') +depends=('smartmontools' 'pcre' 'gtkmm' 'libglademm' 'glib2' 'xorg-xmessage') +optdepends=('gnomesu: for gsmartcontrol-root' + 'gksu: for gsmartcontrol-root') install=${pkgname}.install source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2) md5sums=('d2ac685e2e73b05f7ba74c93623af739') diff --git a/community/libmatio/PKGBUILD b/community/libmatio/PKGBUILD index 61263e4d3..35563bd11 100644 --- a/community/libmatio/PKGBUILD +++ b/community/libmatio/PKGBUILD @@ -1,6 +1,7 @@ -# $Id: PKGBUILD 19607 2010-06-26 05:40:09Z shusmann $ +# $Id: PKGBUILD 59370 2011-11-23 21:07:37Z andrea $ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: William Rea <sillywilly@gmail.com> + pkgname=libmatio pkgver=1.3.3 pkgrel=2 @@ -9,6 +10,7 @@ arch=('i686' 'x86_64') license=('LGPL') url="http://sourceforge.net/projects/matio" depends=('gcc-libs') +makedepends=('gcc-fortran') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/matio/matio-$pkgver.tar.gz) md5sums=('5c12a98f391de000e88b5a1b20d74abf') diff --git a/community/libnids/PKGBUILD b/community/libnids/PKGBUILD index 9c3991524..903663aa7 100644 --- a/community/libnids/PKGBUILD +++ b/community/libnids/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80211 2010-05-13 16:40:37Z andrea $ +# $Id: PKGBUILD 59373 2011-11-23 21:13:03Z andrea $ # Maintainer: # Contributor: Essien Ita Essien <essiene@datavibe.net> # Contributor: damir <damir@archlinux.org> @@ -17,12 +17,12 @@ md5sums=('72d37c79c85615ffe158aa524d649610') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --man=/usr/share/man || return 1 - make static shared || return 1 + ./configure --prefix=/usr --man=/usr/share/man --enable-shared + make } package() { cd $srcdir/$pkgname-$pkgver - make install_prefix=$pkgdir install _installshared || return 1 - ln -s libnids.so.1.24 $pkgdir/usr/lib/libnids.so.1 || return 1 + make install_prefix=$pkgdir install + ln -s libnids.so.1.24 $pkgdir/usr/lib/libnids.so.1 } diff --git a/community/multiget/PKGBUILD b/community/multiget/PKGBUILD index 2d906b7ad..d2d16bb51 100644 --- a/community/multiget/PKGBUILD +++ b/community/multiget/PKGBUILD @@ -1,5 +1,7 @@ +# $Id: PKGBUILD 59362 2011-11-23 20:36:41Z andrea $ +# Maintainer: +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=multiget pkgver=3 @@ -7,11 +9,9 @@ pkgrel=1 pkgdesc="Easy to use GUI file downloader - svn version" url="http://multiget.sourceforge.net" license=('GPL') -depends=('wxgtk') +depends=('wxgtk' 'libglade') makedepends=('intltool' 'svn') arch=('i686' 'x86_64') -source=() -md5sums=() _svntrunk=https://multiget.svn.sourceforge.net/svnroot/multiget _svnmod=multiget @@ -30,6 +30,7 @@ cd "$srcdir" ./autogen.sh --prefix=/usr --docdir=/usr/share/doc/${_svnmod} make } + package() { cd ${srcdir}/$_svnmod-build make DESTDIR=${pkgdir} install diff --git a/community/multipath-tools/PKGBUILD b/community/multipath-tools/PKGBUILD index 1fd153d38..ca99de9c5 100644 --- a/community/multipath-tools/PKGBUILD +++ b/community/multipath-tools/PKGBUILD @@ -1,6 +1,9 @@ -# Maintainer: Thomas S Hatch <thatch45 ar gmail dot com> +# $Id: PKGBUILD 59357 2011-11-23 20:31:03Z andrea $ +# Maintainer: +# Contributor: Thomas S Hatch <thatch45 ar gmail dot com> # Contributor: Michael P <ptchinster@archlinux.us> # Contributor: Matt Heagney <matt@heagney.com> + pkgname=multipath-tools pkgver=0.4.9 pkgrel=4 @@ -9,27 +12,26 @@ arch=('i686' 'x86_64') url="http://christophe.varoqui.free.fr/" license=('GPL') depends=('libaio' 'device-mapper') -makedepends=() -provides=() -conflicts=() -replaces=() backup=('etc/multipath.conf' 'etc/multipath.conf.annotated' 'etc/rc.d/multipathd' ) install=multipath-tools.install source=("http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2" "multipath.conf" "multipath.conf.annotated" - "multipathd.rc") -noextract=() + "multipathd.rc" + 'fix-build.patch') md5sums=('a6d4b48afc28f1f50f5ee4b1b06d2765' 'd0fb11398cc628c7997111efdc5d52e5' '5a93f993ec05fc99094d5139aabd3925' - '1c2dcf43a6b5ae84ec1fae0fee071336') + '1c2dcf43a6b5ae84ec1fae0fee071336' + '2576fc535d7fa767837b1c7827013e52') build() { #Needs to be fixed upstream. Refer to # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814 cd "$srcdir" + patch -p1 -i "${srcdir}"/fix-build.patch + env LDFLAGS=${LDFLAGS//-Wl,--as-needed}\ make } @@ -43,4 +45,3 @@ package() { install -D -m 644 $srcdir/multipath.conf.annotated $pkgdir/etc/multipath.conf.annotated install -D -m 755 $srcdir/multipathd.rc $pkgdir/etc/rc.d/multipathd } - diff --git a/community/multipath-tools/fix-build.patch b/community/multipath-tools/fix-build.patch new file mode 100644 index 000000000..c6196f73b --- /dev/null +++ b/community/multipath-tools/fix-build.patch @@ -0,0 +1,140 @@ +--- multipath-tools-0.4.9.orig/kpartx/Makefile 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/kpartx/Makefile 2010-11-28 12:14:25.763531104 -0800 +@@ -6,7 +6,7 @@ + + CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + +-LDFLAGS = -ldevmapper ++LIBS = -ldevmapper + OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ + gpt.o mac.o crc32.o lopart.o xstrncpy.o devmapper.o + EXEC = kpartx +@@ -14,8 +14,7 @@ + all: $(EXEC) + + $(EXEC): $(OBJS) +- $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) +- $(GZIP) $(EXEC).8 > $(EXEC).8.gz ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) + + install: $(EXEC) $(EXEC).8 + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) +@@ -23,13 +22,14 @@ + $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir) + $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir) + $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d +- $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/ ++ $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) + + uninstall: + rm -f $(DESTDIR)$(bindir)/$(EXEC) +- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz ++ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 ++ rm -f $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules + + clean: +- rm -f core *.o $(EXEC) *.gz ++ rm -f core *.o $(EXEC) +--- multipath-tools-0.4.9.orig/Makefile.inc 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/Makefile.inc 2010-11-28 12:14:25.763531104 -0800 +@@ -32,11 +32,10 @@ + syslibdir = $(prefix)/$(LIB) + libdir = $(prefix)/$(LIB)/multipath + +-GZIP = /bin/gzip -9 -c + INSTALL_PROGRAM = install + +-OPTFLAGS = -pipe -g -Wall -Wunused -Wstrict-prototypes +-CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" ++OPTFLAGS = -Wall -Wunused -Wstrict-prototypes ++CFLAGS += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" + SHARED_FLAGS = -shared + + %.o: %.c +--- multipath-tools-0.4.9.orig/multipath/Makefile 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/multipath/Makefile 2010-11-28 12:14:46.718697048 -0800 +@@ -7,32 +7,30 @@ + OBJS = main.o + + CFLAGS += -I$(multipathdir) +-LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir) ++LIBS = -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath + + EXEC = multipath + + all: $(EXEC) + + $(EXEC): $(OBJS) +- $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) +- $(GZIP) $(EXEC).8 > $(EXEC).8.gz +- $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) + + install: + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ + $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d +- $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/ ++ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/65-multipath.rules + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir) + + uninstall: +- rm $(DESTDIR)/etc/udev/rules.d/multipath.rules +- rm $(DESTDIR)$(bindir)/$(EXEC) +- rm $(DESTDIR)$(mandir)/$(EXEC).8.gz +- rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz ++ rm -f $(DESTDIR)/etc/udev/rules.d/65-multipath.rules ++ rm -f $(DESTDIR)$(bindir)/$(EXEC) ++ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 ++ rm -f $(DESTDIR)$(man5dir)/$(EXEC).conf.5 + + clean: +- rm -f core *.o $(EXEC) *.gz ++ rm -f core *.o $(EXEC) +--- multipath-tools-0.4.9.orig/multipathd/Makefile 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/multipathd/Makefile 2010-11-28 12:15:46.624171566 -0800 +@@ -6,8 +6,8 @@ + # basic flags setting + # + CFLAGS += -I$(multipathdir) +-LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \ +- -lmultipath -L$(multipathdir) ++LIBS = -lpthread -ldevmapper -lreadline -lncurses -ldl \ ++ -L$(multipathdir) -lmultipath + + # + # debuging stuff +@@ -28,21 +28,20 @@ + all : $(EXEC) + + $(EXEC): $(OBJS) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS) +- $(GZIP) $(EXEC).8 > $(EXEC).8.gz ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) + + install: + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) + + uninstall: + rm -f $(DESTDIR)$(bindir)/$(EXEC) + rm -f $(DESTDIR)$(rcdir)/$(EXEC) +- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz ++ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 + + clean: +- rm -f core *.o $(EXEC) *.gz ++ rm -f core *.o $(EXEC) + diff --git a/community/pion-net/PKGBUILD b/community/pion-net/PKGBUILD index b359ca4f0..22669236d 100644 --- a/community/pion-net/PKGBUILD +++ b/community/pion-net/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58325 2011-11-11 13:52:07Z stativ $ +# $Id: PKGBUILD 59342 2011-11-23 19:04:28Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: David Watzke <david@watzke.cz> pkgname=pion-net -pkgver=4.0.5 -pkgrel=3 +pkgver=4.0.7 +pkgrel=1 pkgdesc="A C++ development library for implementing lightweight HTTP interfaces" url="http://www.pion.org/projects/pion-network-library" arch=('i686' 'x86_64') @@ -12,14 +12,14 @@ license=('custom:Boost') depends=('boost-libs' 'openssl' 'log4cpp') makedepends=('boost') source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2" - "$pkgname-$pkgver-build.patch") -md5sums=('1030fcce124621de705bdab40a1d977c' + "$pkgname-4.0.5-build.patch") +md5sums=('761c8af8dc54102b637f8d91d162f987' 'd75ea2af90163a81d2bc71fda00f0c00') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir/$pkgname-$pkgver-build.patch" + patch -p1 -i "$srcdir/$pkgname-4.0.5-build.patch" # override configure bug (forces debug even when nobody asked for it) sed -i "s/ -ggdb//g;s/ -DNDEBUG//g" configure diff --git a/community/qdevelop/qt47.patch b/community/qdevelop/qt47.patch new file mode 100644 index 000000000..a1607779b --- /dev/null +++ b/community/qdevelop/qt47.patch @@ -0,0 +1,24 @@ +Description: Fix FTBFS with Qt 4.7. + +--- qdevelop-0.28.orig/src/build.h ++++ qdevelop-0.28/src/build.h +@@ -56,7 +56,7 @@ private: + int m_warnings; + QString m_forceMode; + signals: +- void message(QString, QString=0); ++ void message(QString, QString=QString()); + protected slots: + void slotBuildMessages(); + void slotStopBuild(); +--- qdevelop-0.28.orig/src/textEdit.h ++++ qdevelop-0.28/src/textEdit.h +@@ -142,7 +142,7 @@ public: + void setMouseHidden( bool hidden ); + public slots: + void gotoLine( int line, bool moveTop ); +- void slotFind(Ui::FindWidget uiFind, Ui::ReplaceWidget uiReplace, QString ttf=0, QTextDocument::FindFlags options=0, bool fromButton=false); ++ void slotFind(Ui::FindWidget uiFind, Ui::ReplaceWidget uiReplace, QString ttf=QString(), QTextDocument::FindFlags options=0, bool fromButton=false); + void slotIndent(bool indent=true); + void slotUnindent(); + void comment(ActionComment action); diff --git a/community/sword/PKGBUILD b/community/sword/PKGBUILD index e79d84f26..e6e2387a5 100644 --- a/community/sword/PKGBUILD +++ b/community/sword/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 52657 2011-07-26 22:56:39Z shusmann $ -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# $Id: PKGBUILD 59377 2011-11-23 21:18:49Z andrea $ +# Maintainer: +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: TripleE <eric1548@yahoo.com> pkgname=sword @@ -18,9 +19,10 @@ md5sums=('a7dc4456e20e915fec46d774b690e305' build() { cd "${srcdir}"/$pkgname-$pkgver - patch -p1 < $srcdir/curl.patch + patch -p1 -i $srcdir/curl.patch + cd $srcdir - [[ -d build ]] || mkdir build + mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -34,7 +36,7 @@ package() { # Ugly workarounds to fix a weird cmakelists.txt install -d "${pkgdir}"/usr/lib/sword - mv "${pkgdir}"/usr/lib/1.6.2_icu_4.8 "${pkgdir}"/usr/lib/sword/ + mv "${pkgdir}"/usr/lib/1.6.2_icu_4.8* "${pkgdir}"/usr/lib/sword/ cd "${srcdir}"/${pkgname}-${pkgver}/locales.d/ for file in *.conf; do diff --git a/community/torcs/PKGBUILD b/community/torcs/PKGBUILD index 99a01a51a..9326ea1d5 100644 --- a/community/torcs/PKGBUILD +++ b/community/torcs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 32627 2010-11-15 22:59:24Z lcarlier $ +# $Id: PKGBUILD 59309 2011-11-23 10:18:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Shahar Weiss <sweiss4@gmx.net> @@ -12,8 +12,8 @@ arch=('i686' 'x86_64') depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'torcs-data') makedepends=('plib') options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2 \ - torcs.desktop \ +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2 + torcs.desktop torcs-gcc.patch) md5sums=('978b908a42ff6bc235a791bba3fa66b9' '328e419e9f985c3e7b69924fe299330d' @@ -21,20 +21,15 @@ md5sums=('978b908a42ff6bc235a791bba3fa66b9' build() { cd $srcdir/$pkgname-${pkgver/_/-} - - export LDFLAGS=${LDFLAGS/-Wl,--as-needed/} + unset LDFLAGS ./configure --prefix=/usr --x-includes=/usr/include --x-libraries=/usr/lib - make } package() { cd $srcdir/$pkgname-${pkgver/_/-} - make DESTDIR=${pkgdir} install - install -D -m644 Ticon.png ${pkgdir}/usr/share/pixmaps/torcs.png install -D -m644 ../torcs.desktop ${pkgdir}/usr/share/applications/torcs.desktop - find ${pkgdir} -type d -exec chmod 755 {} \; } diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index 8de47d4de..e453bb84d 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 142060 2011-11-04 23:35:49Z allan $ +# $Id: PKGBUILD 143250 2011-11-24 01:36:23Z allan $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> pkgname=bash _basever=4.2 -_patchlevel=010 #prepare for some patches +_patchlevel=020 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=2 +pkgrel=1 pkgdesc="The GNU Bourne Again shell" arch=('i686' 'x86_64') license=('GPL') @@ -98,4 +98,24 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' '4c5835f2fbab36c4292bb334977e5b6d' 'ff4547ca7b508d52101729d61f5b77b6' '0a51602b535ef661ee707be6c8bdb373' - 'cec7c92a4d8052ea4b29216365d16566') + 'cec7c92a4d8052ea4b29216365d16566' + '58deacf3d57cbd75575444ff6a3b0806' + '9ed2a08e549c3c17745f19e8413cfb31' + '72d5059820015231483bb7415d09e9db' + '45b04b41a4230f469d3e47ab9952c2df' + '608336ebe215984ef126e3c29d2d3409' + '623f63025d155a84977b62531e260ee2' + 'ed19da878e3f630834c62b9d9dcc6fce' + 'eef2dd4a0e4505dc8f8e664b40c6cd66' + '2d07daba0b8ca8f876d2aa052ff594b4' + '0cb823a44e6dc1cde7ac97ae5c8163c9' + '53d246537e1fffd1aaa02ba5c056211c' + '60f983a1dded5f0b28040ff4b3f1e9b5' + '304fd129a58fee2d8a34f8b4704db0aa' + '9df4bf4f46aaadc436f430187741f815' + '6921a0b4228fe89b6537a5c29f027c89' + '4ef0e2a2cbfbdd53346f927000b7e112' + '1195d85447f3d048d2c9bcd075fa765c' + 'b0f3a651ce29a1feee687d93177870f1' + 'b09000bba08da6ac753124593850cdf7' + '204bb5054d1f8bafe2b446d4e5d0d99a') diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD index 18ef7c6d4..ee0dcc114 100644 --- a/core/grep/PKGBUILD +++ b/core/grep/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142062 2011-11-04 23:35:52Z allan $ +# $Id: PKGBUILD 143252 2011-11-24 01:36:25Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=grep -pkgver=2.9 -pkgrel=2 +pkgver=2.10 +pkgrel=1 pkgdesc="A string search utility" arch=('i686' 'x86_64') license=('GPL3') @@ -14,8 +14,8 @@ depends=('glibc' 'pcre' 'sh') makedepends=('texinfo') install=${pkgname}.install source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) -md5sums=('25e41b2aa201104354740961ef36005a' - '78b903e88d23890d9e737e1415f4de21') +md5sums=('709915434d09f5db655e5ebd7fd6bb7f' + '9ad5c390a6ad7f566c58db28ddb06aed') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD index add0fe75b..fa21580c0 100644 --- a/core/readline/PKGBUILD +++ b/core/readline/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 142167 2011-11-05 11:41:13Z allan $ +# $Id: PKGBUILD 143254 2011-11-24 01:36:28Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=readline _basever=6.2 -_patchlevel=001 #prepare for some patches +_patchlevel=002 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=3 +pkgrel=1 pkgdesc="GNU readline library" arch=('i686' 'x86_64') url="http://tiswww.case.edu/php/chet/readline/rltop.html" @@ -26,7 +26,9 @@ md5sums=('67948acb2ca081f23359d0256e9a271c' '928f7d248320a65e43c2dc427e99582b' '58d54966c1191db45973cb3191ac621a' '83287d52a482f790dfb30ec0a8746669' - '8e6a51e2e0e6e45a82752e3692c111ac') + '8e6a51e2e0e6e45a82752e3692c111ac' + '0665020ea118e8434bd145fb71f452cc' + '285361ca6d48c51ae2428157e174e812') build() { cd ${srcdir}/${pkgname}-$_basever diff --git a/extra/acpid/PKGBUILD b/extra/acpid/PKGBUILD index c9464974e..fc0425799 100644 --- a/extra/acpid/PKGBUILD +++ b/extra/acpid/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140134 2011-10-07 19:20:48Z eric $ +# $Id: PKGBUILD 143248 2011-11-24 01:29:25Z eric $ # Maintainer: # Contributor: xduugu # Contributor: Manolis Tzanidakis # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us pkgname=acpid -pkgver=2.0.12 +pkgver=2.0.13 pkgrel=1 pkgdesc="A daemon for delivering ACPI power management events with netlink support" arch=('i686' 'x86_64') @@ -19,10 +19,10 @@ source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz" 'anything' 'handler.sh' 'acpid.conf.d') -md5sums=('c5104722f72451f64f893b5541bd9ab4' - '955490c4db5233ec44461db694b873a4' +md5sums=('5bbbb9a320192df1cdd8d0e9a0196379' + 'd69203a032c4583f9abaafcf21a7ed84' '2d37b98d6e74bab815604b8b48c6cfd4' - '24bd717aeb6b628a144b6956ff661ab0' + 'd411b758e8531adee191b66bcbc2892d' '929c6d2e91295c22ed9ec6212d7eabef') build() { diff --git a/extra/acpid/acpid b/extra/acpid/acpid index 9177c8207..288ac078d 100644 --- a/extra/acpid/acpid +++ b/extra/acpid/acpid @@ -29,6 +29,7 @@ case "$1" in ;; restart) $0 stop + sleep 1 $0 start ;; *) diff --git a/extra/acpid/handler.sh b/extra/acpid/handler.sh index 8256e76a6..505ed7c11 100644 --- a/extra/acpid/handler.sh +++ b/extra/acpid/handler.sh @@ -1,9 +1,6 @@ #!/bin/sh # Default acpi script that takes an entry for all actions -# NOTE: This is a 2.6-centric script. If you use 2.4.x, you'll have to -# modify it to not use /sys - minspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq` maxspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq` setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed" @@ -57,8 +54,16 @@ case "$1" in esac ;; button/lid) - #echo "LID switched!">/dev/tty5 - ;; + case "$3" in + close) + #echo "LID closed!">/dev/tty5 + ;; + open) + #echo "LID opened!">/dev/tty5 + ;; + esac + ;; + *) logger "ACPI group/action undefined: $1 / $2" ;; diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 14fe3d04c..daff81008 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142620 2011-11-12 17:15:14Z ibiru $ +# $Id: PKGBUILD 143216 2011-11-23 13:53:15Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=20111108 +pkgver=20111123 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' ' makedepends=('yasm' 'git') #git clone git://git.videolan.org/ffmpeg.git source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz) -md5sums=('bad7e47f6974cee62d98ce9de710076c') +md5sums=('8ec30d05efe0f6cc6f702933e6781e8e') build() { cd "$srcdir/$pkgname" diff --git a/extra/htop/PKGBUILD b/extra/htop/PKGBUILD index 11ec58bf5..33979e0c0 100644 --- a/extra/htop/PKGBUILD +++ b/extra/htop/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140790 2011-10-19 10:00:03Z andrea $ +# $Id: PKGBUILD 143218 2011-11-23 13:59:27Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=htop -pkgver=0.9 -pkgrel=3 +pkgver=1.0 +pkgrel=1 pkgdesc="Interactive process viewer" arch=('i686' 'x86_64') url="http://htop.sourceforge.net/" @@ -15,12 +15,8 @@ makedepends=('python2') optdepends=('lsof' 'strace') options=('!emptydirs') changelog=ChangeLog -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - 'fix-sort-key-bug.patch' - 'fix-segfault-small-terminal.patch') -md5sums=('7c5507f35f363f3f40183a2ba3c561f8' - '750e8ad8476c5d9738da2a2bc7a7c2b6' - 'd93e39c9662522367dc3a73cc3057039') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('325112ca7947ea1f6d6441f631e00384') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,9 +24,6 @@ build() { sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c configure sed -i 's|python|python2|' scripts/MakeHeader.py - patch -Np0 -i "${srcdir}/fix-sort-key-bug.patch" - patch -p1 -i "${srcdir}/fix-segfault-small-terminal.patch" - ./configure --prefix=/usr \ --enable-unicode \ --enable-openvz \ diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD index 1bd4fffee..2cb7f2952 100644 --- a/extra/ktorrent/PKGBUILD +++ b/extra/ktorrent/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135681 2011-08-17 08:07:39Z andrea $ +# $Id: PKGBUILD 143237 2011-11-23 19:36:57Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Georg Grabler <ggrabler@gmail.com> pkgname=ktorrent -pkgver=4.1.2 +pkgver=4.1.3 pkgrel=1 pkgdesc="A powerful BitTorrent client for KDE" arch=('i686' 'x86_64') @@ -15,8 +15,7 @@ makedepends=('automoc4' 'cmake' 'boost') source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'httpserver.patch') install=${pkgname}.install -options=('libtool') -md5sums=('8026d9f75257f2e52ac5ba3ce4720d55' +md5sums=('4cdd6597a11a465d91e17ac86320883e' '1f25b94615b0bbfa0457c99fb20de3e6') build() { diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD index b8aecf570..43d1a42d9 100644 --- a/extra/libktorrent/PKGBUILD +++ b/extra/libktorrent/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135670 2011-08-17 07:49:37Z andrea $ +# $Id: PKGBUILD 143235 2011-11-23 19:29:05Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libktorrent -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 pkgdesc="A BitTorrent protocol implementation" arch=('i686' 'x86_64') @@ -11,9 +11,8 @@ url="http://ktorrent.org" license=('GPL2') depends=('kdelibs') makedepends=('automoc4' 'cmake' 'boost' 'doxygen') -source=("http://ktorrent.org/downloads/4.1.2/${pkgname}-${pkgver}.tar.bz2") -options=('libtool') -md5sums=('471b25afc48e195723ac1e264c8a0fc5') +source=("http://ktorrent.org/downloads/4.1.3/${pkgname}-${pkgver}.tar.bz2") +md5sums=('665b6139ab68b83c6465509e29e839e0') build() { cd "${srcdir}" diff --git a/extra/testdisk/PKGBUILD b/extra/testdisk/PKGBUILD index 12f8bc639..2a2faef20 100644 --- a/extra/testdisk/PKGBUILD +++ b/extra/testdisk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123688 2011-05-12 14:06:47Z tpowa $ +# $Id: PKGBUILD 143223 2011-11-23 16:04:33Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=testdisk -pkgver=6.12 +pkgver=6.13 pkgrel=1 pkgdesc="Checks and undeletes partitions + PhotoRec, signature based recovery tool" arch=('i686' 'x86_64') @@ -23,4 +23,4 @@ build() { make || return 1 make DESTDIR="${pkgdir}/" install || return 1 } -md5sums=('6ef653301f309156f3a802233a3139c1') +md5sums=('3bcbf0722d3823ca155e633969ce9f0b') diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 9b14f6a80..3eef3766b 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 142646 2011-11-12 17:15:45Z ibiru $ +# $Id: PKGBUILD 143209 2011-11-23 11:58:47Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=1.1.12 -pkgrel=3 +pkgrel=4 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" @@ -39,14 +39,18 @@ backup=('usr/share/vlc/http/.hosts' 'usr/share/vlc/lua/http/dialogs/.hosts') options=('!libtool') install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('91de1ad308c947e35380f9d747ff5713') +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2" + 'bp-set-channel-map-pulseaudio-1.0.patch') +md5sums=('91de1ad308c947e35380f9d747ff5713' + 'bae24e02207364d76a1a118644de484e') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c + patch -Np1 -i ${srcdir}/bp-set-channel-map-pulseaudio-1.0.patch + ./configure --prefix=/usr \ --disable-rpath \ --enable-faad \ diff --git a/extra/vlc/bp-set-channel-map-pulseaudio-1.0.patch b/extra/vlc/bp-set-channel-map-pulseaudio-1.0.patch new file mode 100644 index 000000000..e63b3f97b --- /dev/null +++ b/extra/vlc/bp-set-channel-map-pulseaudio-1.0.patch @@ -0,0 +1,33 @@ +From 15a821886296a8efe5f8b9015b6e9c5ae5e3ae79 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> +Date: Tue, 11 Oct 2011 19:19:21 +0300 +Subject: Set channel map when using PulseAudio 1.0 + +(cherry picked from commit ca2cb5f01340252a85ad5bed877e84407f092b21) +--- + modules/audio_output/pulse.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c +index d67dc31..18ee280 100644 +--- a/modules/audio_output/pulse.c ++++ b/modules/audio_output/pulse.c +@@ -640,6 +640,7 @@ static int Open(vlc_object_t *obj) + formatv[formatc]->encoding = encoding; + pa_format_info_set_rate(formatv[formatc], ss.rate); + pa_format_info_set_channels(formatv[formatc], ss.channels); ++ pa_format_info_set_channel_map(formatv[formatc], &map); + formatc++; + } + +@@ -649,6 +650,7 @@ static int Open(vlc_object_t *obj) + pa_format_info_set_sample_format(formatv[formatc], ss.format); + pa_format_info_set_rate(formatv[formatc], ss.rate); + pa_format_info_set_channels(formatv[formatc], ss.channels); ++ pa_format_info_set_channel_map(formatv[formatc], &map); + formatc++; + + /* Create a playback stream */ +-- +1.7.4.1 + diff --git a/extra/xfce4-screenshooter/PKGBUILD b/extra/xfce4-screenshooter/PKGBUILD index 9a793fbc4..ab636abd7 100644 --- a/extra/xfce4-screenshooter/PKGBUILD +++ b/extra/xfce4-screenshooter/PKGBUILD @@ -1,42 +1,50 @@ -# $Id: PKGBUILD 134703 2011-08-07 16:23:19Z andyrtr $ -# Maintainer: tobias <tobias funnychar archlinux.org> +# $Id: PKGBUILD 143213 2011-11-23 12:30:04Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-screenshooter pkgver=1.8.0 -pkgrel=1 -pkgdesc="plugin that makes screenshots for the Xfce4 panel" -arch=(i686 x86_64) -license=('GPL2') +pkgrel=2 +pkgdesc="Plugin that makes screenshots for the Xfce panel" +arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter" +license=('GPL2') groups=('xfce4-goodies') depends=('xfce4-panel' 'libsoup' 'hicolor-icon-theme') makedepends=('intltool') -install=${pkgname}.install +install=$pkgname.install options=('!libtool') -source=(http://archive.xfce.org/src/apps/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2 - xfce4-screenshooter-1.7.9-dsofix.patch - fix_segfault.diff) +source=(http://archive.xfce.org/src/apps/$pkgname/1.8/$pkgname-$pkgver.tar.bz2 + xfce4-screenshooter-1.7.9-dsofix.patch + fs-25873-segfault-in-awesome-wm.patch) conflicts=('xfce4-screenshooter-plugin') replaces=('xfce4-screenshooter-plugin') -md5sums=('b51ab5725418e7258273c4a6402adb02' - '355a7d005bf9200f5a5577f0bc901945' - '794d7e0ff18cad369bd50a78e883f986') +sha256sums=('68748a42ae68c5a8e9ed1c14ec5c741a344ab30b5b325b8812220539548ad83e' + '6902495c0394af19a76e2f90399ca7295e8dfb3ffb29d3b4f3b3a9fb7489c464' + '76cc9127167c9f4a800b01e9d16b85bf3af335d0eb44588d859739aa9d457e38') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/xfce4-screenshooter-1.7.9-dsofix.patch - #patch -Np1 -i ${srcdir}/fix_segfault.diff + cd "$srcdir/$pkgname-$pkgver" + + patch -Np1 -i "$srcdir/xfce4-screenshooter-1.7.9-dsofix.patch" + + # segfaults trying to capture screenshot of active window in awesome WM + # https://bugs.archlinux.org/task/25873 + # patch by Bruno Ramos @ https://bugzilla.xfce.org/show_bug.cgi?id=8080#c2 + patch -Np1 -i "$srcdir/fs-25873-segfault-in-awesome-wm.patch" + ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --disable-debug + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch b/extra/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch new file mode 100644 index 000000000..47e067144 --- /dev/null +++ b/extra/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch @@ -0,0 +1,21 @@ +--- a/lib/screenshooter-capture.c ++++ a/lib/screenshooter-capture.c +@@ -381,6 +381,18 @@ static GdkPixbuf + rec_height += rectangle.y; + } + ++ if (rec_x < 0) ++ { ++ rec_width = rec_width + rec_x; ++ rec_x = 0; ++ } ++ ++ if (rec_y < 0) ++ { ++ rec_height = rec_height + rec_y; ++ rec_y = 0; ++ } ++ + if (x_orig + rec_x + rec_width > gdk_screen_width ()) + rec_width = gdk_screen_width () - x_orig - rec_x; + diff --git a/extra/xfce4-screenshooter/xfce4-screenshooter.install b/extra/xfce4-screenshooter/xfce4-screenshooter.install index 21b79d2d4..e4f8fd06c 100644 --- a/extra/xfce4-screenshooter/xfce4-screenshooter.install +++ b/extra/xfce4-screenshooter/xfce4-screenshooter.install @@ -3,9 +3,11 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-settings/PKGBUILD b/extra/xfce4-settings/PKGBUILD index ab5adf0c1..f17fd5727 100644 --- a/extra/xfce4-settings/PKGBUILD +++ b/extra/xfce4-settings/PKGBUILD @@ -1,46 +1,49 @@ -# $Id: PKGBUILD 138683 2011-09-27 15:54:14Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 143211 2011-11-23 12:04:45Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=xfce4-settings pkgver=4.8.3 -pkgrel=1 +pkgrel=2 pkgdesc="Settings manager for xfce" arch=('i686' 'x86_64') -license=('GPL2') url="http://www.xfce.org/" +license=('GPL2') groups=('xfce4') -depends=('exo>=0.6.0' 'libxfce4ui' 'libnotify>=0.7.1' 'libxklavier' 'tango-icon-theme' 'gnome-icon-theme' 'gtk-engines' 'gtk-xfce-engine') +depends=('exo' 'libxfce4ui' 'libnotify' 'libxklavier' 'gnome-icon-theme' + 'gtk-engines' 'gtk-xfce-engine') makedepends=('intltool') optdepends=('libcanberra: for sound control') source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2 - xfce4-settings-4.6.0.patch) -md5sums=('4669298cc8a4abf0e5a410016b575030' - '3046732e5d73c9939e7674602eadb1e2') -sha1sums=('98431633ba3ec2a4a10182bc7266904d9256949b' - '18f5eaf1fd86b957bae2e41fbdd83edef5437b3c') + xfce4-settings-4.6.0.patch) +sha256sums=('d878cc474e1e677e9607279b9a1007cb90ed35ff078de180259a8b2b8d06bc2e' + 'c91d246cc678014a7fa8af37f2a24640bcc8823e41e064361130da7ae3809ed5') build() { - cd ${srcdir}/${pkgname}-${pkgver} - # enable Tango icon theme, clearlooks theme and font hinting by default(taken from Fedora) - patch -Np1 -i ${srcdir}/xfce4-settings-4.6.0.patch || return 1 - + cd "$srcdir/$pkgname-$pkgver" + + # enable gnome icon theme, clearlooks theme and font hinting by default + # (taken from Fedora) + patch -Np1 -i "$srcdir/xfce4-settings-4.6.0.patch" + ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-xrandr \ - --enable-xcursor \ - --enable-libnotify \ - --enable-libxklavier \ - --enable-pluggable-dialogs \ - --enable-sound-settings \ - --disable-debug + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --enable-xrandr \ + --enable-xcursor \ + --enable-libnotify \ + --enable-libxklavier \ + --enable-pluggable-dialogs \ + --enable-sound-settings \ + --disable-debug make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-settings/xfce4-settings-4.6.0.patch b/extra/xfce4-settings/xfce4-settings-4.6.0.patch index 08cd80421..559e2f9e5 100644 --- a/extra/xfce4-settings/xfce4-settings-4.6.0.patch +++ b/extra/xfce4-settings/xfce4-settings-4.6.0.patch @@ -8,7 +8,7 @@ diff -Nur xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml xfce4-settings-4.6 - <property name="ThemeName" type="string" value="Xfce"/> - <property name="IconThemeName" type="string" value="Rodent"/> + <property name="ThemeName" type="string" value="Clearlooks"/> -+ <property name="IconThemeName" type="string" value="Tango"/> ++ <property name="IconThemeName" type="string" value="gnome"/> </property> <property name="Xft" type="empty"> <property name="DPI" type="int" value="-1"/> diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 062efe27e..341b508e2 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -9,30 +9,51 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.1 -pkgver=${_basekernel} -pkgrel=2 +pkgver=${_basekernel}.2 +pkgrel=1 arch=('i686' 'x86_64') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz" - # "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk "${pkgname}.preset" 'boot-logo.patch' - 'change-default-console-loglevel.patch') + 'change-default-console-loglevel.patch' + 'i915-fix-ghost-tv-output.patch' + 'i915-fix-incorrect-error-message.patch' + 'usb-add-reset-resume-quirk-for-several-webcams.patch') build() { cd "${srcdir}/linux-${_basekernel}" -# patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre" # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" + # Some chips detect a ghost TV output + # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html + # Arch Linux bug report: FS#19234 + # + # It is unclear why this patch wasn't merged upstream, it was accepted, + # then dropped because the reasoning was unclear. However, it is clearly + # needed. + patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch" + + # In 3.1.1, a DRM_DEBUG message is falsely declared as DRM_ERROR. This + # worries users, as this message is displayed even at loglevel 4. Fix + # this. + patch -Np1 -i "${srcdir}/i915-fix-incorrect-error-message.patch" + + # Add the USB_QUIRK_RESET_RESUME for several webcams + # FS#26528 + patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch" + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) @@ -270,18 +291,13 @@ package_linux-libre-docs() { # remove a file already in linux package rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } -md5sums=('44e7bc20c235a193f9b6123a8d5e9509' - '8840c46301f6eb425b9ab456d1ca7b7f' - '8089b63fdecf93735f178eb2907ce61e' - '4cc90e12cab492c1d61183c47683bd52' - 'a8a3843046926eb7ab81312cd438c5c5' - '04b21c79df0a952c22d681dd4f4562df' - '263725f20c0b9eb9c353040792d644e5' - '9d3c56a4b999c8bfbd4018089a62f662') - md5sums=('d73df15ab1d36fe3c102755d8f42117f' - 'a7cbd8c216a1f4c6068625c4dc746164' - '616e05f7436572a7e83500b5daa7e958' + '1ff1e0f6d56911eed8afc0c32456da02' + '7d8fac41f4c4c2d14d8c65645fb676bd' + '2a0302eda795903d3b01e41ba807c91e' 'a8a3843046926eb7ab81312cd438c5c5' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662') + '9d3c56a4b999c8bfbd4018089a62f662' + '263725f20c0b9eb9c353040792d644e5' + 'a50c9076012cb2dda49952dc6ec3e9c1' + '52d41fa61e80277ace2b994412a0c856') diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 86fe20b40..43bf1d3c3 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.0 Kernel Configuration +# Linux/i386 3.1.1-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4281,7 +4281,7 @@ CONFIG_USB_HIDDEV=y # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4413,6 +4413,7 @@ CONFIG_USB_TMC=m CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 4ec38fd52..6011a797a 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.1.0 Kernel Configuration +# Linux/x86_64 3.1.1-1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -4071,7 +4071,7 @@ CONFIG_USB_HIDDEV=y # CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=m +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m @@ -4203,6 +4203,7 @@ CONFIG_USB_TMC=m CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m diff --git a/libre/linux-libre/dib0700-fix.patch b/libre/linux-libre/dib0700-fix.patch new file mode 100644 index 000000000..48f07e6fd --- /dev/null +++ b/libre/linux-libre/dib0700-fix.patch @@ -0,0 +1,1487 @@ +commit 198c545cd7306dc90aaae1d61e64175e70a70dc8 +Author: Patrick Boettcher <Patrick.Boettcher@dibcom.fr> +Date: Wed Aug 3 17:08:21 2011 +0200 + + [media] DiBcom: protect the I2C bufer access + + This patch protect the I2C buffer access in order to manage concurrent + access. This protection is done using mutex. + Furthermore, for the dib9000, if a pid filtering command is + received during the tuning, this pid filtering command is delayed to + avoid any concurrent access issue. + + Cc: Mauro Carvalho Chehab <mchehab@redhat.com> + Cc: Florian Mickler <florian@mickler.org> + Cc: stable@kernel.org + + Signed-off-by: Olivier Grenie <olivier.grenie@dibcom.fr> + Signed-off-by: Patrick Boettcher <Patrick.Boettcher@dibcom.fr> + +diff --git a/drivers/media/dvb/frontends/dib0070.c b/drivers/media/dvb/frontends/dib0070.c +index 1d47d4d..dc1cb17 100644 +--- a/drivers/media/dvb/frontends/dib0070.c ++++ b/drivers/media/dvb/frontends/dib0070.c +@@ -27,6 +27,7 @@ + #include <linux/kernel.h> + #include <linux/slab.h> + #include <linux/i2c.h> ++#include <linux/mutex.h> + + #include "dvb_frontend.h" + +@@ -78,10 +79,18 @@ struct dib0070_state { + struct i2c_msg msg[2]; + u8 i2c_write_buffer[3]; + u8 i2c_read_buffer[2]; ++ struct mutex i2c_buffer_lock; + }; + +-static uint16_t dib0070_read_reg(struct dib0070_state *state, u8 reg) ++static u16 dib0070_read_reg(struct dib0070_state *state, u8 reg) + { ++ u16 ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + state->i2c_write_buffer[0] = reg; + + memset(state->msg, 0, 2 * sizeof(struct i2c_msg)); +@@ -96,13 +105,23 @@ static uint16_t dib0070_read_reg(struct dib0070_state *state, u8 reg) + + if (i2c_transfer(state->i2c, state->msg, 2) != 2) { + printk(KERN_WARNING "DiB0070 I2C read failed\n"); +- return 0; +- } +- return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ ret = 0; ++ } else ++ ret = (state->i2c_read_buffer[0] << 8) ++ | state->i2c_read_buffer[1]; ++ ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + + static int dib0070_write_reg(struct dib0070_state *state, u8 reg, u16 val) + { ++ int ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } + state->i2c_write_buffer[0] = reg; + state->i2c_write_buffer[1] = val >> 8; + state->i2c_write_buffer[2] = val & 0xff; +@@ -115,9 +134,12 @@ static int dib0070_write_reg(struct dib0070_state *state, u8 reg, u16 val) + + if (i2c_transfer(state->i2c, state->msg, 1) != 1) { + printk(KERN_WARNING "DiB0070 I2C write failed\n"); +- return -EREMOTEIO; +- } +- return 0; ++ ret = -EREMOTEIO; ++ } else ++ ret = 0; ++ ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + + #define HARD_RESET(state) do { \ +@@ -734,6 +756,7 @@ struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter + state->cfg = cfg; + state->i2c = i2c; + state->fe = fe; ++ mutex_init(&state->i2c_buffer_lock); + fe->tuner_priv = state; + + if (dib0070_reset(fe) != 0) +diff --git a/drivers/media/dvb/frontends/dib0090.c b/drivers/media/dvb/frontends/dib0090.c +index c9c935a..b174d1c 100644 +--- a/drivers/media/dvb/frontends/dib0090.c ++++ b/drivers/media/dvb/frontends/dib0090.c +@@ -27,6 +27,7 @@ + #include <linux/kernel.h> + #include <linux/slab.h> + #include <linux/i2c.h> ++#include <linux/mutex.h> + + #include "dvb_frontend.h" + +@@ -196,6 +197,7 @@ struct dib0090_state { + struct i2c_msg msg[2]; + u8 i2c_write_buffer[3]; + u8 i2c_read_buffer[2]; ++ struct mutex i2c_buffer_lock; + }; + + struct dib0090_fw_state { +@@ -208,10 +210,18 @@ struct dib0090_fw_state { + struct i2c_msg msg; + u8 i2c_write_buffer[2]; + u8 i2c_read_buffer[2]; ++ struct mutex i2c_buffer_lock; + }; + + static u16 dib0090_read_reg(struct dib0090_state *state, u8 reg) + { ++ u16 ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + state->i2c_write_buffer[0] = reg; + + memset(state->msg, 0, 2 * sizeof(struct i2c_msg)); +@@ -226,14 +236,24 @@ static u16 dib0090_read_reg(struct dib0090_state *state, u8 reg) + + if (i2c_transfer(state->i2c, state->msg, 2) != 2) { + printk(KERN_WARNING "DiB0090 I2C read failed\n"); +- return 0; +- } ++ ret = 0; ++ } else ++ ret = (state->i2c_read_buffer[0] << 8) ++ | state->i2c_read_buffer[1]; + +- return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + + static int dib0090_write_reg(struct dib0090_state *state, u32 reg, u16 val) + { ++ int ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ + state->i2c_write_buffer[0] = reg & 0xff; + state->i2c_write_buffer[1] = val >> 8; + state->i2c_write_buffer[2] = val & 0xff; +@@ -246,13 +266,23 @@ static int dib0090_write_reg(struct dib0090_state *state, u32 reg, u16 val) + + if (i2c_transfer(state->i2c, state->msg, 1) != 1) { + printk(KERN_WARNING "DiB0090 I2C write failed\n"); +- return -EREMOTEIO; +- } +- return 0; ++ ret = -EREMOTEIO; ++ } else ++ ret = 0; ++ ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + + static u16 dib0090_fw_read_reg(struct dib0090_fw_state *state, u8 reg) + { ++ u16 ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + state->i2c_write_buffer[0] = reg; + + memset(&state->msg, 0, sizeof(struct i2c_msg)); +@@ -262,13 +292,24 @@ static u16 dib0090_fw_read_reg(struct dib0090_fw_state *state, u8 reg) + state->msg.len = 2; + if (i2c_transfer(state->i2c, &state->msg, 1) != 1) { + printk(KERN_WARNING "DiB0090 I2C read failed\n"); +- return 0; +- } +- return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ ret = 0; ++ } else ++ ret = (state->i2c_read_buffer[0] << 8) ++ | state->i2c_read_buffer[1]; ++ ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + + static int dib0090_fw_write_reg(struct dib0090_fw_state *state, u8 reg, u16 val) + { ++ int ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ + state->i2c_write_buffer[0] = val >> 8; + state->i2c_write_buffer[1] = val & 0xff; + +@@ -279,9 +320,12 @@ static int dib0090_fw_write_reg(struct dib0090_fw_state *state, u8 reg, u16 val) + state->msg.len = 2; + if (i2c_transfer(state->i2c, &state->msg, 1) != 1) { + printk(KERN_WARNING "DiB0090 I2C write failed\n"); +- return -EREMOTEIO; +- } +- return 0; ++ ret = -EREMOTEIO; ++ } else ++ ret = 0; ++ ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + + #define HARD_RESET(state) do { if (cfg->reset) { if (cfg->sleep) cfg->sleep(fe, 0); msleep(10); cfg->reset(fe, 1); msleep(10); cfg->reset(fe, 0); msleep(10); } } while (0) +@@ -2440,6 +2484,7 @@ struct dvb_frontend *dib0090_register(struct dvb_frontend *fe, struct i2c_adapte + st->config = config; + st->i2c = i2c; + st->fe = fe; ++ mutex_init(&st->i2c_buffer_lock); + fe->tuner_priv = st; + + if (config->wbd == NULL) +@@ -2471,6 +2516,7 @@ struct dvb_frontend *dib0090_fw_register(struct dvb_frontend *fe, struct i2c_ada + st->config = config; + st->i2c = i2c; + st->fe = fe; ++ mutex_init(&st->i2c_buffer_lock); + fe->tuner_priv = st; + + if (dib0090_fw_reset_digital(fe, st->config) != 0) +diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c +index 79cb1c2..dbb76d7 100644 +--- a/drivers/media/dvb/frontends/dib7000m.c ++++ b/drivers/media/dvb/frontends/dib7000m.c +@@ -11,6 +11,7 @@ + #include <linux/kernel.h> + #include <linux/slab.h> + #include <linux/i2c.h> ++#include <linux/mutex.h> + + #include "dvb_frontend.h" + +@@ -55,6 +56,7 @@ struct dib7000m_state { + struct i2c_msg msg[2]; + u8 i2c_write_buffer[4]; + u8 i2c_read_buffer[2]; ++ struct mutex i2c_buffer_lock; + }; + + enum dib7000m_power_mode { +@@ -69,6 +71,13 @@ enum dib7000m_power_mode { + + static u16 dib7000m_read_word(struct dib7000m_state *state, u16 reg) + { ++ u16 ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + state->i2c_write_buffer[0] = (reg >> 8) | 0x80; + state->i2c_write_buffer[1] = reg & 0xff; + +@@ -85,11 +94,21 @@ static u16 dib7000m_read_word(struct dib7000m_state *state, u16 reg) + if (i2c_transfer(state->i2c_adap, state->msg, 2) != 2) + dprintk("i2c read error on %d",reg); + +- return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ ret = (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ mutex_unlock(&state->i2c_buffer_lock); ++ ++ return ret; + } + + static int dib7000m_write_word(struct dib7000m_state *state, u16 reg, u16 val) + { ++ int ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ + state->i2c_write_buffer[0] = (reg >> 8) & 0xff; + state->i2c_write_buffer[1] = reg & 0xff; + state->i2c_write_buffer[2] = (val >> 8) & 0xff; +@@ -101,7 +120,10 @@ static int dib7000m_write_word(struct dib7000m_state *state, u16 reg, u16 val) + state->msg[0].buf = state->i2c_write_buffer; + state->msg[0].len = 4; + +- return i2c_transfer(state->i2c_adap, state->msg, 1) != 1 ? -EREMOTEIO : 0; ++ ret = (i2c_transfer(state->i2c_adap, state->msg, 1) != 1 ? ++ -EREMOTEIO : 0); ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + static void dib7000m_write_tab(struct dib7000m_state *state, u16 *buf) + { +@@ -1385,6 +1407,7 @@ struct dvb_frontend * dib7000m_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, + demod = &st->demod; + demod->demodulator_priv = st; + memcpy(&st->demod.ops, &dib7000m_ops, sizeof(struct dvb_frontend_ops)); ++ mutex_init(&st->i2c_buffer_lock); + + st->timf_default = cfg->bw->timf; + +diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c +index 0c9f40c..292bc19 100644 +--- a/drivers/media/dvb/frontends/dib7000p.c ++++ b/drivers/media/dvb/frontends/dib7000p.c +@@ -10,6 +10,7 @@ + #include <linux/kernel.h> + #include <linux/slab.h> + #include <linux/i2c.h> ++#include <linux/mutex.h> + + #include "dvb_math.h" + #include "dvb_frontend.h" +@@ -68,6 +69,7 @@ struct dib7000p_state { + struct i2c_msg msg[2]; + u8 i2c_write_buffer[4]; + u8 i2c_read_buffer[2]; ++ struct mutex i2c_buffer_lock; + }; + + enum dib7000p_power_mode { +@@ -81,6 +83,13 @@ static int dib7090_set_diversity_in(struct dvb_frontend *fe, int onoff); + + static u16 dib7000p_read_word(struct dib7000p_state *state, u16 reg) + { ++ u16 ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + state->i2c_write_buffer[0] = reg >> 8; + state->i2c_write_buffer[1] = reg & 0xff; + +@@ -97,11 +106,20 @@ static u16 dib7000p_read_word(struct dib7000p_state *state, u16 reg) + if (i2c_transfer(state->i2c_adap, state->msg, 2) != 2) + dprintk("i2c read error on %d", reg); + +- return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ ret = (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + + static int dib7000p_write_word(struct dib7000p_state *state, u16 reg, u16 val) + { ++ int ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ + state->i2c_write_buffer[0] = (reg >> 8) & 0xff; + state->i2c_write_buffer[1] = reg & 0xff; + state->i2c_write_buffer[2] = (val >> 8) & 0xff; +@@ -113,7 +131,10 @@ static int dib7000p_write_word(struct dib7000p_state *state, u16 reg, u16 val) + state->msg[0].buf = state->i2c_write_buffer; + state->msg[0].len = 4; + +- return i2c_transfer(state->i2c_adap, state->msg, 1) != 1 ? -EREMOTEIO : 0; ++ ret = (i2c_transfer(state->i2c_adap, state->msg, 1) != 1 ? ++ -EREMOTEIO : 0); ++ mutex_unlock(&state->i2c_buffer_lock); ++ return ret; + } + + static void dib7000p_write_tab(struct dib7000p_state *state, u16 * buf) +@@ -1646,6 +1667,7 @@ int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 defau + return -ENOMEM; + + dpst->i2c_adap = i2c; ++ mutex_init(&dpst->i2c_buffer_lock); + + for (k = no_of_demods - 1; k >= 0; k--) { + dpst->cfg = cfg[k]; +@@ -2324,6 +2346,7 @@ struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, + demod = &st->demod; + demod->demodulator_priv = st; + memcpy(&st->demod.ops, &dib7000p_ops, sizeof(struct dvb_frontend_ops)); ++ mutex_init(&st->i2c_buffer_lock); + + dib7000p_write_word(st, 1287, 0x0003); /* sram lead in, rdy */ + +@@ -2333,8 +2356,9 @@ struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, + st->version = dib7000p_read_word(st, 897); + + /* FIXME: make sure the dev.parent field is initialized, or else +- request_firmware() will hit an OOPS (this should be moved somewhere +- more common) */ ++ request_firmware() will hit an OOPS (this should be moved somewhere ++ more common) */ ++ st->i2c_master.gated_tuner_i2c_adap.dev.parent = i2c_adap->dev.parent; + + dibx000_init_i2c_master(&st->i2c_master, DIB7000P, st->i2c_adap, st->i2c_addr); + +diff --git a/drivers/media/dvb/frontends/dib8000.c b/drivers/media/dvb/frontends/dib8000.c +index 7d2ea11..fe284d5 100644 +--- a/drivers/media/dvb/frontends/dib8000.c ++++ b/drivers/media/dvb/frontends/dib8000.c +@@ -10,6 +10,8 @@ + #include <linux/kernel.h> + #include <linux/slab.h> + #include <linux/i2c.h> ++#include <linux/mutex.h> ++ + #include "dvb_math.h" + + #include "dvb_frontend.h" +@@ -37,6 +39,7 @@ struct i2c_device { + u8 addr; + u8 *i2c_write_buffer; + u8 *i2c_read_buffer; ++ struct mutex *i2c_buffer_lock; + }; + + struct dib8000_state { +@@ -77,6 +80,7 @@ struct dib8000_state { + struct i2c_msg msg[2]; + u8 i2c_write_buffer[4]; + u8 i2c_read_buffer[2]; ++ struct mutex i2c_buffer_lock; + }; + + enum dib8000_power_mode { +@@ -86,24 +90,39 @@ enum dib8000_power_mode { + + static u16 dib8000_i2c_read16(struct i2c_device *i2c, u16 reg) + { ++ u16 ret; + struct i2c_msg msg[2] = { +- {.addr = i2c->addr >> 1, .flags = 0, +- .buf = i2c->i2c_write_buffer, .len = 2}, +- {.addr = i2c->addr >> 1, .flags = I2C_M_RD, +- .buf = i2c->i2c_read_buffer, .len = 2}, ++ {.addr = i2c->addr >> 1, .flags = 0, .len = 2}, ++ {.addr = i2c->addr >> 1, .flags = I2C_M_RD, .len = 2}, + }; + ++ if (mutex_lock_interruptible(i2c->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ ++ msg[0].buf = i2c->i2c_write_buffer; + msg[0].buf[0] = reg >> 8; + msg[0].buf[1] = reg & 0xff; ++ msg[1].buf = i2c->i2c_read_buffer; + + if (i2c_transfer(i2c->adap, msg, 2) != 2) + dprintk("i2c read error on %d", reg); + +- return (msg[1].buf[0] << 8) | msg[1].buf[1]; ++ ret = (msg[1].buf[0] << 8) | msg[1].buf[1]; ++ mutex_unlock(i2c->i2c_buffer_lock); ++ return ret; + } + + static u16 dib8000_read_word(struct dib8000_state *state, u16 reg) + { ++ u16 ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + state->i2c_write_buffer[0] = reg >> 8; + state->i2c_write_buffer[1] = reg & 0xff; + +@@ -120,7 +139,10 @@ static u16 dib8000_read_word(struct dib8000_state *state, u16 reg) + if (i2c_transfer(state->i2c.adap, state->msg, 2) != 2) + dprintk("i2c read error on %d", reg); + +- return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ ret = (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1]; ++ mutex_unlock(&state->i2c_buffer_lock); ++ ++ return ret; + } + + static u32 dib8000_read32(struct dib8000_state *state, u16 reg) +@@ -135,22 +157,35 @@ static u32 dib8000_read32(struct dib8000_state *state, u16 reg) + + static int dib8000_i2c_write16(struct i2c_device *i2c, u16 reg, u16 val) + { +- struct i2c_msg msg = {.addr = i2c->addr >> 1, .flags = 0, +- .buf = i2c->i2c_write_buffer, .len = 4}; ++ struct i2c_msg msg = {.addr = i2c->addr >> 1, .flags = 0, .len = 4}; + int ret = 0; + ++ if (mutex_lock_interruptible(i2c->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ ++ msg.buf = i2c->i2c_write_buffer; + msg.buf[0] = (reg >> 8) & 0xff; + msg.buf[1] = reg & 0xff; + msg.buf[2] = (val >> 8) & 0xff; + msg.buf[3] = val & 0xff; + + ret = i2c_transfer(i2c->adap, &msg, 1) != 1 ? -EREMOTEIO : 0; ++ mutex_unlock(i2c->i2c_buffer_lock); + + return ret; + } + + static int dib8000_write_word(struct dib8000_state *state, u16 reg, u16 val) + { ++ int ret; ++ ++ if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ + state->i2c_write_buffer[0] = (reg >> 8) & 0xff; + state->i2c_write_buffer[1] = reg & 0xff; + state->i2c_write_buffer[2] = (val >> 8) & 0xff; +@@ -162,7 +197,11 @@ static int dib8000_write_word(struct dib8000_state *state, u16 reg, u16 val) + state->msg[0].buf = state->i2c_write_buffer; + state->msg[0].len = 4; + +- return i2c_transfer(state->i2c.adap, state->msg, 1) != 1 ? -EREMOTEIO : 0; ++ ret = (i2c_transfer(state->i2c.adap, state->msg, 1) != 1 ? ++ -EREMOTEIO : 0); ++ mutex_unlock(&state->i2c_buffer_lock); ++ ++ return ret; + } + + static const s16 coeff_2k_sb_1seg_dqpsk[8] = { +@@ -2434,8 +2473,15 @@ int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 defau + if (!client.i2c_read_buffer) { + dprintk("%s: not enough memory", __func__); + ret = -ENOMEM; +- goto error_memory; ++ goto error_memory_read; ++ } ++ client.i2c_buffer_lock = kzalloc(sizeof(struct mutex), GFP_KERNEL); ++ if (!client.i2c_buffer_lock) { ++ dprintk("%s: not enough memory", __func__); ++ ret = -ENOMEM; ++ goto error_memory_lock; + } ++ mutex_init(client.i2c_buffer_lock); + + for (k = no_of_demods - 1; k >= 0; k--) { + /* designated i2c address */ +@@ -2476,8 +2522,10 @@ int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 defau + } + + error: ++ kfree(client.i2c_buffer_lock); ++error_memory_lock: + kfree(client.i2c_read_buffer); +-error_memory: ++error_memory_read: + kfree(client.i2c_write_buffer); + + return ret; +@@ -2581,6 +2629,8 @@ struct dvb_frontend *dib8000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, s + state->i2c.addr = i2c_addr; + state->i2c.i2c_write_buffer = state->i2c_write_buffer; + state->i2c.i2c_read_buffer = state->i2c_read_buffer; ++ mutex_init(&state->i2c_buffer_lock); ++ state->i2c.i2c_buffer_lock = &state->i2c_buffer_lock; + state->gpio_val = cfg->gpio_val; + state->gpio_dir = cfg->gpio_dir; + +diff --git a/drivers/media/dvb/frontends/dib9000.c b/drivers/media/dvb/frontends/dib9000.c +index a085588..b931074 100644 +--- a/drivers/media/dvb/frontends/dib9000.c ++++ b/drivers/media/dvb/frontends/dib9000.c +@@ -38,6 +38,15 @@ struct i2c_device { + #define DibInitLock(lock) mutex_init(lock) + #define DibFreeLock(lock) + ++struct dib9000_pid_ctrl { ++#define DIB9000_PID_FILTER_CTRL 0 ++#define DIB9000_PID_FILTER 1 ++ u8 cmd; ++ u8 id; ++ u16 pid; ++ u8 onoff; ++}; ++ + struct dib9000_state { + struct i2c_device i2c; + +@@ -99,6 +108,10 @@ struct dib9000_state { + struct i2c_msg msg[2]; + u8 i2c_write_buffer[255]; + u8 i2c_read_buffer[255]; ++ DIB_LOCK demod_lock; ++ u8 get_frontend_internal; ++ struct dib9000_pid_ctrl pid_ctrl[10]; ++ s8 pid_ctrl_index; /* -1: empty list; -2: do not use the list */ + }; + + static const u32 fe_info[44] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -1743,19 +1756,56 @@ EXPORT_SYMBOL(dib9000_set_gpio); + int dib9000_fw_pid_filter_ctrl(struct dvb_frontend *fe, u8 onoff) + { + struct dib9000_state *state = fe->demodulator_priv; +- u16 val = dib9000_read_word(state, 294 + 1) & 0xffef; ++ u16 val; ++ int ret; ++ ++ if ((state->pid_ctrl_index != -2) && (state->pid_ctrl_index < 9)) { ++ /* postpone the pid filtering cmd */ ++ dprintk("pid filter cmd postpone"); ++ state->pid_ctrl_index++; ++ state->pid_ctrl[state->pid_ctrl_index].cmd = DIB9000_PID_FILTER_CTRL; ++ state->pid_ctrl[state->pid_ctrl_index].onoff = onoff; ++ return 0; ++ } ++ ++ DibAcquireLock(&state->demod_lock); ++ ++ val = dib9000_read_word(state, 294 + 1) & 0xffef; + val |= (onoff & 0x1) << 4; + + dprintk("PID filter enabled %d", onoff); +- return dib9000_write_word(state, 294 + 1, val); ++ ret = dib9000_write_word(state, 294 + 1, val); ++ DibReleaseLock(&state->demod_lock); ++ return ret; ++ + } + EXPORT_SYMBOL(dib9000_fw_pid_filter_ctrl); + + int dib9000_fw_pid_filter(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff) + { + struct dib9000_state *state = fe->demodulator_priv; ++ int ret; ++ ++ if (state->pid_ctrl_index != -2) { ++ /* postpone the pid filtering cmd */ ++ dprintk("pid filter postpone"); ++ if (state->pid_ctrl_index < 9) { ++ state->pid_ctrl_index++; ++ state->pid_ctrl[state->pid_ctrl_index].cmd = DIB9000_PID_FILTER; ++ state->pid_ctrl[state->pid_ctrl_index].id = id; ++ state->pid_ctrl[state->pid_ctrl_index].pid = pid; ++ state->pid_ctrl[state->pid_ctrl_index].onoff = onoff; ++ } else ++ dprintk("can not add any more pid ctrl cmd"); ++ return 0; ++ } ++ ++ DibAcquireLock(&state->demod_lock); + dprintk("Index %x, PID %d, OnOff %d", id, pid, onoff); +- return dib9000_write_word(state, 300 + 1 + id, onoff ? (1 << 13) | pid : 0); ++ ret = dib9000_write_word(state, 300 + 1 + id, ++ onoff ? (1 << 13) | pid : 0); ++ DibReleaseLock(&state->demod_lock); ++ return ret; + } + EXPORT_SYMBOL(dib9000_fw_pid_filter); + +@@ -1778,6 +1828,7 @@ static void dib9000_release(struct dvb_frontend *demod) + DibFreeLock(&state->platform.risc.mbx_lock); + DibFreeLock(&state->platform.risc.mem_lock); + DibFreeLock(&state->platform.risc.mem_mbx_lock); ++ DibFreeLock(&state->demod_lock); + dibx000_exit_i2c_master(&st->i2c_master); + + i2c_del_adapter(&st->tuner_adap); +@@ -1795,14 +1846,19 @@ static int dib9000_sleep(struct dvb_frontend *fe) + { + struct dib9000_state *state = fe->demodulator_priv; + u8 index_frontend; +- int ret; ++ int ret = 0; + ++ DibAcquireLock(&state->demod_lock); + for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) { + ret = state->fe[index_frontend]->ops.sleep(state->fe[index_frontend]); + if (ret < 0) +- return ret; ++ goto error; + } +- return dib9000_mbx_send(state, OUT_MSG_FE_SLEEP, NULL, 0); ++ ret = dib9000_mbx_send(state, OUT_MSG_FE_SLEEP, NULL, 0); ++ ++error: ++ DibReleaseLock(&state->demod_lock); ++ return ret; + } + + static int dib9000_fe_get_tune_settings(struct dvb_frontend *fe, struct dvb_frontend_tune_settings *tune) +@@ -1816,7 +1872,10 @@ static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par + struct dib9000_state *state = fe->demodulator_priv; + u8 index_frontend, sub_index_frontend; + fe_status_t stat; +- int ret; ++ int ret = 0; ++ ++ if (state->get_frontend_internal == 0) ++ DibAcquireLock(&state->demod_lock); + + for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) { + state->fe[index_frontend]->ops.read_status(state->fe[index_frontend], &stat); +@@ -1846,14 +1905,15 @@ static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par + state->fe[index_frontend]->dtv_property_cache.rolloff; + } + } +- return 0; ++ ret = 0; ++ goto return_value; + } + } + + /* get the channel from master chip */ + ret = dib9000_fw_get_channel(fe, fep); + if (ret != 0) +- return ret; ++ goto return_value; + + /* synchronize the cache with the other frontends */ + for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) { +@@ -1866,8 +1926,12 @@ static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par + state->fe[index_frontend]->dtv_property_cache.code_rate_LP = fe->dtv_property_cache.code_rate_LP; + state->fe[index_frontend]->dtv_property_cache.rolloff = fe->dtv_property_cache.rolloff; + } ++ ret = 0; + +- return 0; ++return_value: ++ if (state->get_frontend_internal == 0) ++ DibReleaseLock(&state->demod_lock); ++ return ret; + } + + static int dib9000_set_tune_state(struct dvb_frontend *fe, enum frontend_tune_state tune_state) +@@ -1912,6 +1976,10 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par + dprintk("dib9000: must specify bandwidth "); + return 0; + } ++ ++ state->pid_ctrl_index = -1; /* postpone the pid filtering cmd */ ++ DibAcquireLock(&state->demod_lock); ++ + fe->dtv_property_cache.delivery_system = SYS_DVBT; + + /* set the master status */ +@@ -1974,13 +2042,18 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par + /* check the tune result */ + if (exit_condition == 1) { /* tune failed */ + dprintk("tune failed"); ++ DibReleaseLock(&state->demod_lock); ++ /* tune failed; put all the pid filtering cmd to junk */ ++ state->pid_ctrl_index = -1; + return 0; + } + + dprintk("tune success on frontend%i", index_frontend_success); + + /* synchronize all the channel cache */ ++ state->get_frontend_internal = 1; + dib9000_get_frontend(state->fe[0], fep); ++ state->get_frontend_internal = 0; + + /* retune the other frontends with the found channel */ + channel_status.status = CHANNEL_STATUS_PARAMETERS_SET; +@@ -2025,6 +2098,28 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par + /* turn off the diversity for the last frontend */ + dib9000_fw_set_diversity_in(state->fe[index_frontend - 1], 0); + ++ DibReleaseLock(&state->demod_lock); ++ if (state->pid_ctrl_index >= 0) { ++ u8 index_pid_filter_cmd; ++ u8 pid_ctrl_index = state->pid_ctrl_index; ++ ++ state->pid_ctrl_index = -2; ++ for (index_pid_filter_cmd = 0; ++ index_pid_filter_cmd <= pid_ctrl_index; ++ index_pid_filter_cmd++) { ++ if (state->pid_ctrl[index_pid_filter_cmd].cmd == DIB9000_PID_FILTER_CTRL) ++ dib9000_fw_pid_filter_ctrl(state->fe[0], ++ state->pid_ctrl[index_pid_filter_cmd].onoff); ++ else if (state->pid_ctrl[index_pid_filter_cmd].cmd == DIB9000_PID_FILTER) ++ dib9000_fw_pid_filter(state->fe[0], ++ state->pid_ctrl[index_pid_filter_cmd].id, ++ state->pid_ctrl[index_pid_filter_cmd].pid, ++ state->pid_ctrl[index_pid_filter_cmd].onoff); ++ } ++ } ++ /* do not postpone any more the pid filtering */ ++ state->pid_ctrl_index = -2; ++ + return 0; + } + +@@ -2041,6 +2136,7 @@ static int dib9000_read_status(struct dvb_frontend *fe, fe_status_t * stat) + u8 index_frontend; + u16 lock = 0, lock_slave = 0; + ++ DibAcquireLock(&state->demod_lock); + for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) + lock_slave |= dib9000_read_lock(state->fe[index_frontend]); + +@@ -2059,6 +2155,8 @@ static int dib9000_read_status(struct dvb_frontend *fe, fe_status_t * stat) + if ((lock & 0x0008) || (lock_slave & 0x0008)) + *stat |= FE_HAS_LOCK; + ++ DibReleaseLock(&state->demod_lock); ++ + return 0; + } + +@@ -2066,10 +2164,14 @@ static int dib9000_read_ber(struct dvb_frontend *fe, u32 * ber) + { + struct dib9000_state *state = fe->demodulator_priv; + u16 *c; ++ int ret = 0; + ++ DibAcquireLock(&state->demod_lock); + DibAcquireLock(&state->platform.risc.mem_mbx_lock); +- if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) +- return -EIO; ++ if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) { ++ ret = -EIO; ++ goto error; ++ } + dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, + state->i2c_read_buffer, 16 * 2); + DibReleaseLock(&state->platform.risc.mem_mbx_lock); +@@ -2077,7 +2179,10 @@ static int dib9000_read_ber(struct dvb_frontend *fe, u32 * ber) + c = (u16 *)state->i2c_read_buffer; + + *ber = c[10] << 16 | c[11]; +- return 0; ++ ++error: ++ DibReleaseLock(&state->demod_lock); ++ return ret; + } + + static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength) +@@ -2086,7 +2191,9 @@ static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength) + u8 index_frontend; + u16 *c = (u16 *)state->i2c_read_buffer; + u16 val; ++ int ret = 0; + ++ DibAcquireLock(&state->demod_lock); + *strength = 0; + for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) { + state->fe[index_frontend]->ops.read_signal_strength(state->fe[index_frontend], &val); +@@ -2097,8 +2204,10 @@ static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength) + } + + DibAcquireLock(&state->platform.risc.mem_mbx_lock); +- if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) +- return -EIO; ++ if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) { ++ ret = -EIO; ++ goto error; ++ } + dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, 16 * 2); + DibReleaseLock(&state->platform.risc.mem_mbx_lock); + +@@ -2107,7 +2216,10 @@ static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength) + *strength = 65535; + else + *strength += val; +- return 0; ++ ++error: ++ DibReleaseLock(&state->demod_lock); ++ return ret; + } + + static u32 dib9000_get_snr(struct dvb_frontend *fe) +@@ -2151,6 +2263,7 @@ static int dib9000_read_snr(struct dvb_frontend *fe, u16 * snr) + u8 index_frontend; + u32 snr_master; + ++ DibAcquireLock(&state->demod_lock); + snr_master = dib9000_get_snr(fe); + for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) + snr_master += dib9000_get_snr(state->fe[index_frontend]); +@@ -2161,6 +2274,8 @@ static int dib9000_read_snr(struct dvb_frontend *fe, u16 * snr) + } else + *snr = 0; + ++ DibReleaseLock(&state->demod_lock); ++ + return 0; + } + +@@ -2168,15 +2283,22 @@ static int dib9000_read_unc_blocks(struct dvb_frontend *fe, u32 * unc) + { + struct dib9000_state *state = fe->demodulator_priv; + u16 *c = (u16 *)state->i2c_read_buffer; ++ int ret = 0; + ++ DibAcquireLock(&state->demod_lock); + DibAcquireLock(&state->platform.risc.mem_mbx_lock); +- if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) +- return -EIO; ++ if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) { ++ ret = -EIO; ++ goto error; ++ } + dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, 16 * 2); + DibReleaseLock(&state->platform.risc.mem_mbx_lock); + + *unc = c[12]; +- return 0; ++ ++error: ++ DibReleaseLock(&state->demod_lock); ++ return ret; + } + + int dib9000_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 default_addr, u8 first_addr) +@@ -2322,6 +2444,10 @@ struct dvb_frontend *dib9000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, c + DibInitLock(&st->platform.risc.mbx_lock); + DibInitLock(&st->platform.risc.mem_lock); + DibInitLock(&st->platform.risc.mem_mbx_lock); ++ DibInitLock(&st->demod_lock); ++ st->get_frontend_internal = 0; ++ ++ st->pid_ctrl_index = -2; + + st->fe[0] = fe; + fe->demodulator_priv = st; +diff --git a/drivers/media/dvb/frontends/dibx000_common.c b/drivers/media/dvb/frontends/dibx000_common.c +index dc5d17a..774d507 100644 +--- a/drivers/media/dvb/frontends/dibx000_common.c ++++ b/drivers/media/dvb/frontends/dibx000_common.c +@@ -1,4 +1,5 @@ + #include <linux/i2c.h> ++#include <linux/mutex.h> + + #include "dibx000_common.h" + +@@ -10,6 +11,13 @@ MODULE_PARM_DESC(debug, "turn on debugging (default: 0)"); + + static int dibx000_write_word(struct dibx000_i2c_master *mst, u16 reg, u16 val) + { ++ int ret; ++ ++ if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ + mst->i2c_write_buffer[0] = (reg >> 8) & 0xff; + mst->i2c_write_buffer[1] = reg & 0xff; + mst->i2c_write_buffer[2] = (val >> 8) & 0xff; +@@ -21,11 +29,21 @@ static int dibx000_write_word(struct dibx000_i2c_master *mst, u16 reg, u16 val) + mst->msg[0].buf = mst->i2c_write_buffer; + mst->msg[0].len = 4; + +- return i2c_transfer(mst->i2c_adap, mst->msg, 1) != 1 ? -EREMOTEIO : 0; ++ ret = i2c_transfer(mst->i2c_adap, mst->msg, 1) != 1 ? -EREMOTEIO : 0; ++ mutex_unlock(&mst->i2c_buffer_lock); ++ ++ return ret; + } + + static u16 dibx000_read_word(struct dibx000_i2c_master *mst, u16 reg) + { ++ u16 ret; ++ ++ if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + mst->i2c_write_buffer[0] = reg >> 8; + mst->i2c_write_buffer[1] = reg & 0xff; + +@@ -42,7 +60,10 @@ static u16 dibx000_read_word(struct dibx000_i2c_master *mst, u16 reg) + if (i2c_transfer(mst->i2c_adap, mst->msg, 2) != 2) + dprintk("i2c read error on %d", reg); + +- return (mst->i2c_read_buffer[0] << 8) | mst->i2c_read_buffer[1]; ++ ret = (mst->i2c_read_buffer[0] << 8) | mst->i2c_read_buffer[1]; ++ mutex_unlock(&mst->i2c_buffer_lock); ++ ++ return ret; + } + + static int dibx000_is_i2c_done(struct dibx000_i2c_master *mst) +@@ -257,6 +278,7 @@ static int dibx000_i2c_gated_gpio67_xfer(struct i2c_adapter *i2c_adap, + struct i2c_msg msg[], int num) + { + struct dibx000_i2c_master *mst = i2c_get_adapdata(i2c_adap); ++ int ret; + + if (num > 32) { + dprintk("%s: too much I2C message to be transmitted (%i).\ +@@ -264,10 +286,15 @@ static int dibx000_i2c_gated_gpio67_xfer(struct i2c_adapter *i2c_adap, + return -ENOMEM; + } + +- memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num)); +- + dibx000_i2c_select_interface(mst, DIBX000_I2C_INTERFACE_GPIO_6_7); + ++ if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ ++ memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num)); ++ + /* open the gate */ + dibx000_i2c_gate_ctrl(mst, &mst->i2c_write_buffer[0], msg[0].addr, 1); + mst->msg[0].addr = mst->i2c_addr; +@@ -282,7 +309,11 @@ static int dibx000_i2c_gated_gpio67_xfer(struct i2c_adapter *i2c_adap, + mst->msg[num + 1].buf = &mst->i2c_write_buffer[4]; + mst->msg[num + 1].len = 4; + +- return i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ? num : -EIO; ++ ret = (i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ? ++ num : -EIO); ++ ++ mutex_unlock(&mst->i2c_buffer_lock); ++ return ret; + } + + static struct i2c_algorithm dibx000_i2c_gated_gpio67_algo = { +@@ -294,6 +325,7 @@ static int dibx000_i2c_gated_tuner_xfer(struct i2c_adapter *i2c_adap, + struct i2c_msg msg[], int num) + { + struct dibx000_i2c_master *mst = i2c_get_adapdata(i2c_adap); ++ int ret; + + if (num > 32) { + dprintk("%s: too much I2C message to be transmitted (%i).\ +@@ -301,10 +333,14 @@ static int dibx000_i2c_gated_tuner_xfer(struct i2c_adapter *i2c_adap, + return -ENOMEM; + } + +- memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num)); +- + dibx000_i2c_select_interface(mst, DIBX000_I2C_INTERFACE_TUNER); + ++ if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num)); ++ + /* open the gate */ + dibx000_i2c_gate_ctrl(mst, &mst->i2c_write_buffer[0], msg[0].addr, 1); + mst->msg[0].addr = mst->i2c_addr; +@@ -319,7 +355,10 @@ static int dibx000_i2c_gated_tuner_xfer(struct i2c_adapter *i2c_adap, + mst->msg[num + 1].buf = &mst->i2c_write_buffer[4]; + mst->msg[num + 1].len = 4; + +- return i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ? num : -EIO; ++ ret = (i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ? ++ num : -EIO); ++ mutex_unlock(&mst->i2c_buffer_lock); ++ return ret; + } + + static struct i2c_algorithm dibx000_i2c_gated_tuner_algo = { +@@ -390,8 +429,18 @@ static int i2c_adapter_init(struct i2c_adapter *i2c_adap, + int dibx000_init_i2c_master(struct dibx000_i2c_master *mst, u16 device_rev, + struct i2c_adapter *i2c_adap, u8 i2c_addr) + { +- u8 tx[4]; +- struct i2c_msg m = {.addr = i2c_addr >> 1,.buf = tx,.len = 4 }; ++ int ret; ++ ++ mutex_init(&mst->i2c_buffer_lock); ++ if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) { ++ dprintk("could not acquire lock"); ++ return -EINVAL; ++ } ++ memset(mst->msg, 0, sizeof(struct i2c_msg)); ++ mst->msg[0].addr = i2c_addr >> 1; ++ mst->msg[0].flags = 0; ++ mst->msg[0].buf = mst->i2c_write_buffer; ++ mst->msg[0].len = 4; + + mst->device_rev = device_rev; + mst->i2c_adap = i2c_adap; +@@ -431,9 +480,12 @@ int dibx000_init_i2c_master(struct dibx000_i2c_master *mst, u16 device_rev, + "DiBX000: could not initialize the master i2c_adapter\n"); + + /* initialize the i2c-master by closing the gate */ +- dibx000_i2c_gate_ctrl(mst, tx, 0, 0); ++ dibx000_i2c_gate_ctrl(mst, mst->i2c_write_buffer, 0, 0); ++ ++ ret = (i2c_transfer(i2c_adap, mst->msg, 1) == 1); ++ mutex_unlock(&mst->i2c_buffer_lock); + +- return i2c_transfer(i2c_adap, &m, 1) == 1; ++ return ret; + } + + EXPORT_SYMBOL(dibx000_init_i2c_master); +diff --git a/drivers/media/dvb/frontends/dibx000_common.h b/drivers/media/dvb/frontends/dibx000_common.h +index f031165..5e01147 100644 +--- a/drivers/media/dvb/frontends/dibx000_common.h ++++ b/drivers/media/dvb/frontends/dibx000_common.h +@@ -33,6 +33,7 @@ struct dibx000_i2c_master { + struct i2c_msg msg[34]; + u8 i2c_write_buffer[8]; + u8 i2c_read_buffer[2]; ++ struct mutex i2c_buffer_lock; + }; + + extern int dibx000_init_i2c_master(struct dibx000_i2c_master *mst, +commit 45cbff13693d645fa5dcbba964e802e1746b2e57 +Author: Olivier Grenie <olivier.grenie@dibcom.fr> +Date: Mon Aug 1 17:45:58 2011 +0200 + + [media] dib0700: protect the dib0700 buffer access + + This patch protects the common buffer access inside the dib0700 in order + to manage concurrent access. This protection is done using mutex. + + Cc: Mauro Carvalho Chehab <mchehab@redhat.com> + Cc: Florian Mickler <florian@mickler.org> + Cc: stable@kernel.org + + Signed-off-by: Javier Marcet <javier@marcet.info> + Signed-off-by: Olivier Grenie <olivier.grenie@dibcom.fr> + Signed-off-by: Patrick Boettcher <patrick.boettcher@dibcom.fr> + +diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c +index 5eb91b4..291b645 100644 +--- a/drivers/media/dvb/dvb-usb/dib0700_core.c ++++ b/drivers/media/dvb/dvb-usb/dib0700_core.c +@@ -30,6 +30,11 @@ int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion, + struct dib0700_state *st = d->priv; + int ret; + ++ if (mutex_lock_interruptible(&d->usb_mutex) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0), + REQUEST_GET_VERSION, + USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, +@@ -46,6 +51,7 @@ int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion, + if (fwtype != NULL) + *fwtype = (st->buf[12] << 24) | (st->buf[13] << 16) | + (st->buf[14] << 8) | st->buf[15]; ++ mutex_unlock(&d->usb_mutex); + return ret; + } + +@@ -108,7 +114,12 @@ int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen + int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, u8 gpio_dir, u8 gpio_val) + { + struct dib0700_state *st = d->priv; +- s16 ret; ++ int ret; ++ ++ if (mutex_lock_interruptible(&d->usb_mutex) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } + + st->buf[0] = REQUEST_SET_GPIO; + st->buf[1] = gpio; +@@ -116,6 +127,7 @@ int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, u8 gpio_ + + ret = dib0700_ctrl_wr(d, st->buf, 3); + ++ mutex_unlock(&d->usb_mutex); + return ret; + } + +@@ -125,6 +137,11 @@ static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets) + int ret; + + if (st->fw_version >= 0x10201) { ++ if (mutex_lock_interruptible(&d->usb_mutex) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + st->buf[0] = REQUEST_SET_USB_XFER_LEN; + st->buf[1] = (nb_ts_packets >> 8) & 0xff; + st->buf[2] = nb_ts_packets & 0xff; +@@ -132,6 +149,7 @@ static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets) + deb_info("set the USB xfer len to %i Ts packet\n", nb_ts_packets); + + ret = dib0700_ctrl_wr(d, st->buf, 3); ++ mutex_unlock(&d->usb_mutex); + } else { + deb_info("this firmware does not allow to change the USB xfer len\n"); + ret = -EIO; +@@ -208,6 +226,10 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, + + } else { + /* Write request */ ++ if (mutex_lock_interruptible(&d->usb_mutex) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } + st->buf[0] = REQUEST_NEW_I2C_WRITE; + st->buf[1] = msg[i].addr << 1; + st->buf[2] = (en_start << 7) | (en_stop << 6) | +@@ -227,6 +249,7 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, + USB_TYPE_VENDOR | USB_DIR_OUT, + 0, 0, st->buf, msg[i].len + 4, + USB_CTRL_GET_TIMEOUT); ++ mutex_unlock(&d->usb_mutex); + if (result < 0) { + deb_info("i2c write error (status = %d)\n", result); + break; +@@ -249,6 +272,10 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap, + + if (mutex_lock_interruptible(&d->i2c_mutex) < 0) + return -EAGAIN; ++ if (mutex_lock_interruptible(&d->usb_mutex) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } + + for (i = 0; i < num; i++) { + /* fill in the address */ +@@ -279,6 +306,7 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap, + break; + } + } ++ mutex_unlock(&d->usb_mutex); + mutex_unlock(&d->i2c_mutex); + + return i; +@@ -337,7 +365,12 @@ static int dib0700_set_clock(struct dvb_usb_device *d, u8 en_pll, + u16 pll_loopdiv, u16 free_div, u16 dsuScaler) + { + struct dib0700_state *st = d->priv; +- s16 ret; ++ int ret; ++ ++ if (mutex_lock_interruptible(&d->usb_mutex) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } + + st->buf[0] = REQUEST_SET_CLOCK; + st->buf[1] = (en_pll << 7) | (pll_src << 6) | +@@ -352,6 +385,7 @@ static int dib0700_set_clock(struct dvb_usb_device *d, u8 en_pll, + st->buf[9] = dsuScaler & 0xff; /* LSB */ + + ret = dib0700_ctrl_wr(d, st->buf, 10); ++ mutex_unlock(&d->usb_mutex); + + return ret; + } +@@ -360,10 +394,16 @@ int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz) + { + struct dib0700_state *st = d->priv; + u16 divider; ++ int ret; + + if (scl_kHz == 0) + return -EINVAL; + ++ if (mutex_lock_interruptible(&d->usb_mutex) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + st->buf[0] = REQUEST_SET_I2C_PARAM; + divider = (u16) (30000 / scl_kHz); + st->buf[1] = 0; +@@ -379,7 +419,11 @@ int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz) + deb_info("setting I2C speed: %04x %04x %04x (%d kHz).", + (st->buf[2] << 8) | (st->buf[3]), (st->buf[4] << 8) | + st->buf[5], (st->buf[6] << 8) | st->buf[7], scl_kHz); +- return dib0700_ctrl_wr(d, st->buf, 8); ++ ++ ret = dib0700_ctrl_wr(d, st->buf, 8); ++ mutex_unlock(&d->usb_mutex); ++ ++ return ret; + } + + +@@ -515,6 +559,11 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) + } + } + ++ if (mutex_lock_interruptible(&adap->dev->usb_mutex) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + st->buf[0] = REQUEST_ENABLE_VIDEO; + /* this bit gives a kind of command, + * rather than enabling something or not */ +@@ -548,7 +597,10 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) + + deb_info("data for streaming: %x %x\n", st->buf[1], st->buf[2]); + +- return dib0700_ctrl_wr(adap->dev, st->buf, 4); ++ ret = dib0700_ctrl_wr(adap->dev, st->buf, 4); ++ mutex_unlock(&adap->dev->usb_mutex); ++ ++ return ret; + } + + int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type) +@@ -557,6 +609,11 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type) + struct dib0700_state *st = d->priv; + int new_proto, ret; + ++ if (mutex_lock_interruptible(&d->usb_mutex) < 0) { ++ dprintk("could not acquire lock"); ++ return 0; ++ } ++ + st->buf[0] = REQUEST_SET_RC; + st->buf[1] = 0; + st->buf[2] = 0; +@@ -567,23 +624,29 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type) + else if (rc_type == RC_TYPE_NEC) + new_proto = 0; + else if (rc_type == RC_TYPE_RC6) { +- if (st->fw_version < 0x10200) +- return -EINVAL; ++ if (st->fw_version < 0x10200) { ++ ret = -EINVAL; ++ goto out; ++ } + + new_proto = 2; +- } else +- return -EINVAL; ++ } else { ++ ret = -EINVAL; ++ goto out; ++ } + + st->buf[1] = new_proto; + + ret = dib0700_ctrl_wr(d, st->buf, 3); + if (ret < 0) { + err("ir protocol setup failed"); +- return ret; ++ goto out; + } + + d->props.rc.core.protocol = rc_type; + ++out: ++ mutex_unlock(&d->usb_mutex); + return ret; + } + +commit aeb2d456b746164a4bd19e53de0a6678ca63fcad +Author: Olivier Grenie <olivier.grenie@dibcom.fr> +Date: Thu Aug 4 18:10:03 2011 +0200 + + [media] dib0700: correct error message + + The goal of this patch is to correct a previous patch. In case of error, + the err() function should be used instead of dprintk() function. + + Signed-off-by: Olivier Grenie <olivier.grenie@dibcom.fr> + +diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c +index 291b645..b693ed1 100644 +--- a/drivers/media/dvb/dvb-usb/dib0700_core.c ++++ b/drivers/media/dvb/dvb-usb/dib0700_core.c +@@ -31,7 +31,7 @@ int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion, + int ret; + + if (mutex_lock_interruptible(&d->usb_mutex) < 0) { +- dprintk("could not acquire lock"); ++ err("could not acquire lock"); + return 0; + } + +@@ -117,7 +117,7 @@ int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, u8 gpio_ + int ret; + + if (mutex_lock_interruptible(&d->usb_mutex) < 0) { +- dprintk("could not acquire lock"); ++ err("could not acquire lock"); + return 0; + } + +@@ -138,7 +138,7 @@ static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets) + + if (st->fw_version >= 0x10201) { + if (mutex_lock_interruptible(&d->usb_mutex) < 0) { +- dprintk("could not acquire lock"); ++ err("could not acquire lock"); + return 0; + } + +@@ -227,7 +227,7 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, + } else { + /* Write request */ + if (mutex_lock_interruptible(&d->usb_mutex) < 0) { +- dprintk("could not acquire lock"); ++ err("could not acquire lock"); + return 0; + } + st->buf[0] = REQUEST_NEW_I2C_WRITE; +@@ -273,7 +273,7 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap, + if (mutex_lock_interruptible(&d->i2c_mutex) < 0) + return -EAGAIN; + if (mutex_lock_interruptible(&d->usb_mutex) < 0) { +- dprintk("could not acquire lock"); ++ err("could not acquire lock"); + return 0; + } + +@@ -368,7 +368,7 @@ static int dib0700_set_clock(struct dvb_usb_device *d, u8 en_pll, + int ret; + + if (mutex_lock_interruptible(&d->usb_mutex) < 0) { +- dprintk("could not acquire lock"); ++ err("could not acquire lock"); + return 0; + } + +@@ -400,7 +400,7 @@ int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz) + return -EINVAL; + + if (mutex_lock_interruptible(&d->usb_mutex) < 0) { +- dprintk("could not acquire lock"); ++ err("could not acquire lock"); + return 0; + } + +@@ -560,7 +560,7 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) + } + + if (mutex_lock_interruptible(&adap->dev->usb_mutex) < 0) { +- dprintk("could not acquire lock"); ++ err("could not acquire lock"); + return 0; + } + +@@ -610,7 +610,7 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type) + int new_proto, ret; + + if (mutex_lock_interruptible(&d->usb_mutex) < 0) { +- dprintk("could not acquire lock"); ++ err("could not acquire lock"); + return 0; + } + diff --git a/libre/linux-libre/i915-fix-ghost-tv-output.patch b/libre/linux-libre/i915-fix-ghost-tv-output.patch new file mode 100644 index 000000000..3b631361a --- /dev/null +++ b/libre/linux-libre/i915-fix-ghost-tv-output.patch @@ -0,0 +1,26 @@ +Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> +Tested-by: Santi <santi@agolina.net> +--- + drivers/gpu/drm/i915/intel_tv.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c +index dc83b7a..c8f67bf 100644 +--- a/drivers/gpu/drm/i915/intel_tv.c ++++ b/drivers/gpu/drm/i915/intel_tv.c +@@ -1267,6 +1267,15 @@ + DAC_B_0_7_V | + DAC_C_0_7_V); + ++ /* ++ * The TV sense state should be cleared to zero on cantiga platform. Otherwise ++ * the TV is misdetected. This is hardware requirement. ++ */ ++ if (IS_GM45(dev)) ++ tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL | ++ TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL); ++ ++ + I915_WRITE(TV_CTL, tv_ctl); + I915_WRITE(TV_DAC, tv_dac); + POSTING_READ(TV_DAC); diff --git a/libre/linux-libre/i915-fix-incorrect-error-message.patch b/libre/linux-libre/i915-fix-incorrect-error-message.patch new file mode 100644 index 000000000..e1addbb05 --- /dev/null +++ b/libre/linux-libre/i915-fix-incorrect-error-message.patch @@ -0,0 +1,22 @@ +commit 6c76e0b94e484ffbdf38d2fe2769b6ca9aa99de4 +Author: Thomas Bächler <thomas@archlinux.org> +Date: Mon Oct 31 19:16:18 2011 +0100 + + Change accidental error message to debug message. + + According to https://lkml.org/lkml/2011/9/19/80, this is not supposed + to be an error message, but a debug message. This worries users. + +diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c +index 04411ad..02d5794 100644 +--- a/drivers/gpu/drm/i915/intel_display.c ++++ b/drivers/gpu/drm/i915/intel_display.c +@@ -5172,7 +5172,7 @@ static void ironlake_update_pch_refclk(struct drm_device *dev) + } else { + /* Enable SSC on PCH eDP if needed */ + if (intel_panel_use_ssc(dev_priv)) { +- DRM_ERROR("enabling SSC on PCH\n"); ++ DRM_DEBUG("enabling SSC on PCH\n"); + temp |= DREF_SUPERSPREAD_SOURCE_ENABLE; + } + } diff --git a/libre/linux-libre/iwlagn-fix-NULL-pointer-dereference.patch b/libre/linux-libre/iwlagn-fix-NULL-pointer-dereference.patch new file mode 100644 index 000000000..a53a3a425 --- /dev/null +++ b/libre/linux-libre/iwlagn-fix-NULL-pointer-dereference.patch @@ -0,0 +1,38 @@ +This fix regression introduced by commit: + +commit 15b3f3b006b42a678523cad989bfd60b76bf4403 +Author: Wey-Yi Guy <wey-yi.w.guy@intel.com> +Date: Fri Jun 3 07:54:13 2011 -0700 + + iwlagn: set smps mode after assoc for 1000 device + +Also remove unneeded brackets on the way. + +Address: +https://bugzilla.redhat.com/show_bug.cgi?id=744155 + +If fix will not get 3.1 release, it should be applied in 3.1 stable. + +Cc: stable@kernel.org # 3.1+ +Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> +--- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +index ca632f9..5004342 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c ++++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +@@ -296,8 +296,8 @@ static int iwlagn_rxon_connect(struct iwl_priv *priv, + return ret; + } + +- if ((ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION) && +- priv->cfg->ht_params->smps_mode) ++ if (ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION && ++ priv->cfg->ht_params && priv->cfg->ht_params->smps_mode) + ieee80211_request_smps(ctx->vif, + priv->cfg->ht_params->smps_mode); + +-- +1.7.1 diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 493a6e3a7..772e15b24 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.1.0-2-LIBRE +KERNEL_VERSION=3.1.2-1-LIBRE post_install () { # updating module dependencies @@ -45,9 +45,8 @@ post_upgrade() { if grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then - echo "WARNING: /boot appears to be a seperate partition but is not mounted" - echo " This is most likely not what you want. Please mount your /boot" - echo " partition and reinstall the kernel unless you are sure this is OK" + echo "WARNING: /boot appears to be a seperate partition but is not mounted." + echo " You probably just broke your system. Congratulations." fi fi diff --git a/libre/linux-libre/md-raid10-fix-bug-when-activating-a-hot-spare.patch b/libre/linux-libre/md-raid10-fix-bug-when-activating-a-hot-spare.patch new file mode 100644 index 000000000..79be53afb --- /dev/null +++ b/libre/linux-libre/md-raid10-fix-bug-when-activating-a-hot-spare.patch @@ -0,0 +1,41 @@ +From 7fcc7c8acf0fba44d19a713207af7e58267c1179 Mon Sep 17 00:00:00 2001 +From: NeilBrown <neilb@suse.de> +Date: Mon, 31 Oct 2011 12:59:44 +1100 +Subject: md/raid10: Fix bug when activating a hot-spare. + +From: NeilBrown <neilb@suse.de> + +commit 7fcc7c8acf0fba44d19a713207af7e58267c1179 upstream. + +This is a fairly serious bug in RAID10. + +When a RAID10 array is degraded and a hot-spare is activated, the +spare does not take up the empty slot, but rather replaces the first +working device. +This is likely to make the array non-functional. It would normally +be possible to recover the data, but that would need care and is not +guaranteed. + +This bug was introduced in commit + 2bb77736ae5dca0a189829fbb7379d43364a9dac +which first appeared in 3.1. + +Signed-off-by: NeilBrown <neilb@suse.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/md/raid10.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/md/raid10.c ++++ b/drivers/md/raid10.c +@@ -1337,7 +1337,7 @@ static int raid10_add_disk(mddev_t *mdde + mirror_info_t *p = &conf->mirrors[mirror]; + if (p->recovery_disabled == mddev->recovery_disabled) + continue; +- if (!p->rdev) ++ if (p->rdev) + continue; + + disk_stack_limits(mddev->gendisk, rdev->bdev, + diff --git a/libre/linux-libre/usb-add-reset-resume-quirk-for-several-webcams.patch b/libre/linux-libre/usb-add-reset-resume-quirk-for-several-webcams.patch new file mode 100644 index 000000000..9e570dd3f --- /dev/null +++ b/libre/linux-libre/usb-add-reset-resume-quirk-for-several-webcams.patch @@ -0,0 +1,99 @@ +commit 2394d67e446bf616a0885167d5f0d397bdacfdfc +Author: Oliver Neukum <oneukum@suse.de> +Date: Tue Sep 13 08:42:21 2011 +0200 + + USB: add RESET_RESUME for webcams shown to be quirky + + The new runtime PM code has shown that many webcams suffer + from a race condition that may crash them upon resume. + Runtime PM is especially prone to show the problem because + it retains power to the cameras at all times. However + system suspension may also crash the devices and retain + power to the devices. + The only way to solve this problem without races is in + usbcore with the RESET_RESUME quirk. + + Signed-off-by: Oliver Neukum <oneukum@suse.de> + Signed-off-by: stable <stable@kernel.org> + Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c +index 81ce6a8..38f0510 100644 +--- a/drivers/usb/core/quirks.c ++++ b/drivers/usb/core/quirks.c +@@ -38,6 +38,24 @@ static const struct usb_device_id usb_quirk_list[] = { + /* Creative SB Audigy 2 NX */ + { USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME }, + ++ /* Logitech Webcam C200 */ ++ { USB_DEVICE(0x046d, 0x0802), .driver_info = USB_QUIRK_RESET_RESUME }, ++ ++ /* Logitech Webcam C250 */ ++ { USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, ++ ++ /* Logitech Webcam B/C500 */ ++ { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME }, ++ ++ /* Logitech Webcam Pro 9000 */ ++ { USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME }, ++ ++ /* Logitech Webcam C310 */ ++ { USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME }, ++ ++ /* Logitech Webcam C270 */ ++ { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME }, ++ + /* Logitech Harmony 700-series */ + { USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT }, + +@@ -69,6 +87,9 @@ static const struct usb_device_id usb_quirk_list[] = { + { USB_DEVICE(0x06a3, 0x0006), .driver_info = + USB_QUIRK_CONFIG_INTF_STRINGS }, + ++ /* Guillemot Webcam Hercules Dualpix Exchange*/ ++ { USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, ++ + /* M-Systems Flash Disk Pioneers */ + { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME }, + +commit 5b253d88cc6c65a23cefc457a5a4ef139913c5fc +Author: Jon Levell <linuxusb@coralbark.net> +Date: Thu Sep 29 20:42:52 2011 +0100 + + USB: add quirk for Logitech C300 web cam + + My webcam is a Logitech C300 and I get "chipmunk"ed squeaky sound. + The following trivial patch fixes it. + + Signed-off-by: Jon Levell <linuxusb@coralbark.net> + Cc: stable <stable@kernel.org> + Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c +index 38f0510..d6a8d82 100644 +--- a/drivers/usb/core/quirks.c ++++ b/drivers/usb/core/quirks.c +@@ -44,6 +44,9 @@ static const struct usb_device_id usb_quirk_list[] = { + /* Logitech Webcam C250 */ + { USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, + ++ /* Logitech Webcam C300 */ ++ { USB_DEVICE(0x046d, 0x0805), .driver_info = USB_QUIRK_RESET_RESUME }, ++ + /* Logitech Webcam B/C500 */ + { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME }, + +diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c +index d6a8d82..caa1991 100644 +--- a/drivers/usb/core/quirks.c ++++ b/drivers/usb/core/quirks.c +@@ -50,6 +50,9 @@ static const struct usb_device_id usb_quirk_list[] = { + /* Logitech Webcam B/C500 */ + { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME }, + ++ /* Logitech Webcam C600 */ ++ { USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME }, ++ + /* Logitech Webcam Pro 9000 */ + { USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME }, + diff --git a/staging/akonadi/PKGBUILD b/staging/akonadi/PKGBUILD new file mode 100644 index 000000000..d282dba68 --- /dev/null +++ b/staging/akonadi/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143233 2011-11-23 19:28:19Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=akonadi +pkgver=1.6.2 +pkgrel=2 +pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" +arch=('i686' 'x86_64') +url='http://pim.kde.org/akonadi' +license=('LGPL') +depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') +install="${pkgname}.install" +source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('07e2aa2e6953ac518f9306911747e264') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/akonadi/akonadi.install b/staging/akonadi/akonadi.install new file mode 100644 index 000000000..7c8a8bd2b --- /dev/null +++ b/staging/akonadi/akonadi.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/apr-util/PKGBUILD b/staging/apr-util/PKGBUILD new file mode 100644 index 000000000..b63e3f5fa --- /dev/null +++ b/staging/apr-util/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 143256 2011-11-24 02:15:11Z eric $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=apr-util +pkgver=1.3.12 +pkgrel=3 +pkgdesc="The Apache Portable Runtime" +arch=('i686' 'x86_64') +url="http://apr.apache.org/" +depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') +options=('!libtool') +license=('APACHE') +source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2") +md5sums=('0f671b037ca62751a8a7005578085560') + +build() { + cd "${srcdir}/apr-util-${pkgver}" + ./configure --prefix=/usr --with-apr=/usr \ + --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \ + --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap + make +} + +package() { + cd "${srcdir}/apr-util-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/boost/PKGBUILD b/staging/boost/PKGBUILD new file mode 100644 index 000000000..42d822a29 --- /dev/null +++ b/staging/boost/PKGBUILD @@ -0,0 +1,116 @@ +# $Id: PKGBUILD 143220 2011-11-23 14:06:08Z ibiru $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Kritoke <kritoke@gamebox.net> +# Contributor: Luca Roccia <little_rock@users.sourceforge.net> + +pkgbase=boost +pkgname=('boost-libs' 'boost') +pkgver=1.48.0 +_boostver=${pkgver//./_} +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.boost.org/" +makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') +source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz + exceptions.patch) +license=('custom') +md5sums=('313a11e97eb56eb7efd18325354631be' + '9b44c28b36303152050c8c82469569c5') + +_stagedir="${srcdir}/stagedir" + +build() { + # set python path for bjam + cd "${srcdir}/${pkgbase}_${_boostver}/tools" + echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam + echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam + echo "using mpi ;" >> build/v2/user-config.jam + + # http://web.archiveorange.com/archive/v/Q0J4VE5bwsy3zxRXqUgd + cd "${srcdir}"/${pkgbase}_${_boostver} + patch -p0 -i "${srcdir}"/exceptions.patch + + # build bjam + cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine" + ./build.sh cc + + _bindir="bin.linuxx86" + [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" + + install -d "${_stagedir}"/usr/bin + install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam + + # build tools + cd "${srcdir}/${pkgbase}_${_boostver}/tools/" + "${_stagedir}"/usr/bin/bjam --toolset=gcc + + # copy the tools + cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin" + for i in *;do + install -m755 "${i}" "${_stagedir}/usr/bin/${i}" + done + + #boostbook needed by quickbook + cd "${srcdir}/${pkgbase}_${_boostver}/dist/" + cp -r share "${_stagedir}" + + # build libs + cd "${srcdir}/${pkgbase}_${_boostver}" + + # default "minimal" install: "release link=shared,static + # runtime-link=shared threading=single,multi" + # --layout=tagged will add the "-mt" suffix for multithreaded libraries + # and installs includes in /usr/include/boost. + # --layout=system no longer adds the -mt suffix for multi-threaded libs. + # install to ${_stagedir} in preparation for split packaging + + "${_stagedir}"/usr/bin/bjam \ + release debug-symbols=off threading=multi \ + runtime-link=shared link=shared,static \ + cflags=-fno-strict-aliasing \ + toolset=gcc \ + --prefix="${_stagedir}" \ + -sTOOLS=gcc \ + --layout=system \ + ${MAKEFLAGS} \ + install +} + +package_boost() { + pkgdesc="Free peer-reviewed portable C++ source libraries - Development" + depends=("boost-libs=${pkgver}") + optdepends=('python: for python bindings' + 'python2: for python2 bindings') + + install -d "${pkgdir}"/usr/{include,lib,share} + # headers/source files + cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/ + + # static libs + cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ + + # utilities (bjam, bcp, pyste) + cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/ + + #boostbook + cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share + + # license + install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ + "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt +} + +package_boost-libs() { + pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime" + depends=('gcc-libs' 'bzip2' 'zlib' 'icu') + optdepends=('openmpi: for mpi support') + + install -d "${pkgdir}/usr/lib" + #shared libs + cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/" + + # license + install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ + "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt +} diff --git a/staging/boost/exceptions.patch b/staging/boost/exceptions.patch new file mode 100644 index 000000000..9faa71526 --- /dev/null +++ b/staging/boost/exceptions.patch @@ -0,0 +1,25 @@ +diff -up boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp +--- boost/numeric/conversion/converter_policies.hpp~ 2008-10-13 11:00:03.000000000 +0200 ++++ boost/numeric/conversion/converter_policies.hpp 2011-07-22 11:46:40.961876274 +0200 +@@ -20,6 +20,7 @@ + + #include "boost/mpl/if.hpp" + #include "boost/mpl/integral_c.hpp" ++#include "boost/throw_exception.hpp" + + namespace boost { namespace numeric + { +@@ -159,9 +160,9 @@ struct def_overflow_handler + void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow) + { + if ( r == cNegOverflow ) +- throw negative_overflow() ; ++ boost::throw_exception( negative_overflow() ) ; + else if ( r == cPosOverflow ) +- throw positive_overflow() ; ++ boost::throw_exception( positive_overflow() ) ; + } + } ; + + +Diff finished. Fri Jul 22 11:46:49 2011 diff --git a/staging/kactivities/PKGBUILD b/staging/kactivities/PKGBUILD new file mode 100644 index 000000000..0e6ca596b --- /dev/null +++ b/staging/kactivities/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 143130 2011-11-23 07:46:22Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kactivities +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='API for using and interacting with Activities' +url='http://kde.org/' +license=('GPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('c619c5d6e3e2ef79d0cebf52bf18d1b467dc24f9') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeaccessibility-jovie/PKGBUILD b/staging/kdeaccessibility-jovie/PKGBUILD new file mode 100644 index 000000000..bfb48e622 --- /dev/null +++ b/staging/kdeaccessibility-jovie/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 143139 2011-11-23 07:52:14Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeaccessibility-jovie +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='A text to speech application' +url='http://kde.org/applications/utilities/jovie/' +license=('GPL' 'FDL') +groups=('kde' 'kdeaccessibility') +depends=('kdebase-runtime' 'speech-dispatcher') +makedepends=('cmake' 'automoc4') +replaces=('kdeaccessibility-kttsd') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/jovie-${pkgver}.tar.bz2") +sha1sums=('d5ae86d01279fdf7b8102f9d516749b0ddfb531b') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../jovie-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeaccessibility-jovie/kdeaccessibility-jovie.install b/staging/kdeaccessibility-jovie/kdeaccessibility-jovie.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeaccessibility-jovie/kdeaccessibility-jovie.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/staging/kdeaccessibility-kaccessible/PKGBUILD b/staging/kdeaccessibility-kaccessible/PKGBUILD new file mode 100644 index 000000000..00be4f3ad --- /dev/null +++ b/staging/kdeaccessibility-kaccessible/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 143140 2011-11-23 07:52:41Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeaccessibility-kaccessible +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='Provides accessibility services like focus tracking and a screenreader' +url='http://accessibility.kde.org/' +license=('GPL' 'FDL') +groups=('kde' 'kdeaccessibility') +depends=('kdelibs' 'speech-dispatcher') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/unstable/${pkgver}/src/kaccessible-${pkgver}.tar.bz2") +sha1sums=('6d3235dde870414af9548c6fe1b1d25dd101d436') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kaccessible-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeaccessibility-kmag/PKGBUILD b/staging/kdeaccessibility-kmag/PKGBUILD new file mode 100644 index 000000000..6601b3687 --- /dev/null +++ b/staging/kdeaccessibility-kmag/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143141 2011-11-23 07:53:04Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeaccessibility-kmag +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='Screen Magnifier' +url='http://kde.org/applications/utilities/kmag/' +license=('GPL' 'FDL') +groups=('kde' 'kdeaccessibility') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kmag-${pkgver}.tar.bz2") +sha1sums=('549bd0c71e95f7526bb6766ba4d262ac372b6e1c') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kmag-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeaccessibility-kmag/kdeaccessibility-kmag.install b/staging/kdeaccessibility-kmag/kdeaccessibility-kmag.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeaccessibility-kmag/kdeaccessibility-kmag.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/staging/kdeaccessibility-kmousetool/PKGBUILD b/staging/kdeaccessibility-kmousetool/PKGBUILD new file mode 100644 index 000000000..09ed46f9a --- /dev/null +++ b/staging/kdeaccessibility-kmousetool/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143142 2011-11-23 07:53:28Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeaccessibility-kmousetool +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='Clicks the mouse for you, reducing the effects of RSI' +url='http://kde.org/applications/utilities/kmousetool/' +license=('GPL' 'FDL') +groups=('kde' 'kdeaccessibility') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kmousetool-${pkgver}.tar.bz2") +sha1sums=('a5a3190ba645d1930ca561560f2f37f91dc550c9') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kmousetool-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install b/staging/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.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/staging/kdeaccessibility-kmouth/PKGBUILD b/staging/kdeaccessibility-kmouth/PKGBUILD new file mode 100644 index 000000000..8ff78917e --- /dev/null +++ b/staging/kdeaccessibility-kmouth/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143143 2011-11-23 07:53:52Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeaccessibility-kmouth +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='Speech Synthesizer Frontend' +url='http://kde.org/applications/utilities/kmouth/' +license=('GPL' 'FDL') +groups=('kde' 'kdeaccessibility') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kmouth-${pkgver}.tar.bz2") +sha1sums=('175b2a58241a42689d73396d02f2836d57978e5e') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kmouth-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install b/staging/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeaccessibility-kmouth/kdeaccessibility-kmouth.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/staging/kdeadmin/PKGBUILD b/staging/kdeadmin/PKGBUILD new file mode 100644 index 000000000..d51f9affe --- /dev/null +++ b/staging/kdeadmin/PKGBUILD @@ -0,0 +1,80 @@ +# $Id: PKGBUILD 143144 2011-11-23 07:54:22Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeadmin +pkgname=('kdeadmin-kcron' + 'kdeadmin-ksystemlog' + 'kdeadmin-kuser' + 'kdeadmin-system-config-printer-kde') +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeadmin') +makedepends=('cmake' 'automoc4' 'kdebindings-python' 'system-config-printer-common') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'syslog-path.patch') +sha1sums=('3e06dff48271e78eec67bcda644476bcf0efa554' + '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + patch -p1 -i ${srcdir}/syslog-path.patch + + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_strigi-analyzer=OFF \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 + make +} + +package_kdeadmin-kcron() { + pkgdesc='Configure and schedule tasks' + depends=('kdelibs') + cd $srcdir/build/kcron + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcron + make DESTDIR=$pkgdir install +} + +package_kdeadmin-ksystemlog() { + pkgdesc='System log viewer tool' + depends=('kdebase-runtime') + url="http://kde.org/applications/system/ksystemlog/" + cd $srcdir/build/ksystemlog + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksystemlog + make DESTDIR=$pkgdir install +} + +package_kdeadmin-kuser() { + pkgdesc='User Manager' + depends=('kdepim-runtime') + url="http://kde.org/applications/system/kuser/" + install='kdeadmin.install' + cd $srcdir/build/kuser + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kuser + make DESTDIR=$pkgdir install +} + +package_kdeadmin-system-config-printer-kde() { + pkgdesc='Configure local and remote Printers' + depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt') + url="http://kde.org/applications/system/printerapplet/" + cd $srcdir/build/system-config-printer-kde + make DESTDIR=$pkgdir install + + # Use the python2 executable + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + "${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py + sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \ + "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py +} diff --git a/staging/kdeadmin/kdeadmin.install b/staging/kdeadmin/kdeadmin.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeadmin/kdeadmin.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/staging/kdeadmin/syslog-path.patch b/staging/kdeadmin/syslog-path.patch new file mode 100644 index 000000000..8a9142bf6 --- /dev/null +++ b/staging/kdeadmin/syslog-path.patch @@ -0,0 +1,11 @@ +--- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~ 2011-01-27 14:24:29.840000005 +0100 ++++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h 2011-01-27 14:24:53.803333335 +0100 +@@ -39,7 +39,7 @@ + SystemConfiguration() : + GenericLogModeConfiguration( + QLatin1String( SYSTEM_LOG_MODE_ID ), +- QStringList() << QLatin1String( "/var/log/syslog" ), ++ QStringList() << QLatin1String( "/var/log/messages.log" ), + QList<int>() << INFORMATION_LOG_LEVEL_ID + ) { + diff --git a/staging/kdeartwork/PKGBUILD b/staging/kdeartwork/PKGBUILD new file mode 100644 index 000000000..2613ecdcb --- /dev/null +++ b/staging/kdeartwork/PKGBUILD @@ -0,0 +1,104 @@ +# $Id: PKGBUILD 143145 2011-11-23 07:54:53Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeartwork +pkgname=('kdeartwork-aurorae' + 'kdeartwork-colorschemes' + 'kdeartwork-desktopthemes' + 'kdeartwork-emoticons' + 'kdeartwork-iconthemes' + 'kdeartwork-kscreensaver' + 'kdeartwork-sounds' + 'kdeartwork-styles' + 'kdeartwork-wallpapers' + 'kdeartwork-weatherwallpapers') +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeartwork') +makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' + 'libkexiv2') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('1b046764a5ca6481d6ce5648b0e180eec7cd08c0') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdeartwork-aurorae() { + pkgdesc='An Aurorae theme based on the Oxygen plasma theme' + cd $srcdir/build/aurorae + make DESTDIR=$pkgdir install +} + +package_kdeartwork-colorschemes() { + pkgdesc='KDE color schemes' + replaces=('kdeaccessibility-colorschemes') + cd $srcdir/build/ColorSchemes + make DESTDIR=$pkgdir install +} + +package_kdeartwork-desktopthemes() { + pkgdesc='KDE desktop themes' + cd $srcdir/build/desktopthemes + make DESTDIR=$pkgdir install +} + +package_kdeartwork-emoticons() { + pkgdesc='KDE emoticons' + cd $srcdir/build/emoticons + make DESTDIR=$pkgdir install +} + +package_kdeartwork-iconthemes() { + pkgdesc='KDE icon themes' + replaces=('kdeaccessibility-iconthemes') + cd $srcdir/build/IconThemes + make DESTDIR=$pkgdir install +} + +package_kdeartwork-kscreensaver() { + pkgdesc='KDE screensaver' + depends=('kdebase-workspace' 'libkexiv2') + cd $srcdir/build/kscreensaver + make DESTDIR=$pkgdir install +} + +package_kdeartwork-sounds() { + pkgdesc='KDE sounds' + cd $srcdir/build/sounds + make DESTDIR=$pkgdir install +} + +package_kdeartwork-styles() { + pkgdesc='KDE styles' + depends=('kdebase-workspace') + cd $srcdir/build/styles + make DESTDIR=$pkgdir install + cd $srcdir/build/kwin-styles + make DESTDIR=$pkgdir install +} + +package_kdeartwork-wallpapers() { + pkgdesc='KDE wallpapers' + cd $srcdir/build/wallpapers + make DESTDIR=$pkgdir install + cd $srcdir/build/HighResolutionWallpapers + make DESTDIR=$pkgdir install +} + +package_kdeartwork-weatherwallpapers() { + pkgdesc='KDE weather wallpapers' + cd $srcdir/build/WeatherWallpapers + make DESTDIR=$pkgdir install +} diff --git a/staging/kdebase-konsole/PKGBUILD b/staging/kdebase-konsole/PKGBUILD new file mode 100644 index 000000000..90de22922 --- /dev/null +++ b/staging/kdebase-konsole/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 143146 2011-11-23 07:57:36Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebase-konsole +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://kde.org/applications/system/konsole/' +pkgdesc="Terminal" +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebase') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/unstable/${pkgver}/src/konsole-${pkgver}.tar.bz2") +sha1sums=('47305f7eeabeefd71e518314b04d18b7a9724c39') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../konsole-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdebase-runtime/PKGBUILD b/staging/kdebase-runtime/PKGBUILD new file mode 100644 index 000000000..3847a211d --- /dev/null +++ b/staging/kdebase-runtime/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 143119 2011-11-23 07:40:47Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdebase-runtime +pkgver=4.7.80 +pkgrel=1 +pkgdesc="KDE Base Runtime Environment" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' + 'xorg-xauth') +makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen' + 'xine-lib') +optdepends=('htdig: to build the search index in khelpcenter' + 'rarian: needed by khelpcenter' + 'gdb: drkonq crash handler') +install="${pkgname}.install" +source=("http://download.kde.org/unstable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2") +sha1sums=('a9c0be087a2cd96d84c1fec1b4f726e9cbcc3327') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kde-runtime-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install + rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme" + ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" + + # Fix Python2 path + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ + "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen +} diff --git a/staging/kdebase-runtime/kdebase-runtime.install b/staging/kdebase-runtime/kdebase-runtime.install new file mode 100644 index 000000000..3f06b8deb --- /dev/null +++ b/staging/kdebase-runtime/kdebase-runtime.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD new file mode 100644 index 000000000..3879efb3f --- /dev/null +++ b/staging/kdebase-workspace/PKGBUILD @@ -0,0 +1,82 @@ +# $Id: PKGBUILD 143131 2011-11-23 07:47:31Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdebase-workspace +_pkgname=kde-workspace +pkgver=4.7.80 +pkgrel=1 +pkgdesc="KDE Base Workspace" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde') +# note on libxdamage: +# not detected by namcap because libgl depends on it +# but nvidia providing libgl does not depend on libxdamage +depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' + 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' + 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' + 'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres') +makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python' 'networkmanager') +optdepends=('kde-wallpapers: officials KDE wallapers') +replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' + 'kdebase-kinfocenter') +conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' + 'kdebase-kinfocenter') +install="${pkgname}.install" +backup=('usr/share/config/kdm/kdmrc' + 'etc/pam.d/kde' + 'etc/pam.d/kde-np' + 'etc/pam.d/kscreensaver') +options=('emptydirs') +source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" + 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' + 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') +sha1sums=('4fa3d9535361b81a0d1418f941c86409dba4dda1' + '8c2bdefb23a03b753b78d16944d03fa3939d2d99' + '5db3a245201bd4a50e65aa2ef583cf5490e4f646' + 'f7b38af38549242a240f1a90ab9964ca8a366129' + '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' + '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' + 'd7b5883f7e65c6839b1f65f94d58026673dd0226' + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' + 'd509dac592bd8b310df27991b208c95b6d907514') + +build() { + cd "${srcdir}"/${_pkgname}-${pkgver} + patch -p0 -i "${srcdir}"/kdm-zsh-profile.patch + patch -p1 -i "${srcdir}"/kdm-xinitrd.patch + patch -p0 -i "${srcdir}"/fixpath.patch + patch -p0 -i "${srcdir}"/terminate-server.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${_pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Xmms=OFF \ + -DWITH_Googlegadgets=OFF \ + -DWITH_libgps=OFF \ + -DWITH_OpenGLES=ON \ + -DKWIN_BUILD_WITH_OPENGLES=ON \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm + install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde + install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np + install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver + install -d -m755 "${pkgdir}"/usr/share/xsessions/ + ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop "${pkgdir}"/usr/share/xsessions/ + install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown} + + install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm +} diff --git a/staging/kdebase-workspace/fixpath.patch b/staging/kdebase-workspace/fixpath.patch new file mode 100644 index 000000000..be2b8383e --- /dev/null +++ b/staging/kdebase-workspace/fixpath.patch @@ -0,0 +1,34 @@ +--- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 ++++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 +@@ -34,22 +34,6 @@ + MALLOC_CHECK_=2 + export MALLOC_CHECK_ + +-# in case we have been started with full pathname spec without being in PATH +-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` +-if [ -n "$bindir" ]; then +- qbindir=`$bindir/kde4-config --qt-binaries` +- if [ -n "$qbindir" ]; then +- case $PATH in +- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; +- *) PATH=$qbindir:$PATH; export PATH;; +- esac +- fi +- case $PATH in +- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; +- *) PATH=$bindir:$PATH; export PATH;; +- esac +-fi +- + # Boot sequence: + # + # kdeinit is used to fork off processes which improves memory usage +@@ -206,7 +190,7 @@ + # For anything else (that doesn't set env vars, or that needs a window manager), + # better use the Autostart folder. + +-libpath=`kde4-config --path lib | tr : '\n'` ++libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/') + + for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do + for file in "$prefix"*.sh; do diff --git a/staging/kdebase-workspace/kde-np.pam b/staging/kdebase-workspace/kde-np.pam new file mode 100644 index 000000000..81eeef47b --- /dev/null +++ b/staging/kdebase-workspace/kde-np.pam @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth required pam_nologin.so +auth required pam_permit.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so +session required pam_limits.so
\ No newline at end of file diff --git a/staging/kdebase-workspace/kde.pam b/staging/kdebase-workspace/kde.pam new file mode 100644 index 000000000..1a259390f --- /dev/null +++ b/staging/kdebase-workspace/kde.pam @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth required pam_unix.so +auth required pam_nologin.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so +session required pam_limits.so
\ No newline at end of file diff --git a/staging/kdebase-workspace/kdebase-workspace.install b/staging/kdebase-workspace/kdebase-workspace.install new file mode 100644 index 000000000..f7d6d305b --- /dev/null +++ b/staging/kdebase-workspace/kdebase-workspace.install @@ -0,0 +1,25 @@ +post_install() { + groupadd -g 135 kdm &>/dev/null + useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null + chown -R 135:135 var/lib/kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &>/dev/null + update-desktop-database -q +} + +post_upgrade() { + getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null + getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null + chown -R 135:135 var/lib/kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_remove() { + if getent passwd kdm >/dev/null 2>&1; then + userdel kdm + fi + if getent group kdm >/dev/null 2>&1; then + groupdel kdm + fi + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/staging/kdebase-workspace/kdm b/staging/kdebase-workspace/kdm new file mode 100644 index 000000000..799d58f4b --- /dev/null +++ b/staging/kdebase-workspace/kdm @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=$(pidof -o %PPID /usr/bin/kdm) +case "$1" in + start) + stat_busy "Starting KDE Desktop Manager" + [ -z "$PID" ] && /usr/bin/kdm &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon kdm + stat_done + fi + ;; + stop) + stat_busy "Stopping KDE Desktop Manager" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon kdm + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/staging/kdebase-workspace/kdm-xinitrd.patch b/staging/kdebase-workspace/kdm-xinitrd.patch new file mode 100644 index 000000000..f5fc0e571 --- /dev/null +++ b/staging/kdebase-workspace/kdm-xinitrd.patch @@ -0,0 +1,18 @@ +--- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~ 2011-10-04 22:11:24.787771512 +0000 ++++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c 2011-10-04 22:13:58.612702824 +0000 +@@ -742,6 +742,15 @@ + "[ -f /etc/xprofile ] && . /etc/xprofile\n" + "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n" + "\n" ++"# run all system xinitrc shell scripts.\n" ++"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n" ++" for i in /etc/X11/xinit/xinitrc.d/* ; do\n" ++" if [ -x \"$i\" ]; then\n" ++" . \"$i\"\n" ++" fi\n" ++" done\n" ++"fi\n" ++"\n" + "if [ -d /etc/X11/Xresources ]; then\n" + " for i in /etc/X11/Xresources/*; do\n" + " [ -f $i ] && xrdb -merge $i\n" diff --git a/staging/kdebase-workspace/kdm-zsh-profile.patch b/staging/kdebase-workspace/kdm-zsh-profile.patch new file mode 100644 index 000000000..779456b39 --- /dev/null +++ b/staging/kdebase-workspace/kdm-zsh-profile.patch @@ -0,0 +1,11 @@ +--- kdm/kfrontend/genkdmconf.c 2008-02-13 09:40:49.000000000 +0000 ++++ kdm/kfrontend/genkdmconf.c 2008-05-16 12:47:36.000000000 +0000 +@@ -662,7 +662,7 @@ + " [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n" + " zhome=${ZDOTDIR:-$HOME}\n" + " # zshenv is always sourced automatically.\n" +-" [ -f $zdir/zprofile ] && . $zdir/zprofile\n" ++" [ -f /etc/profile ] && . /etc/profile\n" + " [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n" + " [ -f $zdir/zlogin ] && . $zdir/zlogin\n" + " [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n" diff --git a/staging/kdebase-workspace/kscreensaver.pam b/staging/kdebase-workspace/kscreensaver.pam new file mode 100644 index 000000000..b4d80c21f --- /dev/null +++ b/staging/kdebase-workspace/kscreensaver.pam @@ -0,0 +1 @@ +auth required pam_unix_auth.so diff --git a/staging/kdebase-workspace/terminate-server.patch b/staging/kdebase-workspace/terminate-server.patch new file mode 100644 index 000000000..094591317 --- /dev/null +++ b/staging/kdebase-workspace/terminate-server.patch @@ -0,0 +1,11 @@ +--- kdm/config.def 2009-08-27 10:17:39.000000000 +0200 ++++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100 +@@ -1448,7 +1448,7 @@ + + Key: TerminateServer + Type: bool +-Default: false ++Default: true + User: core + Instance: #:*/! + Merge: xdm diff --git a/staging/kdebase/PKGBUILD b/staging/kdebase/PKGBUILD new file mode 100644 index 000000000..be6de5acf --- /dev/null +++ b/staging/kdebase/PKGBUILD @@ -0,0 +1,120 @@ +# $Id: PKGBUILD 143132 2011-11-23 07:48:33Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdebase +pkgname=('kdebase-dolphin' + 'kdebase-kdepasswd' + 'kdebase-kdialog' + 'kdebase-keditbookmarks' + 'kdebase-kfind' + 'kdebase-konq-plugins' + 'kdebase-konqueror' + 'kdebase-lib' + 'kdebase-plasma') +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebase') +makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') +source=("http://download.kde.org/unstable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2") +sha1sums=('51782a7e569479ea0eff5e2ed93bc9813111a4cc') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../kde-baseapps-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdebase-dolphin() { + pkgdesc='File Manager' + depends=('kdebase-runtime' 'kdebase-lib') + optdepends=('kdegraphics-svgpart: thumbailers for SVG files' + 'kdegraphics-thumbnailers: thumbnailers for graphics file' + 'ruby: servicemenu installation') + url="http://kde.org/applications/system/dolphin/" + install=kdebase-dolphin.install + cd $srcdir/build/dolphin + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/dolphin + make DESTDIR=$pkgdir install +} + +package_kdebase-kdepasswd() { + pkgdesc='Change Password' + depends=('kdebase-runtime' 'kdebase-lib') + cd $srcdir/build/kdepasswd + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kdepasswd + make DESTDIR=$pkgdir install +} + +package_kdebase-kdialog() { + pkgdesc='A utility for displaying dialog boxes from shell scripts' + depends=('kdebase-runtime') + cd $srcdir/build/kdialog + make DESTDIR=$pkgdir install +} + +package_kdebase-keditbookmarks() { + pkgdesc='Bookmark Organizer and Editor' + depends=('kdebase-runtime') + cd $srcdir/build/keditbookmarks + make DESTDIR=$pkgdir install +} + +package_kdebase-kfind() { + pkgdesc='Find Files/Folders' + depends=('kdebase-runtime' 'kdebase-lib') + url="http://kde.org/applications/utilities/kfind/" + install='kdebase.install' + cd $srcdir/build/kfind + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kfind + make DESTDIR=$pkgdir install +} + +package_kdebase-konq-plugins() { + pkgdesc='Extra plugins for Konqueror' + depends=('kdebase-konqueror' 'tidyhtml') + replaces=('konq-plugins') + install='kdebase.install' + cd $srcdir/build/konq-plugins + make DESTDIR=$pkgdir install +} + +package_kdebase-konqueror() { + pkgdesc='KDE File Manager & Web Browser' + depends=('kdebase-dolphin' 'kdebase-keditbookmarks') + optdepends=('kwebkitpart: to enable webkit engine') + url="http://kde.org/applications/internet/konqueror/" + install='kdebase-konqueror.install' + conflicts=('kdebase-nsplugins') + replaces=('kdebase-nsplugins') + for i in konqueror doc/konqueror nsplugins; do + cd $srcdir/build/${i} + make DESTDIR=$pkgdir install + done +} + +package_kdebase-lib() { + pkgdesc='KDE libraries for the basic desktop applications' + groups=() + depends=('kdelibs') + cd $srcdir/build/lib + make DESTDIR=$pkgdir install +} + +package_kdebase-plasma() { + pkgdesc='Display the contents of folders (User´s home folder as default)' + depends=('kdebase-workspace' 'kdebase-lib') + cd $srcdir/build/plasma + make DESTDIR=$pkgdir install +} diff --git a/staging/kdebase/kdebase-dolphin.install b/staging/kdebase/kdebase-dolphin.install new file mode 100644 index 000000000..660593cf5 --- /dev/null +++ b/staging/kdebase/kdebase-dolphin.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdebase/kdebase-konqueror.install b/staging/kdebase/kdebase-konqueror.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/staging/kdebase/kdebase-konqueror.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdebase/kdebase.install b/staging/kdebase/kdebase.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdebase/kdebase.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/staging/kdebindings-kimono/PKGBUILD b/staging/kdebindings-kimono/PKGBUILD new file mode 100644 index 000000000..dcfb63384 --- /dev/null +++ b/staging/kdebindings-kimono/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143147 2011-11-23 07:58:03Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-kimono +pkgver=4.7.80 +pkgrel=1 +pkgdesc=".NET/Mono bindings for the KDE libraries" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdebindings-qyoto' 'kdebindings-smokekde') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') +conflicts=('kdebindings-csharp') +source=("http://download.kde.org/unstable/${pkgver}/src/kimono-${pkgver}.tar.bz2") +sha1sums=('a60e0e77618cc29592537e3c1254f1141cfb1bee') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kimono-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Soprano=OFF + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdebindings-korundum/PKGBUILD b/staging/kdebindings-korundum/PKGBUILD new file mode 100644 index 000000000..fcb401530 --- /dev/null +++ b/staging/kdebindings-korundum/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143148 2011-11-23 07:58:30Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-korundum +pkgver=4.7.80 +pkgrel=1 +pkgdesc="KDE bindings for ruby" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdebindings-qtruby' 'kdebindings-smokekde') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' + 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') +conflicts=('kdebindings-ruby') +source=("http://download.kde.org/unstable/${pkgver}/src/korundum-${pkgver}.tar.bz2") +sha1sums=('8336a5504f90111772ff4004eff971e779f92327') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../korundum-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdebindings-kross/PKGBUILD b/staging/kdebindings-kross/PKGBUILD new file mode 100644 index 000000000..6c9cc6ef9 --- /dev/null +++ b/staging/kdebindings-kross/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 143149 2011-11-23 07:58:54Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgbase=kdebindings-kross +pkgname=('kdebindings-kross-python' +# 'kdebindings-kross-ruby' + 'kdebindings-kross-java') +pkgver=4.7.80 +pkgrel=1 +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment') +source=("http://download.kde.org/unstable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2") +sha1sums=('52adafe42de134c6bc53855dbc464df2a1190efd') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kross-interpreters-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_ruby=OFF \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 + make +} + +package_kdebindings-kross-python() { + pkgdesc="Python2 language interpreters to enable in-process scripting with Kross" + depends=('kdelibs' 'python2') + + cd "${srcdir}"/build/python + make DESTDIR="${pkgdir}" install +} + +package_kdebindings-kross-java() { + pkgdesc="Java language interpreters to enable in-process scripting with Kross" + depends=('kdelibs' 'java-environment') + + cd "${srcdir}"/build/java + make DESTDIR="${pkgdir}" install +} + +package_kdebindings-kross-ruby() { + pkgdesc="Ruby language interpreters to enable in-process scripting with Kross" + depends=('kdelibs' 'ruby') + + cd "${srcdir}"/build/ruby + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdebindings-perlkde/PKGBUILD b/staging/kdebindings-perlkde/PKGBUILD new file mode 100644 index 000000000..27b63bd1f --- /dev/null +++ b/staging/kdebindings-perlkde/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143150 2011-11-23 07:59:21Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-perlkde +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Perl bindings for the KDE libraries" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdebindings-perlqt' 'kdebindings-smokekde') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' + 'kdegraphics-okular' 'kdesdk-kate') +source=("http://download.kde.org/unstable/${pkgver}/src/perlkde-${pkgver}.tar.bz2") +sha1sums=('2e5c317f26ccbc1e251fb53b30eae364a5153543') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../perlkde-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdebindings-perlqt/PKGBUILD b/staging/kdebindings-perlqt/PKGBUILD new file mode 100644 index 000000000..c845cc2fd --- /dev/null +++ b/staging/kdebindings-perlqt/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143126 2011-11-23 07:44:27Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-perlqt +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Perl bindings for the Qt libraries" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdebindings-smokeqt') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') +source=("http://download.kde.org/unstable/${pkgver}/src/perlqt-${pkgver}.tar.bz2") +sha1sums=('1f147d9554999b539b7c81da0fb4522f05f7c7d4') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../perlqt-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdebindings-python/PKGBUILD b/staging/kdebindings-python/PKGBUILD new file mode 100644 index 000000000..de21f07c0 --- /dev/null +++ b/staging/kdebindings-python/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 143127 2011-11-23 07:44:55Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-python +pkgver=4.7.80 +pkgrel=1 +pkgdesc="KDE bindings for Python" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs') +makedepends=('cmake' 'automoc4' 'boost') +source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.bz2") +sha1sums=('b67905a73566ad99b3bf1238b87f333c3ebb1fc5') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../pykde4-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + # Use the python2 executable + find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} diff --git a/staging/kdebindings-qtruby/PKGBUILD b/staging/kdebindings-qtruby/PKGBUILD new file mode 100644 index 000000000..5882234be --- /dev/null +++ b/staging/kdebindings-qtruby/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143129 2011-11-23 07:45:55Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-qtruby +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Qt bindings for ruby" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdebindings-smokeqt' 'ruby') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') +conflicts=('kdebindings-ruby') +source=("http://download.kde.org/unstable/${pkgver}/src/qtruby-${pkgver}.tar.bz2") +sha1sums=('ca1e73b375449d36ee52ae3012e70f2fa149f751') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../qtruby-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdebindings-qyoto/PKGBUILD b/staging/kdebindings-qyoto/PKGBUILD new file mode 100644 index 000000000..2ee34047c --- /dev/null +++ b/staging/kdebindings-qyoto/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143128 2011-11-23 07:45:26Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-qyoto +pkgver=4.7.80 +pkgrel=1 +pkgdesc=".NET/Mono bindings for the Qt libraries" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdebindings-smokeqt' 'mono') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') +conflicts=('kdebindings-csharp') +source=("http://download.kde.org/unstable/${pkgver}/src/qyoto-${pkgver}.tar.bz2") +sha1sums=('e1e4ab189e16ad33e3d19a457aee8540437c4af9') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../qyoto-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdebindings-smokegen/PKGBUILD b/staging/kdebindings-smokegen/PKGBUILD new file mode 100644 index 000000000..0668b8509 --- /dev/null +++ b/staging/kdebindings-smokegen/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 143121 2011-11-23 07:41:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-smokegen +pkgver=4.7.80 +pkgrel=1 +pkgdesc="A general purpose C++ parser with a plugin infrastructure" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +conflicts=('kdebindings-smoke') +source=("http://download.kde.org/unstable/${pkgver}/src/smokegen-${pkgver}.tar.bz2") +sha1sums=('da6dd73b0650c0f6e749435c3ae822c236224b00') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../smokegen-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdebindings-smokekde/PKGBUILD b/staging/kdebindings-smokekde/PKGBUILD new file mode 100644 index 000000000..f25b76ba8 --- /dev/null +++ b/staging/kdebindings-smokekde/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143125 2011-11-23 07:43:59Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-smokekde +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Language independent library for KDE bindings" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdebindings-smokeqt') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' + 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') +conflicts=('kdebindings-smoke') +source=("http://download.kde.org/unstable/${pkgver}/src/smokekde-${pkgver}.tar.bz2") +sha1sums=('579e87eaf1067593d27396fe092434f7fc7b4c09') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../smokekde-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdebindings-smokeqt/PKGBUILD b/staging/kdebindings-smokeqt/PKGBUILD new file mode 100644 index 000000000..6e975e5ef --- /dev/null +++ b/staging/kdebindings-smokeqt/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143122 2011-11-23 07:42:21Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-smokeqt +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Language independent library for Qt bindings" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen') +makedepends=('cmake' 'automoc4') +conflicts=('kdebindings-smoke') +source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2") +sha1sums=('cad6c93aef4374012de9958d9ac38e3993a799b2') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../smokeqt-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Qwt5=OFF + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-analitza/PKGBUILD b/staging/kdeedu-analitza/PKGBUILD new file mode 100644 index 000000000..54d43bc62 --- /dev/null +++ b/staging/kdeedu-analitza/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 143138 2011-11-23 07:51:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-analitza +pkgver=4.7.80 +pkgrel=1 +pkgdesc="A library to add mathematical features to your program" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/unstable/${pkgver}/src/analitza-${pkgver}.tar.bz2") +sha1sums=('db2b8fd3f14f03c128255d078670c1273a3b6657') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../analitza-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-blinken/PKGBUILD b/staging/kdeedu-blinken/PKGBUILD new file mode 100644 index 000000000..8d609f7c6 --- /dev/null +++ b/staging/kdeedu-blinken/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143151 2011-11-23 07:59:44Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-blinken +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Memory Enhancement Game" +url="http://kde.org/applications/education/blinken/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/blinken-${pkgver}.tar.bz2") +sha1sums=('9215dc4d2b40b8f9173f95f06cf77c5099a733cb') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../blinken-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-blinken/kdeedu-blinken.install b/staging/kdeedu-blinken/kdeedu-blinken.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeedu-blinken/kdeedu-blinken.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/staging/kdeedu-cantor/PKGBUILD b/staging/kdeedu-cantor/PKGBUILD new file mode 100644 index 000000000..5882ed6a1 --- /dev/null +++ b/staging/kdeedu-cantor/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 143152 2011-11-23 08:00:09Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-cantor +pkgver=4.7.80 +pkgrel=1 +pkgdesc="KDE Frontend to Mathematical Software" +url="http://kde.org/applications/education/cantor/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libspectre' 'kdeedu-analitza') +makedepends=('cmake' 'automoc4' 'r') +optdepends=('maxima: Maxima backend' + 'octave: Octave backend' + 'r: R backend') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/cantor-${pkgver}.tar.bz2") +sha1sums=('7ea3094de5323b51f8f8aa1c559b1cbb8c5fbea4') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../cantor-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-cantor/kdeedu-cantor.install b/staging/kdeedu-cantor/kdeedu-cantor.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdeedu-cantor/kdeedu-cantor.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdeedu-kalgebra/PKGBUILD b/staging/kdeedu-kalgebra/PKGBUILD new file mode 100644 index 000000000..35417ff90 --- /dev/null +++ b/staging/kdeedu-kalgebra/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143153 2011-11-23 08:00:33Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kalgebra +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Graph Calculator" +url="http://kde.org/applications/education/kalgebra/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2") +sha1sums=('705bba4e1faf35b4d09d6ac487171cef9f54f642') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kalgebra-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-kalgebra/kdeedu-kalgebra.install b/staging/kdeedu-kalgebra/kdeedu-kalgebra.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdeedu-kalgebra/kdeedu-kalgebra.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdeedu-kalzium/PKGBUILD b/staging/kdeedu-kalzium/PKGBUILD new file mode 100644 index 000000000..279ebbb85 --- /dev/null +++ b/staging/kdeedu-kalzium/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143154 2011-11-23 08:00:57Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kalzium +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Periodic Table of Elements" +url="http://kde.org/applications/education/kalzium/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdelibs' 'avogadro' 'ocaml' 'facile') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kalzium-${pkgver}.tar.bz2") +sha1sums=('d6dbca03628ed96a256c3c603fae220a97d6fec3') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kalzium-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-kalzium/kdeedu-kalzium.install b/staging/kdeedu-kalzium/kdeedu-kalzium.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeedu-kalzium/kdeedu-kalzium.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/staging/kdeedu-kanagram/PKGBUILD b/staging/kdeedu-kanagram/PKGBUILD new file mode 100644 index 000000000..224d7bded --- /dev/null +++ b/staging/kdeedu-kanagram/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143155 2011-11-23 08:01:27Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kanagram +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Letter Order Game" +url="http://kde.org/applications/education/kanagram/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kanagram-${pkgver}.tar.bz2") +sha1sums=('eb7d0cf7eeae5ab5520cb67cf52b73f08ec6bd57') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kanagram-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-kanagram/kdeedu-kanagram.install b/staging/kdeedu-kanagram/kdeedu-kanagram.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeedu-kanagram/kdeedu-kanagram.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/staging/kdeedu-kbruch/PKGBUILD b/staging/kdeedu-kbruch/PKGBUILD new file mode 100644 index 000000000..adfd24036 --- /dev/null +++ b/staging/kdeedu-kbruch/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143156 2011-11-23 08:01:52Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kbruch +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Exercise Fractions" +url="http://kde.org/applications/education/kbruch/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kbruch-${pkgver}.tar.bz2") +sha1sums=('46d735c58ed5bf7a871d92633f1d42b418da7815') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kbruch-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-kbruch/kdeedu-kbruch.install b/staging/kdeedu-kbruch/kdeedu-kbruch.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeedu-kbruch/kdeedu-kbruch.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/staging/kdeedu-kgeography/PKGBUILD b/staging/kdeedu-kgeography/PKGBUILD new file mode 100644 index 000000000..3a793ba70 --- /dev/null +++ b/staging/kdeedu-kgeography/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143157 2011-11-23 08:02:17Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kgeography +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Geography Trainer" +url="http://kde.org/applications/education/kgeography/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kgeography-${pkgver}.tar.bz2") +sha1sums=('5b71a2f5a66b996cd6741422045d217e4dc275a1') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kgeography-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-kgeography/kdeedu-kgeography.install b/staging/kdeedu-kgeography/kdeedu-kgeography.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeedu-kgeography/kdeedu-kgeography.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/staging/kdeedu-khangman/PKGBUILD b/staging/kdeedu-khangman/PKGBUILD new file mode 100644 index 000000000..ce375afaa --- /dev/null +++ b/staging/kdeedu-khangman/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143158 2011-11-23 08:02:49Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-khangman +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Hangman Game" +url="http://kde.org/applications/education/khangman/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/khangman-${pkgver}.tar.bz2") +sha1sums=('3e4e14a145e35ec4a433f6db1bbbf4bc3804953c') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../khangman-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-khangman/kdeedu-khangman.install b/staging/kdeedu-khangman/kdeedu-khangman.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeedu-khangman/kdeedu-khangman.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/staging/kdeedu-kig/PKGBUILD b/staging/kdeedu-kig/PKGBUILD new file mode 100644 index 000000000..0b1806e14 --- /dev/null +++ b/staging/kdeedu-kig/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 143159 2011-11-23 08:03:13Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kig +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Interactive Geometry" +url="http://kde.org/applications/education/kig/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kig-${pkgver}.tar.bz2") +sha1sums=('9ac87b12dde1108782e5d4c332e550759ffd769d') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kig-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + # Use the python2 executable + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py +} diff --git a/staging/kdeedu-kig/kdeedu-kig.install b/staging/kdeedu-kig/kdeedu-kig.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdeedu-kig/kdeedu-kig.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdeedu-kiten/PKGBUILD b/staging/kdeedu-kiten/PKGBUILD new file mode 100644 index 000000000..569388b54 --- /dev/null +++ b/staging/kdeedu-kiten/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143160 2011-11-23 08:03:39Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kiten +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Japanese Reference/Study Tool" +url="http://kde.org/applications/education/kiten/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kiten-${pkgver}.tar.bz2") +sha1sums=('60fb150e05185990da7fadf2002390938e9fef9e') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kiten-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-kiten/kdeedu-kiten.install b/staging/kdeedu-kiten/kdeedu-kiten.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeedu-kiten/kdeedu-kiten.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/staging/kdeedu-klettres/PKGBUILD b/staging/kdeedu-klettres/PKGBUILD new file mode 100644 index 000000000..b7275f350 --- /dev/null +++ b/staging/kdeedu-klettres/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143161 2011-11-23 08:04:15Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-klettres +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Learn The Alphabet" +url="http://kde.org/applications/education/klettres/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/klettres-${pkgver}.tar.bz2") +sha1sums=('ef205da0317630d455d34c6f53f541b2a06038ea') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../klettres-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-klettres/kdeedu-klettres.install b/staging/kdeedu-klettres/kdeedu-klettres.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeedu-klettres/kdeedu-klettres.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/staging/kdeedu-kmplot/PKGBUILD b/staging/kdeedu-kmplot/PKGBUILD new file mode 100644 index 000000000..197f3ee0d --- /dev/null +++ b/staging/kdeedu-kmplot/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143162 2011-11-23 08:04:41Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kmplot +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Mathematical Function Plotter" +url="http://kde.org/applications/education/kmplot/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kmplot-${pkgver}.tar.bz2") +sha1sums=('7009619d0d11bd6be7acac095f386ff219ccd506') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kmplot-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-kmplot/kdeedu-kmplot.install b/staging/kdeedu-kmplot/kdeedu-kmplot.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdeedu-kmplot/kdeedu-kmplot.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdeedu-kstars/PKGBUILD b/staging/kdeedu-kstars/PKGBUILD new file mode 100644 index 000000000..88afb33d4 --- /dev/null +++ b/staging/kdeedu-kstars/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143163 2011-11-23 08:05:07Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kstars +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Desktop Planetarium" +url="http://kde.org/applications/education/kstars/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kstars-${pkgver}.tar.bz2") +sha1sums=('ac705e13f83db3017e5ad6a615c264be69259f21') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kstars-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Xplanet=OFF + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-kstars/kdeedu-kstars.install b/staging/kdeedu-kstars/kdeedu-kstars.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeedu-kstars/kdeedu-kstars.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/staging/kdeedu-ktouch/PKGBUILD b/staging/kdeedu-ktouch/PKGBUILD new file mode 100644 index 000000000..f769714b5 --- /dev/null +++ b/staging/kdeedu-ktouch/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143164 2011-11-23 08:05:52Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-ktouch +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Touch Typing Tutor" +url="http://kde.org/applications/education/ktouch/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/ktouch-${pkgver}.tar.bz2") +sha1sums=('ebba0f8d22ca06db2488d1059b41432fce6b7a67') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../ktouch-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-ktouch/kdeedu-ktouch.install b/staging/kdeedu-ktouch/kdeedu-ktouch.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeedu-ktouch/kdeedu-ktouch.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/staging/kdeedu-kturtle/PKGBUILD b/staging/kdeedu-kturtle/PKGBUILD new file mode 100644 index 000000000..ac8241e85 --- /dev/null +++ b/staging/kdeedu-kturtle/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143165 2011-11-23 08:06:46Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kturtle +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Educational Programming Environment" +url="http://kde.org/applications/education/kturtle/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kturtle-${pkgver}.tar.bz2") +sha1sums=('85e087446b2e6633658ad71e8d64c446a1029b6b') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kturtle-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-kturtle/kdeedu-kturtle.install b/staging/kdeedu-kturtle/kdeedu-kturtle.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeedu-kturtle/kdeedu-kturtle.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/staging/kdeedu-kwordquiz/PKGBUILD b/staging/kdeedu-kwordquiz/PKGBUILD new file mode 100644 index 000000000..72a12c686 --- /dev/null +++ b/staging/kdeedu-kwordquiz/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143166 2011-11-23 08:07:11Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kwordquiz +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Flash Card Trainer" +url="http://kde.org/applications/education/kwordquiz/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2") +sha1sums=('6bca16d9ad9d0df0517bec8b944f8e61c89f16c6') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kwordquiz-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install b/staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdeedu-marble/PKGBUILD b/staging/kdeedu-marble/PKGBUILD new file mode 100644 index 000000000..000d47715 --- /dev/null +++ b/staging/kdeedu-marble/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143134 2011-11-23 07:49:25Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-marble +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Desktop Globe" +url="http://kde.org/applications/education/marble/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4' 'gpsd') +optdepends=('gpsd: gps support') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/marble-${pkgver}.tar.bz2") +sha1sums=('e525f3bca3bef13a3506f5b295847e62fd69e4b2') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../marble-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-marble/kdeedu-marble.install b/staging/kdeedu-marble/kdeedu-marble.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdeedu-marble/kdeedu-marble.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdeedu-parley/PKGBUILD b/staging/kdeedu-parley/PKGBUILD new file mode 100644 index 000000000..3d443eff2 --- /dev/null +++ b/staging/kdeedu-parley/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143167 2011-11-23 08:07:54Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-parley +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Vocabulary Trainer" +url="http://kde.org/applications/education/parley/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/parley-${pkgver}.tar.bz2") +sha1sums=('be0824a60c1c33e19b1399d5995d7f9692a98a3f') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../parley-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-parley/kdeedu-parley.install b/staging/kdeedu-parley/kdeedu-parley.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdeedu-parley/kdeedu-parley.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdeedu-rocs/PKGBUILD b/staging/kdeedu-rocs/PKGBUILD new file mode 100644 index 000000000..4c6e07a86 --- /dev/null +++ b/staging/kdeedu-rocs/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143168 2011-11-23 08:08:27Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-rocs +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Rocs Graph Theory" +url="http://kde.org/applications/education/rocs/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'boost-libs') +makedepends=('cmake' 'automoc4' 'boost') +source=("http://download.kde.org/unstable/${pkgver}/src/rocs-${pkgver}.tar.bz2") +sha1sums=('dca8675203a9c9d9d384d0b236507cb3380cf75e') +options=('!makeflags') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../rocs-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-step/PKGBUILD b/staging/kdeedu-step/PKGBUILD new file mode 100644 index 000000000..7ba449f7f --- /dev/null +++ b/staging/kdeedu-step/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143169 2011-11-23 08:08:54Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-step +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Interactive Physical Simulator" +url="http://kde.org/applications/education/step/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/step-${pkgver}.tar.bz2") +sha1sums=('fd2f8f931d74c050feec57f6cf6a9e484dc59fd9') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../step-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu-step/kdeedu-step.install b/staging/kdeedu-step/kdeedu-step.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeedu-step/kdeedu-step.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/staging/kdegames/PKGBUILD b/staging/kdegames/PKGBUILD new file mode 100644 index 000000000..2b9b50d83 --- /dev/null +++ b/staging/kdegames/PKGBUILD @@ -0,0 +1,515 @@ +# $Id: PKGBUILD 143170 2011-11-23 08:10:35Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdegames +pkgname=('kdegames-bomber' + 'kdegames-bovo' + 'kdegames-granatier' + 'kdegames-kajongg' + 'kdegames-kapman' + 'kdegames-katomic' + 'kdegames-kbattleship' + 'kdegames-kblackbox' + 'kdegames-kblocks' + 'kdegames-kbounce' + 'kdegames-kbreakout' + 'kdegames-kdiamond' + 'kdegames-kfourinline' + 'kdegames-kgoldrunner' + 'kdegames-kigo' + 'kdegames-killbots' + 'kdegames-kiriki' + 'kdegames-kjumpingcube' + 'kdegames-klines' + 'kdegames-klickety' + 'kdegames-kmahjongg' + 'kdegames-kmines' + 'kdegames-knetwalk' + 'kdegames-kolf' + 'kdegames-kollision' + 'kdegames-konquest' + 'kdegames-kpatience' + 'kdegames-kreversi' + 'kdegames-kshisen' + 'kdegames-ksirk' + 'kdegames-kspaceduel' + 'kdegames-ksquares' + 'kdegames-ksudoku' + 'kdegames-ktron' + 'kdegames-ktuberling' + 'kdegames-kubrick' + 'kdegames-libkdegames' + 'kdegames-libkmahjongg' + 'kdegames-lskat' + 'kdegames-palapeli') +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegames') +makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python' + 'openal') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('11583e33d6a8ad6eb1a5f98d11338940083bfea4') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 + make +} + +package_kdegames-bomber() { + pkgdesc='Arcade Bombing Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/bomber/" + install='kdegames.install' + cd $srcdir/build/bomber + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/bomber + make DESTDIR=$pkgdir install +} + +package_kdegames-bovo() { + pkgdesc='Five-in-a-row Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/bovo/" + install='kdegames.install' + cd $srcdir/build/bovo + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/bovo + make DESTDIR=$pkgdir install +} + +package_kdegames-granatier() { + pkgdesc='Granatier' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal') + url="http://kde.org/applications/games/granatier/" + install='kdegames.install' + cd $srcdir/build/granatier + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/granatier + make DESTDIR=$pkgdir install +} + +package_kdegames-kajongg() { + pkgdesc='The ancient Chinese board game for 4 players' + depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted') + install='kdegames.install' + cd $srcdir/build/kajongg + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kajongg + make DESTDIR=$pkgdir install + + # Use the python2 executable + find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} + +package_kdegames-kapman() { + pkgdesc='Eat pills escaping ghosts' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kapman/" + install='kdegames.install' + cd $srcdir/build/kapman + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kapman + make DESTDIR=$pkgdir install +} + +package_kdegames-katomic() { + pkgdesc='Sokoban-like Logic Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/katomic/" + install='kdegames.install' + cd $srcdir/build/katomic + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/katomic + make DESTDIR=$pkgdir install +} + +package_kdegames-kbattleship() { + pkgdesc='Battleship Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') + url="http://kde.org/applications/games/kbattleship/" + install='kdegames-kbattleship.install' + cd $srcdir/build/kbattleship + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kbattleship + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/module.dsc \ + $pkgdir/usr/share/ggz/kbattleship.dsc +} + +package_kdegames-kblackbox() { + pkgdesc='Blackbox Logic Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kblackbox/" + install='kdegames.install' + cd $srcdir/build/kblackbox + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kblackbox + make DESTDIR=$pkgdir install +} + +package_kdegames-kblocks() { + pkgdesc='Falling Blocks Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kblocks/" + install='kdegames.install' + cd $srcdir/build/kblocks + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kblocks + make DESTDIR=$pkgdir install +} + +package_kdegames-kbounce() { + pkgdesc='Ball Bouncing Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kbounce/" + install='kdegames.install' + cd $srcdir/build/kbounce + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kbounce + make DESTDIR=$pkgdir install +} + +package_kdegames-kbreakout() { + pkgdesc='Breakout-like Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kbreakout/" + install='kdegames.install' + cd $srcdir/build/kbreakout + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kbreakout + make DESTDIR=$pkgdir install +} + +package_kdegames-kdiamond() { + pkgdesc='Three-in-a-row game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kdiamond/" + install='kdegames.install' + cd $srcdir/build/kdiamond + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kdiamond + make DESTDIR=$pkgdir install +} + +package_kdegames-kfourinline() { + pkgdesc='Four-in-a-row Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kfourinline/" + install='kdegames-kfourinline.install' + cd $srcdir/build/kfourinline + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kfourinline + make DESTDIR=$pkgdir install +} + +package_kdegames-kgoldrunner() { + pkgdesc='A game of action and puzzle-solving' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal') + url="http://kde.org/applications/games/kgoldrunner/" + install='kdegames.install' + cd $srcdir/build/kgoldrunner + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kgoldrunner + make DESTDIR=$pkgdir install +} + +package_kdegames-kigo() { + pkgdesc='Go Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo') + url="http://kde.org/applications/games/kigo/" + install='kdegames-kigo.install' + cd $srcdir/build/kigo + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kigo + make DESTDIR=$pkgdir install +} + +package_kdegames-killbots() { + pkgdesc='Killbots' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/killbots/" + install='kdegames.install' + cd $srcdir/build/killbots + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/killbots + make DESTDIR=$pkgdir install +} + +package_kdegames-kiriki() { + pkgdesc='Yahtzee-like Dice Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kiriki/" + install='kdegames.install' + cd $srcdir/build/kiriki + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kiriki + make DESTDIR=$pkgdir install +} + +package_kdegames-kjumpingcube() { + pkgdesc='Territory Capture Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kjumpingcube/" + install='kdegames.install' + cd $srcdir/build/kjumpingcube + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kjumpingcube + make DESTDIR=$pkgdir install +} + +package_kdegames-klickety() { + pkgdesc='Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + replaces=('kdegames-ksame') + conflicts=('kdegames-ksame') + url="http://kde.org/applications/games/ksame/" + install='kdegames.install' + cd $srcdir/build/klickety + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/klickety + make DESTDIR=$pkgdir install +} + +package_kdegames-klines() { + pkgdesc='Tactical Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/klines/" + install='kdegames.install' + cd $srcdir/build/klines + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/klines + make DESTDIR=$pkgdir install +} + +package_kdegames-kmahjongg() { + pkgdesc='Mahjongg Solitaire' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg') + url="http://kde.org/applications/games/kmahjongg/" + install='kdegames.install' + cd $srcdir/build/kmahjongg + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmahjongg + make DESTDIR=$pkgdir install +} + +package_kdegames-kmines() { + pkgdesc='Minesweeper-like Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kmines/" + install='kdegames.install' + cd $srcdir/build/kmines + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmines + make DESTDIR=$pkgdir install +} + +package_kdegames-knetwalk() { + pkgdesc='Network Construction Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/knetwalk/" + install='kdegames.install' + cd $srcdir/build/knetwalk + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/knetwalk + make DESTDIR=$pkgdir install +} + +package_kdegames-kolf() { + pkgdesc='Miniature Golf' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kolf/" + install='kdegames-kolf.install' + cd $srcdir/build/kolf + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kolf + make DESTDIR=$pkgdir install +} + +package_kdegames-kollision() { + pkgdesc='A simple ball dodging game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kollision/" + install='kdegames.install' + cd $srcdir/build/kollision + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kollision + make DESTDIR=$pkgdir install +} + +package_kdegames-konquest() { + pkgdesc='Galactic Strategy Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/konquest/" + install='kdegames.install' + cd $srcdir/build/konquest + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/konquest + make DESTDIR=$pkgdir install +} + +package_kdegames-kpatience() { + pkgdesc='Patience Card Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kpatience/" + install='kdegames-kpatience.install' + replaces=('kdegames-kpat') + cd $srcdir/build/kpat + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kpat + make DESTDIR=$pkgdir install +} + +package_kdegames-kreversi() { + pkgdesc='Reversi Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') + url="http://kde.org/applications/games/kreversi/" + install='kdegames-kreversi.install' + cd $srcdir/build/kreversi + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kreversi + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/kreversi/module.dsc \ + $pkgdir/usr/share/ggz/kreversi.dsc +} + +package_kdegames-kshisen() { + pkgdesc='Shisen-Sho Mahjongg-like Tile Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg') + url="http://kde.org/applications/games/kshisen/" + install='kdegames.install' + cd $srcdir/build/kshisen + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kshisen + make DESTDIR=$pkgdir install +} + +package_kdegames-ksirk() { + pkgdesc='World Domination Strategy Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ksirk/" + install='kdegames.install' + cd $srcdir/build/ksirk + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksirk + make DESTDIR=$pkgdir install +} + +package_kdegames-kspaceduel() { + pkgdesc='Space Arcade Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kspaceduel/" + install='kdegames-kspaceduel.install' + cd $srcdir/build/kspaceduel + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kspaceduel + make DESTDIR=$pkgdir install +} + +package_kdegames-ksquares() { + pkgdesc='Connect the dots to create squares' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') + url="http://kde.org/applications/games/ksquares/" + install='kdegames-ksquares.install' + cd $srcdir/build/ksquares + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksquares + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/ksquares/src/module.dsc \ + $pkgdir/usr/share/ggz/ksquares.dsc +} + +package_kdegames-ksudoku() { + pkgdesc='KSudoku, Sudoku game & more for KDE' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ksudoku/" + install='kdegames.install' + cd $srcdir/build/ksudoku + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksudoku + make DESTDIR=$pkgdir install +} + +package_kdegames-ktron() { + pkgdesc='Tron-like Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ktron/" + install='kdegames.install' + cd $srcdir/build/ktron + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ktron + make DESTDIR=$pkgdir install +} + +package_kdegames-ktuberling() { + pkgdesc='Picture Game for Children' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ktuberling/" + install='kdegames-ktuberling.install' + cd $srcdir/build/ktuberling + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ktuberling + make DESTDIR=$pkgdir install +} + +package_kdegames-kubrick() { + pkgdesc='A 3-D game based on Rubik´s Cube' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kubrick/" + install='kdegames.install' + cd $srcdir/build/kubrick + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kubrick + make DESTDIR=$pkgdir install +} + +package_kdegames-libkdegames() { + pkgdesc='KDE game library' + groups=() + depends=('kdelibs') + cd $srcdir/build/libkdegames + make DESTDIR=$pkgdir install + for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do + install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i) + done +} + +package_kdegames-libkmahjongg() { + pkgdesc='Library used for loading and rendering of Mahjongg tilesets' + groups=() + depends=('kdelibs') + cd $srcdir/build/libkmahjongg + make DESTDIR=$pkgdir install +} + +package_kdegames-lskat() { + pkgdesc='Card Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/lskat/" + install='kdegames-lskat.install' + cd $srcdir/build/lskat + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/lskat + make DESTDIR=$pkgdir install +} + +package_kdegames-palapeli() { + pkgdesc='Jigsaw puzzle game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/palapeli/" + install='kdegames-palapeli.install' + cd $srcdir/build/palapeli + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/palapeli + make DESTDIR=$pkgdir install +} diff --git a/staging/kdegames/kdegames-kbattleship.install b/staging/kdegames/kdegames-kbattleship.install new file mode 100644 index 000000000..ac4516ed0 --- /dev/null +++ b/staging/kdegames/kdegames-kbattleship.install @@ -0,0 +1,24 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q + ggz-config -i -f -m usr/share/ggz/kbattleship.dsc >& /dev/null +} + +pre_remove() { + if [ -f usr/share/ggz/kbattleship.dsc ]; then + ggz-config -r -m usr/share/ggz/kbattleship.dsc >& /dev/null + fi +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} diff --git a/staging/kdegames/kdegames-kfourinline.install b/staging/kdegames/kdegames-kfourinline.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/staging/kdegames/kdegames-kfourinline.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdegames/kdegames-kigo.install b/staging/kdegames/kdegames-kigo.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/staging/kdegames/kdegames-kigo.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdegames/kdegames-kolf.install b/staging/kdegames/kdegames-kolf.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/staging/kdegames/kdegames-kolf.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdegames/kdegames-kpatience.install b/staging/kdegames/kdegames-kpatience.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/staging/kdegames/kdegames-kpatience.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdegames/kdegames-kreversi.install b/staging/kdegames/kdegames-kreversi.install new file mode 100644 index 000000000..4623e6e49 --- /dev/null +++ b/staging/kdegames/kdegames-kreversi.install @@ -0,0 +1,22 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null +} + +pre_remove() { + if [ -f usr/share/ggz/kreversi.dsc ]; then + ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null + fi +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/staging/kdegames/kdegames-kspaceduel.install b/staging/kdegames/kdegames-kspaceduel.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/staging/kdegames/kdegames-kspaceduel.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdegames/kdegames-ksquares.install b/staging/kdegames/kdegames-ksquares.install new file mode 100644 index 000000000..5a619897d --- /dev/null +++ b/staging/kdegames/kdegames-ksquares.install @@ -0,0 +1,22 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null +} + +pre_remove() { + if [ -f usr/share/ggz/ksquares.dsc ]; then + ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null + fi +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/staging/kdegames/kdegames-ktuberling.install b/staging/kdegames/kdegames-ktuberling.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/staging/kdegames/kdegames-ktuberling.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdegames/kdegames-lskat.install b/staging/kdegames/kdegames-lskat.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/staging/kdegames/kdegames-lskat.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdegames/kdegames-palapeli.install b/staging/kdegames/kdegames-palapeli.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/staging/kdegames/kdegames-palapeli.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdegames/kdegames.install b/staging/kdegames/kdegames.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdegames/kdegames.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/staging/kdegraphics-gwenview/PKGBUILD b/staging/kdegraphics-gwenview/PKGBUILD new file mode 100644 index 000000000..96f1ee770 --- /dev/null +++ b/staging/kdegraphics-gwenview/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143171 2011-11-23 08:12:08Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-gwenview +pkgver=4.7.80 +pkgrel=1 +pkgdesc="A fast and easy to use image viewer for KDE" +url="http://kde.org/applications/graphics/gwenview/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-lib' 'libkipi') +makedepends=('cmake' 'automoc4') +optdepends=('kipi-plugins: extra plugins to share photos') +install=$pkgname.install +source=("http://download.kde.org/unstable/${pkgver}/src/gwenview-${pkgver}.tar.bz2") +sha1sums=('7d8a9a99f28b36e8acbd42815929e91c4b9f94eb') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../gwenview-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdegraphics-gwenview/kdegraphics-gwenview.install b/staging/kdegraphics-gwenview/kdegraphics-gwenview.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdegraphics-gwenview/kdegraphics-gwenview.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdegraphics-kamera/PKGBUILD b/staging/kdegraphics-kamera/PKGBUILD new file mode 100644 index 000000000..09442e19c --- /dev/null +++ b/staging/kdegraphics-kamera/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 143172 2011-11-23 08:12:38Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-kamera +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Configure Kamera" +url="http://kde.org/applications/graphics/kamera/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime' 'gphoto2') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/unstable/${pkgver}/src/kamera-${pkgver}.tar.bz2") +sha1sums=('10a794c4e8e3d26df808d6ea76c9231574f5635a') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kamera-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdegraphics-kcolorchooser/PKGBUILD b/staging/kdegraphics-kcolorchooser/PKGBUILD new file mode 100644 index 000000000..37bfa9159 --- /dev/null +++ b/staging/kdegraphics-kcolorchooser/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143173 2011-11-23 08:13:03Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-kcolorchooser +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Color Chooser" +url="http://kde.org/applications/graphics/kcolorchooser/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2") +sha1sums=('611ed0489f2b913d8bba4938bb250e5c93f7bc10') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kcolorchooser-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install b/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.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/staging/kdegraphics-kgamma/PKGBUILD b/staging/kdegraphics-kgamma/PKGBUILD new file mode 100644 index 000000000..b21cb895c --- /dev/null +++ b/staging/kdegraphics-kgamma/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143174 2011-11-23 08:13:30Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-kgamma +pkgver=4.7.80 +pkgrel=1 +pkgdesc="A monitor calibration tool" +url="http://kde.org/applications/graphics/kgamma/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +# note on libxxf86vm: +# not detected by namcap because libgl depends on it +# but nvidia providing libgl does not depend on libxxf86vm +depends=('kdebase-runtime' 'libxxf86vm') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/unstable/${pkgver}/src/kgamma-${pkgver}.tar.bz2") +sha1sums=('76ed0d777f6cde5c6c2facf39cebba4d3e60b8aa') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kgamma-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdegraphics-kolourpaint/PKGBUILD b/staging/kdegraphics-kolourpaint/PKGBUILD new file mode 100644 index 000000000..ab08d70b8 --- /dev/null +++ b/staging/kdegraphics-kolourpaint/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143175 2011-11-23 08:13:54Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-kolourpaint +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Paint Program" +url="http://kde.org/applications/graphics/kolourpaint/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime' 'qimageblitz') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2") +sha1sums=('7d2e2eee77fe9307eef18cb5accd476fbb55fa57') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kolourpaint-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install b/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdegraphics-kruler/PKGBUILD b/staging/kdegraphics-kruler/PKGBUILD new file mode 100644 index 000000000..8f0de7f2a --- /dev/null +++ b/staging/kdegraphics-kruler/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143176 2011-11-23 08:14:20Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-kruler +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Screen Ruler" +url="http://kde.org/applications/graphics/kruler/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kruler-${pkgver}.tar.bz2") +sha1sums=('efbd6ceef6645ab14eb0a6b4e142a1c6cbfaa47e') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kruler-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdegraphics-kruler/kdegraphics-kruler.install b/staging/kdegraphics-kruler/kdegraphics-kruler.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdegraphics-kruler/kdegraphics-kruler.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdegraphics-ksaneplugin/PKGBUILD b/staging/kdegraphics-ksaneplugin/PKGBUILD new file mode 100644 index 000000000..76c93ebc0 --- /dev/null +++ b/staging/kdegraphics-ksaneplugin/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143177 2011-11-23 08:14:53Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-ksaneplugin +pkgver=4.7.80 +pkgrel=1 +pkgdesc="A scan plugin that implements the scanning" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('libksane') +makedepends=('cmake' 'automoc4') +replaces=('kdegraphics-libs') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/unstable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2") +sha1sums=('57af20b3a7f6973e3a4e881522443ccf40f39e2e') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../ksaneplugin-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdegraphics-ksnapshot/PKGBUILD b/staging/kdegraphics-ksnapshot/PKGBUILD new file mode 100644 index 000000000..bdad60d25 --- /dev/null +++ b/staging/kdegraphics-ksnapshot/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143178 2011-11-23 08:15:27Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-ksnapshot +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Screen Capture Program" +url="http://kde.org/applications/graphics/ksnapshot/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdelibs' 'libkipi') +makedepends=('cmake' 'automoc4') +optdepends=('kipi-plugins') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2") +sha1sums=('5016877111e974fb745e33a36900fa2be4665279') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../ksnapshot-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install b/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdegraphics-mobipocket/PKGBUILD b/staging/kdegraphics-mobipocket/PKGBUILD new file mode 100644 index 000000000..5efeab8f6 --- /dev/null +++ b/staging/kdegraphics-mobipocket/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143179 2011-11-23 08:16:37Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-mobipocket +pkgver=4.7.80 +pkgrel=1 +pkgdesc="A collection of plugins to handle mobipocket files" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +replaces=('kdegraphics-libs') +conflicts=('kdegraphics-libs') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/mobipocket-${pkgver}.tar.bz2") +sha1sums=('1da0a6d283b0ee361afeb27b0e03901581b86e8a') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../mobipocket-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdegraphics-mobipocket/kdegraphics-mobipocket.install b/staging/kdegraphics-mobipocket/kdegraphics-mobipocket.install new file mode 100644 index 000000000..660593cf5 --- /dev/null +++ b/staging/kdegraphics-mobipocket/kdegraphics-mobipocket.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdegraphics-okular/PKGBUILD b/staging/kdegraphics-okular/PKGBUILD new file mode 100644 index 000000000..24a3fb805 --- /dev/null +++ b/staging/kdegraphics-okular/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 143123 2011-11-23 07:42:50Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-okular +pkgver=4.7.80 +pkgrel=1 +pkgdesc='Document Viewer' +arch=('i686' 'x86_64') +url="http://kde.org/applications/graphics/okular/" +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre' + 'ebook-tools' 'libspectre') +makedepends=('cmake' 'automoc4') +optdepends=('kdegraphics-mobipocket: mobipocket support') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/okular-${pkgver}.tar.bz2") +sha1sums=('971562ce741fc6d4afb6c80dc405984b77ef7bfa') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../okular-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdegraphics-okular/kdegraphics-okular.install b/staging/kdegraphics-okular/kdegraphics-okular.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdegraphics-okular/kdegraphics-okular.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdegraphics-strigi-analyzer/PKGBUILD b/staging/kdegraphics-strigi-analyzer/PKGBUILD new file mode 100644 index 000000000..1ec2c2124 --- /dev/null +++ b/staging/kdegraphics-strigi-analyzer/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143180 2011-11-23 08:17:04Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-strigi-analyzer +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Strigi analyzers for various graphics file formats" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +replaces=('kdegraphics-libs') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('3a7dbc47de312d08d804bbfa394bc9c2a454cd5c') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdegraphics-svgpart/PKGBUILD b/staging/kdegraphics-svgpart/PKGBUILD new file mode 100644 index 000000000..b8f76eb5d --- /dev/null +++ b/staging/kdegraphics-svgpart/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143181 2011-11-23 08:17:46Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-svgpart +pkgver=4.7.80 +pkgrel=1 +pkgdesc="A KPart for viewving SVGs" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +replaces=('kdegraphics-libs') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/unstable/${pkgver}/src/svgpart-${pkgver}.tar.bz2") +sha1sums=('41f05ccdb5a903fc2b91a685477271b3b4c8d72e') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../svgpart-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdegraphics-thumbnailers/PKGBUILD b/staging/kdegraphics-thumbnailers/PKGBUILD new file mode 100644 index 000000000..e2e8d031e --- /dev/null +++ b/staging/kdegraphics-thumbnailers/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143182 2011-11-23 08:18:13Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-thumbnailers +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Thumbnailers for various graphics file formats" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('libkexiv2' 'libkdcraw') +makedepends=('cmake' 'automoc4') +replaces=('kdegraphics-libs') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('b690cdf4175ea0ecefc5ae21c054d460e3ce508e') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdelibs/PKGBUILD b/staging/kdelibs/PKGBUILD new file mode 100644 index 000000000..5d2bcb38f --- /dev/null +++ b/staging/kdelibs/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 143206 2011-11-23 08:35:49Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdelibs +pkgver=4.7.80 +pkgrel=1 +pkgdesc="KDE Core Libraries" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee' + 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' + 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl' + 'phonon' 'upower' 'udisks' 'libxcursor') +makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell') +replaces=('kdelibs-experimental') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'kde-applications-menu.patch' 'archlinux-menu.patch') +sha1sums=('0dac96f3d7445bde8e2e7066986ca5656d441b02' + '86ee8c8660f19de8141ac99cd6943964d97a1ed7' + '63a850ab4196b9d06934f2b4a13acd9f7739bc67') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + # avoid file conflict with gnome-menus + patch -p1 -i "${srcdir}"/kde-applications-menu.patch + # add Archlinux menu entry + patch -p1 -i "${srcdir}"/archlinux-menu.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DKDE_DISTRIBUTION_TEXT='Arch Linux' \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \ + -DKDE_DEFAULT_HOME='.kde4' \ + -DWITH_FAM=OFF + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + # cert bundle seems to be hardcoded + # link it to the one from ca-certificates + rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt + ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt +} diff --git a/staging/kdelibs/archlinux-menu.patch b/staging/kdelibs/archlinux-menu.patch new file mode 100644 index 000000000..546784fa2 --- /dev/null +++ b/staging/kdelibs/archlinux-menu.patch @@ -0,0 +1,22 @@ +--- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000 ++++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000 +@@ -16,11 +16,19 @@ + </DefaultLayout> + <Layout> + <Merge type="menus"/> ++ <Menuname>Arch Linux</Menuname> + <Menuname>Applications</Menuname> + <Merge type="files"/> + </Layout> + + <Menu> ++ <Name>Arch Linux</Name> ++ <Directory>Archlinux.directory</Directory> ++ <Include> ++ <Category>Archlinux</Category> ++ </Include> ++ </Menu> ++ <Menu> + <Name>Applications</Name> + <Directory>kde-unknown.directory</Directory> + <OnlyUnallocated/> diff --git a/staging/kdelibs/kde-applications-menu.patch b/staging/kdelibs/kde-applications-menu.patch new file mode 100644 index 000000000..4b513298a --- /dev/null +++ b/staging/kdelibs/kde-applications-menu.patch @@ -0,0 +1,22 @@ +--- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000 ++++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000 +@@ -69,7 +69,7 @@ + if (WIN32) + install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus ) + else (WIN32) +-install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus ) ++install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu ) + endif (WIN32) + install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) + install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) +--- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000 ++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000 +@@ -302,7 +302,7 @@ + if (!m_trackId.isEmpty()) + g_vfolder->setTrackId(m_trackId); + +- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); ++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true); + + KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false); + entry->setLayoutInfo(kdeMenu->layoutList); diff --git a/staging/kdelibs/kdelibs.install b/staging/kdelibs/kdelibs.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/staging/kdelibs/kdelibs.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdemultimedia/PKGBUILD b/staging/kdemultimedia/PKGBUILD new file mode 100644 index 000000000..a55ae09ea --- /dev/null +++ b/staging/kdemultimedia/PKGBUILD @@ -0,0 +1,108 @@ +# $Id: PKGBUILD 143183 2011-11-23 08:18:49Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdemultimedia +pkgname=('kdemultimedia-dragonplayer' + 'kdemultimedia-ffmpegthumbs' + 'kdemultimedia-juk' + 'kdemultimedia-kioslave' + 'kdemultimedia-kmix' + 'kdemultimedia-kscd' + 'kdemultimedia-mplayerthumbs') +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdemultimedia') +makedepends=('cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer' + 'pulseaudio' 'libmusicbrainz3') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'mplayerthumbs.config') +sha1sums=('44b9adf781fcbebe1214fc87b006bf13ddd8b702' + 'ba016fa2563c14ffcba852c62506b66bfc6ee683') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdemultimedia-dragonplayer() { + pkgdesc='Video Player' + depends=('kdebase-runtime') + url="http://kde.org/applications/multimedia/dragonplayer/" + install='kdemultimedia-dragonplayer.install' + cd $srcdir/build/dragonplayer + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/dragonplayer + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-ffmpegthumbs() { + pkgdesc='Video Files (ffmpegthumbs)' + depends=('kdebase-runtime' 'ffmpeg') + install='kdemultimedia.install' + cd $srcdir/build/ffmpegthumbs + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-juk() { + pkgdesc='Music Player' + depends=('kdebase-runtime' 'tunepimp') + url="http://kde.org/applications/multimedia/juk" + install='kdemultimedia.install' + cd $srcdir/build/juk + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/juk + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-kioslave() { + pkgdesc='Audio CD Browser' + depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia') + conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') + replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') + for i in kioslave doc/kioslave libkcddb libkcompactdisc; do + cd $srcdir/build/${i} + make DESTDIR=$pkgdir install + done +} + +package_kdemultimedia-kmix() { + pkgdesc='Sound Mixer' + depends=('kdebase-runtime') + url="http://kde.org/applications/multimedia/kmix" + install='kdemultimedia.install' + cd $srcdir/build/kmix + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmix + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-kscd() { + pkgdesc='CD Player' + depends=('kdebase-runtime' 'libmusicbrainz3') + url="http://kde.org/applications/multimedia/kscd" + install='kdemultimedia.install' + cd $srcdir/build/kscd + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcontrol/cddbretrieval + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-mplayerthumbs() { + pkgdesc='Video Files (MPlayerThumbs)' + depends=('kdebase-runtime' 'mplayer') + replaces=('mplayerthumbs') + conflicts=('mplayerthumbs') + cd $srcdir/build/mplayerthumbs + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs +} diff --git a/staging/kdemultimedia/kdemultimedia-dragonplayer.install b/staging/kdemultimedia/kdemultimedia-dragonplayer.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/staging/kdemultimedia/kdemultimedia-dragonplayer.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdemultimedia/kdemultimedia.install b/staging/kdemultimedia/kdemultimedia.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdemultimedia/kdemultimedia.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/staging/kdemultimedia/mplayerthumbs.config b/staging/kdemultimedia/mplayerthumbs.config new file mode 100644 index 000000000..761a17953 --- /dev/null +++ b/staging/kdemultimedia/mplayerthumbs.config @@ -0,0 +1,2 @@ +[MPlayerThumbsCfg] +backend=0 diff --git a/staging/kdenetwork/PKGBUILD b/staging/kdenetwork/PKGBUILD new file mode 100644 index 000000000..457cbe3a3 --- /dev/null +++ b/staging/kdenetwork/PKGBUILD @@ -0,0 +1,110 @@ +# $Id: PKGBUILD 143184 2011-11-23 08:19:35Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdenetwork +pkgname=('kdenetwork-filesharing' + 'kdenetwork-kdnssd' + 'kdenetwork-kget' + 'kdenetwork-kopete' + 'kdenetwork-kppp' + 'kdenetwork-krdc' + 'kdenetwork-krfb') +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdenetwork') +makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' + 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' + 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' + 'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('3ea7ab56d36260db9deaef2585feee80311ccfdc') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \ + -DWITH_Xmms=OFF \ + -DWITH_LibMeanwhile=OFF + make +} + +package_kdenetwork-filesharing() { + pkgdesc='Konqueror properties dialog plugin to share a directory with the local network' + depends=('kdelibs' 'smbclient') + install='kdenetwork.install' + cd $srcdir/build/filesharing + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kdnssd() { + pkgdesc='Monitors the network for DNS-SD services' + depends=('kdelibs') + cd $srcdir/build/kdnssd + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kget() { + pkgdesc='Download Manager' + depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms') + url="http://kde.org/applications/internet/kget/" + install='kdenetwork-kget.install' + cd $srcdir/build/kget + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kget + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kopete() { + pkgdesc='Instant Messenger' + depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' + 'libidn' 'qimageblitz' 'libgadu' 'mediastreamer') + url="http://kde.org/applications/internet/kopete/" + install='kdenetwork-kopete.install' + cd $srcdir/build/kopete + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kopete + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kppp() { + pkgdesc='Internet Dial-Up Tool' + depends=('kdebase-runtime' 'ppp') + url="http://kde.org/applications/internet/kppp/" + install='kdenetwork-kppp.install' + cd $srcdir/build/kppp + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kppp + make DESTDIR=$pkgdir install +} + +package_kdenetwork-krdc() { + pkgdesc='Remote Desktop Client' + depends=('kdebase-runtime' 'libvncserver' 'rdesktop' 'telepathy-qt4') + optdepends=('kdebase-keditbookmarks: to edit bookmarks') + url="http://kde.org/applications/internet/krdc/" + cd $srcdir/build/krdc + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/krdc + make DESTDIR=$pkgdir install +} + +package_kdenetwork-krfb() { + pkgdesc='Desktop Sharing' + # note on libxdamage: + # not detected by namcap because libgl depends on it + # but nvidia providing libgl does not depend on libxdamage + depends=('kdebase-runtime' 'libvncserver' 'libxdamage') + cd $srcdir/build/krfb + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/krfb + make DESTDIR=$pkgdir install +} diff --git a/staging/kdenetwork/kdenetwork-kget.install b/staging/kdenetwork/kdenetwork-kget.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/staging/kdenetwork/kdenetwork-kget.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdenetwork/kdenetwork-kopete.install b/staging/kdenetwork/kdenetwork-kopete.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/staging/kdenetwork/kdenetwork-kopete.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdenetwork/kdenetwork-kppp.install b/staging/kdenetwork/kdenetwork-kppp.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/staging/kdenetwork/kdenetwork-kppp.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdenetwork/kdenetwork.install b/staging/kdenetwork/kdenetwork.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdenetwork/kdenetwork.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/staging/kdepim-runtime/PKGBUILD b/staging/kdepim-runtime/PKGBUILD new file mode 100644 index 000000000..3ddc0533d --- /dev/null +++ b/staging/kdepim-runtime/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143120 2011-11-23 07:41:20Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdepim-runtime +pkgver=4.7.80 +pkgrel=1 +pkgdesc='KDE PIM Runtime Environment' +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +depends=('kdepimlibs' 'kdebase-runtime') +makedepends=('cmake' 'automoc4' 'boost') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('54de62929a8293d7a514e505ce63a46c7514a9e6') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdepim-runtime/kdepim-runtime.install b/staging/kdepim-runtime/kdepim-runtime.install new file mode 100644 index 000000000..ce5c32e1b --- /dev/null +++ b/staging/kdepim-runtime/kdepim-runtime.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/staging/kdepim/PKGBUILD b/staging/kdepim/PKGBUILD new file mode 100644 index 000000000..7e8ece4bf --- /dev/null +++ b/staging/kdepim/PKGBUILD @@ -0,0 +1,253 @@ +# $Id: PKGBUILD 143186 2011-11-23 08:23:47Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdepim +pkgname=('kdepim-akonadiconsole' + 'kdepim-akregator' + 'kdepim-blogilo' + 'kdepim-console' + 'kdepim-kaddressbook' + 'kdepim-kalarm' + 'kdepim-kjots' + 'kdepim-kleopatra' + 'kdepim-kmail' + 'kdepim-knode' + 'kdepim-knotes' + 'kdepim-kontact' + 'kdepim-korganizer' + 'kdepim-kresources' + 'kdepim-ktimetracker' + 'kdepim-libkdepim' + 'kdepim-wizards') +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://pim.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdepim') +makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' + 'kde-agent') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('e1b6f42a864a9be2263a9ac2cd21367af39fd532') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DKDEPIM_BUILD_MOBILE=OFF + make +} + +package_kdepim-akonadiconsole() { + pkgdesc='Akonadi Management and Debugging Console' + depends=('kdepim-libkdepim') + url='http://pim.kde.org' + install='kdepim.install' + cd "${srcdir}"/build/akonadiconsole + make DESTDIR="${pkgdir}" install +} + +package_kdepim-akregator() { + pkgdesc='A Feed Reader for KDE' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/akregator/" + install='kdepim.install' + cd "${srcdir}"/build/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/akregator + make DESTDIR="${pkgdir}" install +} + +package_kdepim-blogilo() { + pkgdesc='A KDE Blogging Client' + depends=('kdepim-runtime') + url="http://kde.org/applications/internet/blogilo/" + replaces=('blogilo') + conflicts=('blogilo') + install='kdepim.install' + cd "${srcdir}"/build/blogilo + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/blogilo + make DESTDIR="${pkgdir}" install +} + +package_kdepim-console() { + pkgdesc='Command line tool for accessing calendar files' + depends=('kdepim-runtime') + url='http://pim.kde.org' + install='kdepim.install' + cd "${srcdir}"/build/console + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kaddressbook() { + pkgdesc='Contact Manager' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/kaddressbook/" + install='kdepim.install' + cd "${srcdir}"/build/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/plugins/kaddressbook + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kalarm() { + pkgdesc='Personal Alarm Scheduler' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kalarm/" + install='kdepim.install' + cd "${srcdir}"/build/kalarm + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kalarm + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kjots() { + pkgdesc='Note Taker' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kjots/" + install='kdepim.install' + cd "${srcdir}"/build/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kjots + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kleopatra() { + pkgdesc='Certificate Manager and Unified Crypto GUI' + depends=('kdepim-libkdepim') + install=kdepim-kleopatra.install + url="http://kde.org/applications/utilities/kleopatra/" + cd "${srcdir}"/build/kleopatra + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kleopatra + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kmail() { + pkgdesc='Mail Client' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/kmail/" + install='kdepim-kmail.install' + conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins') + replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins') + for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \ + mailfilteragent ontologies kontact/plugins/kmail; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-knode() { + pkgdesc='News Reader' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/knode/" + install='kdepim.install' + cd "${srcdir}"/build/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knode + make DESTDIR="${pkgdir}" install +} + +package_kdepim-knotes() { + pkgdesc='Popup Notes' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/knotes/" + install='kdepim.install' + cd "${srcdir}"/build/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knotes + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kontact() { + pkgdesc='Personal Information Manager' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/kontact/" + install='kdepim.install' + conflcits=('kdepim-kontactinterfaces') + replaces=('kdepim-kontactinterfaces') + for i in kontact/src doc/kontact \ + kontact/plugins/summary kontact/plugins/specialdates; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-korganizer() { + pkgdesc='Calendar and Scheduling Program' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/korganizer" + install='kdepim-korganizer.install' + cd "${srcdir}"/build/korganizer + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/korganizer + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/korganizer + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kresources() { + pkgdesc='KDE PIM resources' + depends=('kdepim-libkdepim') + url='http://pim.kde.org' + cd "${srcdir}"/build/kresources + make DESTDIR="${pkgdir}" install +} + +package_kdepim-ktimetracker() { + pkgdesc='Personal Time Tracker' + depends=('kdepim-kresources') + url="http://kde.org/applications/utilities/ktimetracker/" + install='kdepim.install' + cd "${srcdir}"/build/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/ktimetracker + make DESTDIR="${pkgdir}" install +} + +package_kdepim-libkdepim() { + pkgdesc='Library for KDE PIM' + groups=() + depends=('kde-agent' 'kdepim-runtime') + url='http://pim.kde.org' + conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' + 'kdepim-strigi-analyzer' 'kdepim-akonadi') + replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' + 'kdepim-strigi-analyzer' 'kdepim-akonadi') + for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \ + kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ + messagecomposer messagecore messagelist messageviewer icons \ + strigi-analyzer templateparser plugins/messageviewer \ + plugins/ktexteditor; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-wizards() { + pkgdesc='KDE Groupware Wizard' + depends=('kdepim-kresources') + url='http://pim.kde.org' + cd "${srcdir}"/build/wizards + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdepim/kdepim-kleopatra.install b/staging/kdepim/kdepim-kleopatra.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/staging/kdepim/kdepim-kleopatra.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdepim/kdepim-kmail.install b/staging/kdepim/kdepim-kmail.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/staging/kdepim/kdepim-kmail.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdepim/kdepim-korganizer.install b/staging/kdepim/kdepim-korganizer.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/staging/kdepim/kdepim-korganizer.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdepim/kdepim.install b/staging/kdepim/kdepim.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdepim/kdepim.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/staging/kdepimlibs/PKGBUILD b/staging/kdepimlibs/PKGBUILD new file mode 100644 index 000000000..fe1a9ff50 --- /dev/null +++ b/staging/kdepimlibs/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143117 2011-11-23 07:37:23Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdepimlibs +pkgver=4.7.80 +pkgrel=1 +pkgdesc="KDE PIM Libraries" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison') +makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap') +install='kdepimlibs.install' +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('8c32406b85cf9677b7bebeb61cf50621dd034787') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install +} diff --git a/staging/kdepimlibs/kdepimlibs.install b/staging/kdepimlibs/kdepimlibs.install new file mode 100644 index 000000000..99262607c --- /dev/null +++ b/staging/kdepimlibs/kdepimlibs.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/staging/kdeplasma-addons/PKGBUILD b/staging/kdeplasma-addons/PKGBUILD new file mode 100644 index 000000000..a5e0f0de0 --- /dev/null +++ b/staging/kdeplasma-addons/PKGBUILD @@ -0,0 +1,619 @@ +# $Id: PKGBUILD 143187 2011-11-23 08:25:50Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeplasma-addons +pkgname=('kdeplasma-addons-applets-bball' + 'kdeplasma-addons-applets-binary-clock' + 'kdeplasma-addons-applets-blackboard' + 'kdeplasma-addons-applets-bookmarks' + 'kdeplasma-addons-applets-bubblemon' + 'kdeplasma-addons-applets-calculator' + 'kdeplasma-addons-applets-charselect' + 'kdeplasma-addons-applets-comic' + 'kdeplasma-addons-applets-community' + 'kdeplasma-addons-applets-dict' + 'kdeplasma-addons-applets-eyes' + 'kdeplasma-addons-applets-fifteenpuzzle' + 'kdeplasma-addons-applets-filewatcher' + 'kdeplasma-addons-applets-frame' + 'kdeplasma-addons-applets-fuzzy-clock' + 'kdeplasma-addons-applets-icontasks' + 'kdeplasma-addons-applets-incomingmsg' + 'kdeplasma-addons-applets-kdeobservatory' + 'kdeplasma-addons-applets-kimpanel' + 'kdeplasma-addons-applets-knowledgebase' + 'kdeplasma-addons-applets-kolourpicker' + 'kdeplasma-addons-applets-konqprofiles' + 'kdeplasma-addons-applets-konsoleprofiles' + 'kdeplasma-addons-applets-lancelot' + 'kdeplasma-addons-applets-leavenote' + 'kdeplasma-addons-applets-life' + 'kdeplasma-addons-applets-luna' + 'kdeplasma-addons-applets-magnifique' + 'kdeplasma-addons-applets-mediaplayer' + 'kdeplasma-addons-applets-microblog' + 'kdeplasma-addons-applets-news' + 'kdeplasma-addons-applets-notes' + 'kdeplasma-addons-applets-nowplaying' + 'kdeplasma-addons-applets-paste' + 'kdeplasma-addons-applets-pastebin' + 'kdeplasma-addons-applets-plasmaboard' + 'kdeplasma-addons-applets-previewer' + 'kdeplasma-addons-applets-qalculate' + 'kdeplasma-addons-applets-rememberthemilk' + 'kdeplasma-addons-applets-rssnow' + 'kdeplasma-addons-applets-showdashboard' + 'kdeplasma-addons-applets-showdesktop' + 'kdeplasma-addons-applets-social-news' + 'kdeplasma-addons-applets-spellcheck' + 'kdeplasma-addons-applets-systemloadviewer' + 'kdeplasma-addons-applets-timer' + 'kdeplasma-addons-applets-unitconverter' + 'kdeplasma-addons-applets-weather' + 'kdeplasma-addons-applets-weatherstation' + 'kdeplasma-addons-applets-webslice' + 'kdeplasma-addons-containments' + 'kdeplasma-addons-libs' + 'kdeplasma-addons-runners-audioplayercontrol' + 'kdeplasma-addons-runners-browserhistory' + 'kdeplasma-addons-runners-characters' + 'kdeplasma-addons-runners-contacts' + 'kdeplasma-addons-runners-converter' + 'kdeplasma-addons-runners-datetime' + 'kdeplasma-addons-runners-events' + 'kdeplasma-addons-runners-katesessions' + 'kdeplasma-addons-runners-konquerorsessions' + 'kdeplasma-addons-runners-konsolesessions' + 'kdeplasma-addons-runners-kopete' + 'kdeplasma-addons-runners-mediawiki' + 'kdeplasma-addons-runners-spellchecker' + 'kdeplasma-addons-wallpapers-mandelbrot' + 'kdeplasma-addons-wallpapers-marble' + 'kdeplasma-addons-wallpapers-pattern' + 'kdeplasma-addons-wallpapers-potd' + 'kdeplasma-addons-wallpapers-virus' + 'kdeplasma-addons-wallpapers-weather') +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +groups=('kde' 'kdeplasma-addons') +makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' + 'scim' 'qwt' 'boost' 'libkexiv2') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('fd27a14fc2ad676a4d5ddf4cd8658d80fc7aa8e9') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdeplasma-addons-applets-bball() { + pkgdesc='A bouncy ball for plasma' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/bball + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-binary-clock() { + pkgdesc='Time displayed in binary format' + depends=('kdebase-workspace') + cd $srcdir/build/applets/binary-clock + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-blackboard() { + pkgdesc='Black Board' + depends=('kdebase-workspace') + cd $srcdir/build/applets/blackboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-bookmarks() { + pkgdesc='Quick Access to the Bookmarks' + depends=('kdebase-workspace') + cd $srcdir/build/applets/bookmarks + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-bubblemon() { + pkgdesc='A pretty bubble that monitors your system.' + depends=('kdebase-workspace') + cd $srcdir/build/applets/bubblemon + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-calculator() { + pkgdesc='Calculate simple sums' + depends=('kdebase-workspace') + cd $srcdir/build/applets/calculator + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-charselect() { + pkgdesc='View, select, and copy characters from a font collection' + depends=('kdebase-workspace') + cd $srcdir/build/applets/charselect + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-comic() { + pkgdesc='View comic strips from the Internet' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/comic + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-community() { + pkgdesc='Communicate using the Social Desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/community + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-dict() { + pkgdesc='Look up the meaning of words and their translation into different languages' + depends=('kdebase-workspace') + cd $srcdir/build/applets/dict + make DESTDIR=$pkgdir install + # FIXME + # /usr/share/icons/oxygen/scalable/apps/accessories-dictionary.svgz + rm -rf $pkgdir/usr/share/icons +} + +package_kdeplasma-addons-applets-eyes() { + pkgdesc='XEyes clone' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/eyes + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-fifteenpuzzle() { + pkgdesc='Put the pieces in order' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/fifteenPuzzle + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-filewatcher() { + pkgdesc='Watch for changes in specified files' + depends=('kdebase-workspace') + cd $srcdir/build/applets/fileWatcher + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-frame() { + pkgdesc='Display your favorite pictures' + depends=('kdebase-workspace' 'libkexiv2') + cd $srcdir/build/applets/frame + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-fuzzy-clock() { + pkgdesc='Time displayed in a less precise format' + depends=('kdebase-workspace') + cd $srcdir/build/applets/fuzzy-clock + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-icontasks() { + pkgdesc='Switch between running applications' + depends=('kdebase-workspace') + cd $srcdir/build/applets/icontasks + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-incomingmsg() { + pkgdesc='Notification of new messages' + depends=('kdebase-workspace') + cd $srcdir/build/applets/incomingmsg + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kdeobservatory() { + pkgdesc='Visualize the KDE ecosystem' + depends=('kdebase-workspace' 'kdeplasma-addons-libs' 'qwt') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/kdeobservatory + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kimpanel() { + pkgdesc='A generic input method panel for Oriental languages' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + optdepends=('scim: SCIM backend' + 'fcitx: FCITX backend') + cd $srcdir/build/applets/kimpanel + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-knowledgebase() { + pkgdesc='Opendesktop Knowledgebase' + depends=('kdebase-workspace') + cd $srcdir/build/applets/knowledgebase + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kolourpicker() { + pkgdesc='Pick a color from the desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/kolourpicker + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-konqprofiles() { + pkgdesc='List and launch Konqueror profiles' + depends=('kdebase-workspace') + cd $srcdir/build/applets/konqprofiles + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-konsoleprofiles() { + pkgdesc='List and launch Konsole profiles' + depends=('kdebase-workspace') + cd $srcdir/build/applets/konsoleprofiles + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-lancelot() { + pkgdesc='Launcher to start applications' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + replaces=('lancelot') + provides=('lancelot') + conflicts=('lancelot') + install='kdeplasma-addons-applets-lancelot.install' + cd $srcdir/build/applets/lancelot + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-leavenote() { + pkgdesc='Leave notes for users while they are away' + depends=('kdebase-workspace') + cd $srcdir/build/applets/leavenote + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-life() { + pkgdesc='Life' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/life + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-luna() { + pkgdesc='Display moon phases for your location' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/luna + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-magnifique() { + pkgdesc='A magnification glass for the Plasma desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/magnifique + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-mediaplayer() { + pkgdesc='Widget that can play video and sound' + depends=('kdebase-workspace') + cd $srcdir/build/applets/mediaplayer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-microblog() { + pkgdesc='Update and view your microblog status.' + depends=('kdebase-workspace' 'kdeplasma-addons-libs' 'qoauth' 'qca-ossl') + cd $srcdir/build/applets/microblog + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-news() { + pkgdesc='Show news from various sources' + depends=('kdebase-workspace') + cd $srcdir/build/applets/news + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-notes() { + pkgdesc='Desktop sticky notes' + depends=('kdebase-workspace') + cd $srcdir/build/applets/notes + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-nowplaying() { + pkgdesc='Displays currently playing audio' + depends=('kdebase-workspace') + cd $srcdir/build/applets/nowplaying + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-paste() { + pkgdesc='Paste text snippets' + depends=('kdebase-workspace') + cd $srcdir/build/applets/paste + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-pastebin() { + pkgdesc='Paste text/images to a remote server' + depends=('kdebase-workspace') + cd $srcdir/build/applets/pastebin + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-plasmaboard() { + pkgdesc='A virtual, on-screen keyboard' + depends=('kdebase-workspace') + cd $srcdir/build/applets/plasmaboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-previewer() { + pkgdesc='Preview This File' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/previewer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-qalculate() { + pkgdesc='A powerful mathematical equation solver' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/qalculate + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-rememberthemilk() { + pkgdesc='Remember The Milk Todo list applet' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/rememberthemilk + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-rssnow() { + pkgdesc='Show news from various sources' + depends=('kdebase-workspace') + cd $srcdir/build/applets/rssnow + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-showdashboard() { + pkgdesc='Show the Plasma widget dashboard above other windows' + depends=('kdebase-workspace') + cd $srcdir/build/applets/showdashboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-showdesktop() { + pkgdesc='Show the Plasma desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/showdesktop + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-social-news() { + pkgdesc='Stay informed with the Social Desktop' + replaces=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') + conflicts=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/social-news + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-spellcheck() { + pkgdesc='Fast spell checking' + depends=('kdebase-workspace') + cd $srcdir/build/applets/spellcheck + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-systemloadviewer() { + pkgdesc='Tiny CPU/RAM/Swap monitor' + depends=('kdebase-workspace') + cd $srcdir/build/applets/systemloadviewer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-timer() { + pkgdesc='Countdown over a specified time period' + depends=('kdebase-workspace') + cd $srcdir/build/applets/timer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-unitconverter() { + pkgdesc='Plasmoid for converting units' + depends=('kdebase-workspace') + cd $srcdir/build/applets/unitconverter + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-weather() { + pkgdesc='Displays Weather information' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/weather + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-weatherstation() { + pkgdesc='Weather reports with an LCD display style' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/weatherstation + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-webslice() { + pkgdesc='Show a part of a webpage' + depends=('kdebase-workspace') + cd $srcdir/build/applets/webslice + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-containments() { + pkgdesc='Activities types for Plasma shells' + depends=('kdebase-workspace') + cd $srcdir/build/containments + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-libs() { + pkgdesc='Plasma Addon Library' + depends=('kdebase-workspace') + groups=() + replaces=('kdeplasma-addons-dataengines') + provides=('kdeplasma-addons-dataengines') + conflicts=('kdeplasma-addons-dataengines') + cd $srcdir/build/libs + make DESTDIR=$pkgdir install + cd $srcdir/build/dataengines + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-audioplayercontrol() { + pkgdesc='Allows to control MPRIS audio players (it is able to search through Amarok´s collection, too)' + depends=('kdebase-workspace') + cd $srcdir/build/runners/audioplayercontrol + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-browserhistory() { + pkgdesc='Searches in Konqueror´s history' + depends=('kdebase-workspace') + cd $srcdir/build/runners/browserhistory + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-characters() { + pkgdesc='special Characters' + depends=('kdebase-workspace') + cd $srcdir/build/runners/characters + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-contacts() { + pkgdesc='Finds entries in your address book' + depends=('kdebase-workspace') + cd $srcdir/build/runners/contacts + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-converter() { + pkgdesc='Convert values to different units' + depends=('kdebase-workspace') + cd $srcdir/build/runners/converter + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-datetime() { + pkgdesc='The current date and time, locally or in any timezone' + depends=('kdebase-workspace') + cd $srcdir/build/runners/datetime + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-events() { + pkgdesc='Calendar Events runner' + depends=('kdebase-workspace') + cd $srcdir/build/runners/events + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-katesessions() { + pkgdesc='Matches Kate Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/katesessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-konquerorsessions() { + pkgdesc='Matches Konqueror Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/konquerorsessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-konsolesessions() { + pkgdesc='Matches Konsole Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/konsolesessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-kopete() { + pkgdesc='Kopete Contact runner' + depends=('kdebase-workspace') + cd $srcdir/build/runners/kopete + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-mediawiki() { + pkgdesc='Search on Wikitravel' + depends=('kdebase-workspace') + cd $srcdir/build/runners/mediawiki + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-spellchecker() { + pkgdesc='Check the spelling of a word' + depends=('kdebase-workspace') + cd $srcdir/build/runners/spellchecker + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-mandelbrot() { + pkgdesc='Mandelbrot' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/mandelbrot + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-marble() { + pkgdesc='Globe' + depends=('kdebase-workspace' 'kdeedu-marble') + cd $srcdir/build/wallpapers/marble + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-pattern() { + pkgdesc='Pattern' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/pattern + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-potd() { + pkgdesc='Picture of the Day' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/wallpapers/potd + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-virus() { + pkgdesc='Virus' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/virus + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-weather() { + pkgdesc='Weather' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/wallpapers/weather + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install b/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install new file mode 100644 index 000000000..ce5c32e1b --- /dev/null +++ b/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/staging/kdeplasma-addons/kdeplasma-addons-applets.install b/staging/kdeplasma-addons/kdeplasma-addons-applets.install new file mode 100644 index 000000000..c4ef46ba8 --- /dev/null +++ b/staging/kdeplasma-addons/kdeplasma-addons-applets.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/staging/kdesdk-kate/PKGBUILD b/staging/kdesdk-kate/PKGBUILD new file mode 100644 index 000000000..77d951d09 --- /dev/null +++ b/staging/kdesdk-kate/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 143124 2011-11-23 07:43:27Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgbase=kdesdk-kate +pkgname=('kdebase-kwrite' + 'kdesdk-kate') +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +makedepends=('kdelibs ''cmake' 'automoc4') +source=("http://download.kde.org/unstable/${pkgver}/src/kate-${pkgver}.tar.bz2" + 'pkgbuild-syntax-highlight.patch') +sha1sums=('6c243a3fc1f114b8c1d9a6d644ec61e3ebf332e8' + '0a928253bd2077f0264d96a6c8823c69c47b6a8d') + +build() { + cd "${srcdir}"/kate-${pkgver} + patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../kate-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_KTEXTEDITOR=OFF + make +} + +package_kdebase-kwrite() { + pkgdesc="Text Editor" + depends=('kdebase-runtime') + groups=('kde' 'kdebase') + install='kdebase-kwrite.install' + + cd "${srcdir}"/build/kwrite + make DESTDIR="${pkgdir}" install + + cd "${srcdir}"/build/part + make DESTDIR="${pkgdir}" install + + cd "${srcdir}"/build/doc/kwrite + make DESTDIR="${pkgdir}" install +} + +package_kdesdk-kate() { + pkgdesc="Advanced Text Editor" + depends=('kdebase-kwrite') + groups=('kde' 'kdesdk') + install='kdesdk-kate.install' + + cd "${srcdir}"/build/kate + make DESTDIR="${pkgdir}" install + + cd "${srcdir}"/build/doc/kate + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdesdk-kate/kdebase-kwrite.install b/staging/kdesdk-kate/kdebase-kwrite.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdesdk-kate/kdebase-kwrite.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdesdk-kate/kdesdk-kate.install b/staging/kdesdk-kate/kdesdk-kate.install new file mode 100644 index 000000000..a9c01ef06 --- /dev/null +++ b/staging/kdesdk-kate/kdesdk-kate.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q + update-mime-database usr/share/mime +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdesdk-kate/pkgbuild-syntax-highlight.patch b/staging/kdesdk-kate/pkgbuild-syntax-highlight.patch new file mode 100644 index 000000000..27729d1ad --- /dev/null +++ b/staging/kdesdk-kate/pkgbuild-syntax-highlight.patch @@ -0,0 +1,11 @@ +--- kate-4.7.80/part/syntax/data/bash.xml~ 2011-11-20 06:14:30.581097154 +0000 ++++ kate-4.7.80/part/syntax/data/bash.xml 2011-11-20 06:14:45.494553146 +0000 +@@ -8,7 +8,7 @@ + <!ENTITY noword "(?![\w$+-])"> <!-- no word, $, + or - following --> + <!ENTITY pathpart "([\w_@.%*?+-]|\\ )"> <!-- valid character in a file name --> + ]> +-<language name="Bash" version="2.14" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> ++<language name="Bash" version="2.14" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> + + <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl) + Changes by Matthew Woehlke (mw_triad@users.sourceforge.net) diff --git a/staging/kdesdk/PKGBUILD b/staging/kdesdk/PKGBUILD new file mode 100644 index 000000000..dad54dc7c --- /dev/null +++ b/staging/kdesdk/PKGBUILD @@ -0,0 +1,258 @@ +# $Id: PKGBUILD 143188 2011-11-23 08:27:15Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdesdk +pkgname=('kdesdk-cervisia' + 'kdesdk-dolphin-plugins' + 'kdesdk-kapptemplate' + 'kdesdk-kcachegrind' + 'kdesdk-kdeaccounts-plugin' + 'kdesdk-kdepalettes' + 'kdesdk-kioslave' + 'kdesdk-kmtrace' + 'kdesdk-kompare' + 'kdesdk-kpartloader' + 'kdesdk-kprofilemethod' + 'kdesdk-kstartperf' + 'kdesdk-kuiviewer' + 'kdesdk-lokalize' + 'kdesdk-okteta' + 'kdesdk-poxml' + 'kdesdk-scripts' + 'kdesdk-strigi-analyzer' + 'kdesdk-umbrello') +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdesdk') +makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' + 'kdebase-lib') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'fix-python2-path.patch') +sha1sums=('725ca18c5bbf16061911bde15d98cb0e86db4471' + '923cabd7a877cf9a68efeb24fbf3d5827e1d949e') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + + # Fix hardcoded python2 cmd + patch -Np1 -i ${srcdir}/fix-python2-path.patch + + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdesdk-cervisia() { + pkgdesc='CVS Frontend' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/cervisia/" + install='kdesdk-cervisia.install' + cd $srcdir/build/cervisia + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/cervisia + make DESTDIR=$pkgdir install +} + +package_kdesdk-dolphin-plugins() { + pkgdesc='Extra Dolphin plugins' + depends=('kdebase-dolphin' 'subversion' 'git' 'kdesdk-kompare') + install='kdesdk.install' + cd $srcdir/build/dolphin-plugins/git + make DESTDIR=$pkgdir install + cd $srcdir/build/dolphin-plugins/svn + make DESTDIR=$pkgdir install +} + +package_kdesdk-kapptemplate() { + pkgdesc='KDE Template Generator' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/kapptemplate/" + install='kdesdk.install' + cd $srcdir/build/kapptemplate + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kapptemplate + make DESTDIR=$pkgdir install +} + +package_kdesdk-kcachegrind() { + pkgdesc='Visualization of Performance Profiling Data' + depends=('kdebase-runtime' 'python2') + optdepends=('php: PHP support') + url="http://kde.org/applications/development/kcachegrind/" + install='kdesdk-kcachegrind.install' + cd $srcdir/build/kcachegrind + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcachegrind + make DESTDIR=$pkgdir install + + # Fix python 2 path + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + "${pkgdir}"/usr/bin/hotshot2calltree +} + +package_kdesdk-kdeaccounts-plugin() { + pkgdesc='KDE Repository Accounts' + depends=('kdepim-runtime') + cd $srcdir/build/kdeaccounts-plugin + make DESTDIR=$pkgdir install +} + +package_kdesdk-kdepalettes() { + pkgdesc='Palettes for the Gimp that match the KDE standard color palette' + optdepends=('gimp') + install -D -m644 $srcdir/${pkgbase}-${pkgver}/kdepalettes/KDE_Gimp \ + $pkgdir/usr/share/gimp/2.0/palettes/KDE.gpl +} + +package_kdesdk-kioslave() { + pkgdesc='KDED Subversion Module' + depends=('kdebase-runtime' 'subversion') + install='kdesdk.install' + cd $srcdir/build/kioslave + make DESTDIR=$pkgdir install +} + +package_kdesdk-kmtrace() { + pkgdesc='A KDE tool to assist with malloc debugging using glibc´s "mtrace" functionality' + depends=('kdebase-runtime') + cd $srcdir/build/kmtrace + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmtrace + make DESTDIR=$pkgdir install +} + +package_kdesdk-kompare() { + pkgdesc='Diff/Patch Frontend' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/kompare/" + install='kdesdk.install' + cd $srcdir/build/kompare + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kompare + make DESTDIR=$pkgdir install +} + +package_kdesdk-kpartloader() { + pkgdesc='A test application for KParts' + depends=('kdebase-runtime') + install='kdesdk.install' + cd $srcdir/build/kpartloader + make DESTDIR=$pkgdir install +} + +package_kdesdk-kprofilemethod() { + pkgdesc='Macros helping to profile' + cd $srcdir/build/kprofilemethod + make DESTDIR=$pkgdir install +} + +package_kdesdk-kspy() { + pkgdesc='An Object Inspector for Qt/KDE applications' + depends=('kdebase-runtime') + cd $srcdir/build/kspy + make DESTDIR=$pkgdir install +} + +package_kdesdk-kstartperf() { + pkgdesc='Startup time measurement tool for KDE applications' + depends=('kdebase-runtime') + cd $srcdir/build/kstartperf + make DESTDIR=$pkgdir install +} + +package_kdesdk-kuiviewer() { + pkgdesc='Qt Designer UI File Viewer' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/kuiviewer/" + install='kdesdk-kuiviewer.install' + cd $srcdir/build/kuiviewer + make DESTDIR=$pkgdir install +} + +package_kdesdk-lokalize() { + pkgdesc='Computer-Aided Translation System' + depends=('kdebase-runtime' 'kdebindings-python') + url="http://kde.org/applications/development/lokalize/" + optdepends=('translate-toolkit: enable extra python script') + install='kdesdk-lokalize.install' + cd $srcdir/build/lokalize + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/lokalize + make DESTDIR=$pkgdir install + + # Fix python 2 path + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + "${pkgdir}"/usr/share/apps/lokalize/scripts/odf/xliffmerge.py +} + +package_kdesdk-okteta() { + pkgdesc='Hex Editor' + depends=('kdebase-runtime') + replaces=('kdeutils-okteta') + conflicts=('kdeutils-okteta') + url="http://kde.org/applications/utilities/okteta" + install='kdesdk-okteta.install' + cd $srcdir/build/okteta + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/okteta + make DESTDIR=$pkgdir install +} + +package_kdesdk-poxml() { + pkgdesc='Translates DocBook XML files using gettext po files' + depends=('qt' 'antlr2') + cd $srcdir/build/poxml + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/poxml + make DESTDIR=$pkgdir install +} + +package_kdesdk-scheck() { + pkgdesc='An interface style to highlight accel and style guide conflicts' + depends=('kdebase-runtime') + cd $srcdir/build/scheck + make DESTDIR=$pkgdir install +} + +package_kdesdk-scripts() { + pkgdesc='KDE SDK scripts' + depends=('python2') + cd $srcdir/build/scripts + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/scripts + make DESTDIR=$pkgdir install + + # Fix python 2 path + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + "${pkgdir}"/usr/bin/{{kde-systemsettings-tree,kdelnk2desktop,zonetab2pot}.py,kde_generate_export_header} +} + +package_kdesdk-strigi-analyzer() { + pkgdesc='Strigi-Analyzer for KDE SDK' + depends=('kdelibs') + cd $srcdir/build/strigi-analyzer + make DESTDIR=$pkgdir install +} + +package_kdesdk-umbrello() { + pkgdesc='UML Modeller' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/umbrello/" + install='kdesdk-umbrello.install' + cd $srcdir/build/umbrello + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/umbrello + make DESTDIR=$pkgdir install + + # Fix python 2 path + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + "${pkgdir}"/usr/share/apps/umbrello/headings/heading.py +} diff --git a/staging/kdesdk/fix-python2-path.patch b/staging/kdesdk/fix-python2-path.patch new file mode 100644 index 000000000..720487031 --- /dev/null +++ b/staging/kdesdk/fix-python2-path.patch @@ -0,0 +1,32 @@ +--- kdesdk-4.5.80/lokalize/scripts/msgmerge.py~ 2010-11-24 11:22:42.120000002 +0100 ++++ kdesdk-4.5.80/lokalize/scripts/msgmerge.py 2010-11-24 11:22:42.146666670 +0100 +@@ -114,7 +114,7 @@ + print >>sys.stderr, "Execution failed:", e + + cmd='%s/odf/xliffmerge.py -i %s -t %s -o %s' % (ourPath,xliffpathname,xlifftemplatepathname,xliffpathname) +- if os.name!='nt': cmd='python '+cmd ++ if os.name!='nt': cmd='python2 '+cmd + else: cmd=cmd.replace('/','\\') + os.system(cmd) + +--- kdesdk-4.5.80/lokalize/scripts/xliff2odf.py~ 2010-11-24 11:24:10.853333336 +0100 ++++ kdesdk-4.5.80/lokalize/scripts/xliff2odf.py 2010-11-24 11:24:10.883333336 +0100 +@@ -42,7 +42,7 @@ + xliff2odf.convertxliff(xliffinput, translatedodfpathname, odf) + + ourpath=([p for p in sys.path if os.path.exists(p+'/xliff2odf.py')]+[''])[0] +- os.system('python "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId())) ++ os.system('python2 "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId())) + + try: convert() + except: print 'error occured' +--- kdesdk-4.5.80/scripts/svn2log.sh~ 2010-11-24 11:46:24.863333337 +0100 ++++ kdesdk-4.5.80/scripts/svn2log.sh 2010-11-24 11:46:24.896666669 +0100 +@@ -17,6 +17,6 @@ + svn cat svn://anonsvn.kde.org/home/kde/trunk/kde-common/accounts > /tmp/accounts.$PPID + + echo "Creating changelog..."; +-svn log -v --xml $1 | python $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8 ++svn log -v --xml $1 | python2 $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8 + + rm /tmp/accounts.$PPID
\ No newline at end of file diff --git a/staging/kdesdk/kdesdk-cervisia.install b/staging/kdesdk/kdesdk-cervisia.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/staging/kdesdk/kdesdk-cervisia.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdesdk/kdesdk-kcachegrind.install b/staging/kdesdk/kdesdk-kcachegrind.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/staging/kdesdk/kdesdk-kcachegrind.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdesdk/kdesdk-kompare.install b/staging/kdesdk/kdesdk-kompare.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/staging/kdesdk/kdesdk-kompare.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdesdk/kdesdk-kuiviewer.install b/staging/kdesdk/kdesdk-kuiviewer.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/staging/kdesdk/kdesdk-kuiviewer.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdesdk/kdesdk-lokalize.install b/staging/kdesdk/kdesdk-lokalize.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/staging/kdesdk/kdesdk-lokalize.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdesdk/kdesdk-okteta.install b/staging/kdesdk/kdesdk-okteta.install new file mode 100644 index 000000000..3f06b8deb --- /dev/null +++ b/staging/kdesdk/kdesdk-okteta.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdesdk/kdesdk-umbrello.install b/staging/kdesdk/kdesdk-umbrello.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/staging/kdesdk/kdesdk-umbrello.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdesdk/kdesdk.install b/staging/kdesdk/kdesdk.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdesdk/kdesdk.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/staging/kdetoys/PKGBUILD b/staging/kdetoys/PKGBUILD new file mode 100644 index 000000000..9d27348bf --- /dev/null +++ b/staging/kdetoys/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 143189 2011-11-23 08:27:47Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdetoys +pkgname=('kdetoys-amor' + 'kdetoys-kteatime' + 'kdetoys-ktux') +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdetoys') +makedepends=('cmake' 'automoc4' 'kdebase-workspace') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('5462cdc809f22fcc2837844fb7b5fad0b5f716c5') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdetoys-amor() { + pkgdesc='On-Screen Creature' + depends=('kdebase-runtime') + install='kdetoys.install' + cd $srcdir/build/amor + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/amor + make DESTDIR=$pkgdir install +} + +package_kdetoys-kteatime() { + pkgdesc='Tea Cooker' + depends=('kdebase-runtime') + install='kdetoys.install' + cd $srcdir/build/kteatime + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kteatime + make DESTDIR=$pkgdir install +} + +package_kdetoys-ktux() { + pkgdesc='KTux' + depends=('kdebase-workspace' ) + install='kdetoys.install' + cd $srcdir/build/ktux + make DESTDIR=$pkgdir install +} diff --git a/staging/kdetoys/kdetoys.install b/staging/kdetoys/kdetoys.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdetoys/kdetoys.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/staging/kdeutils-filelight/PKGBUILD b/staging/kdeutils-filelight/PKGBUILD new file mode 100644 index 000000000..1d659d51b --- /dev/null +++ b/staging/kdeutils-filelight/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 143191 2011-11-23 08:28:35Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeutils-filelight +pkgver=4.7.80 +pkgrel=1 +pkgdesc='View disk usage information' +url='http://kde.org/applications/utilities/filelight' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +groups=('kde' 'kdeutils') +replaces=('filelight') +conflicts=('filelight') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/filelight-${pkgver}.tar.bz2") +sha1sums=('e77283760f0a787e7090dbd121e133036e5e57de') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../filelight-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeutils-filelight/kdeutils-filelight.install b/staging/kdeutils-filelight/kdeutils-filelight.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdeutils-filelight/kdeutils-filelight.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdeutils-kcalc/PKGBUILD b/staging/kdeutils-kcalc/PKGBUILD new file mode 100644 index 000000000..90d872304 --- /dev/null +++ b/staging/kdeutils-kcalc/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143192 2011-11-23 08:28:59Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeutils-kcalc +pkgver=4.7.80 +pkgrel=1 +pkgdesc='Scientific Calculator' +url='http://kde.org/applications/utilities/kcalc' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +groups=('kde' 'kdeutils') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kcalc-${pkgver}.tar.bz2") +sha1sums=('0fce57dbbd39028bb3b5749959368c35d8aa0442') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kcalc-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeutils-kcalc/kdeutils-kcalc.install b/staging/kdeutils-kcalc/kdeutils-kcalc.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeutils-kcalc/kdeutils-kcalc.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/staging/kdeutils-kcharselect/PKGBUILD b/staging/kdeutils-kcharselect/PKGBUILD new file mode 100644 index 000000000..f0c404273 --- /dev/null +++ b/staging/kdeutils-kcharselect/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143193 2011-11-23 08:29:26Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeutils-kcharselect +pkgver=4.7.80 +pkgrel=1 +pkgdesc='Character Selector' +url="http://kde.org/applications/utilities/kcharselect/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +groups=('kde' 'kdeutils') +source=("http://download.kde.org/unstable/${pkgver}/src/kcharselect-${pkgver}.tar.bz2") +sha1sums=('d5938cdba2aa32970fa7211827c1ee0e614f4acf') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kcharselect-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeutils-kdf/PKGBUILD b/staging/kdeutils-kdf/PKGBUILD new file mode 100644 index 000000000..9639ba62d --- /dev/null +++ b/staging/kdeutils-kdf/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143194 2011-11-23 08:29:52Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeutils-kdf +pkgver=4.7.80 +pkgrel=1 +url="http://kde.org/applications/system/kdiskfree/" +arch=('i686' 'x86_64') +pkgdesc='View Disk Usage' +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +groups=('kde' 'kdeutils') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kdf-${pkgver}.tar.bz2") +sha1sums=('22f42048664ab76cb7a5357c4ce18e3ac9321120') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kdf-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeutils-kdf/kdeutils-kdf.install b/staging/kdeutils-kdf/kdeutils-kdf.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeutils-kdf/kdeutils-kdf.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/staging/kdeutils-kfloppy/PKGBUILD b/staging/kdeutils-kfloppy/PKGBUILD new file mode 100644 index 000000000..99eeffae2 --- /dev/null +++ b/staging/kdeutils-kfloppy/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143195 2011-11-23 08:30:17Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeutils-kfloppy +pkgver=4.7.80 +pkgrel=1 +pkgdesc='Floppy Formatter' +url='http://kde.org/applications/utilities/kfloppy' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +groups=('kde' 'kdeutils') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kfloppy-${pkgver}.tar.bz2") +sha1sums=('c7669a2c35fff0a403ecf8df23e0da03238dc6ae') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kfloppy-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeutils-kfloppy/kdeutils-kfloppy.install b/staging/kdeutils-kfloppy/kdeutils-kfloppy.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdeutils-kfloppy/kdeutils-kfloppy.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdeutils-kgpg/PKGBUILD b/staging/kdeutils-kgpg/PKGBUILD new file mode 100644 index 000000000..d3c7ca522 --- /dev/null +++ b/staging/kdeutils-kgpg/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143196 2011-11-23 08:30:45Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeutils-kgpg +pkgver=4.7.80 +pkgrel=1 +pkgdesc='A GnuPG frontend' +url='http://kde.org/applications/utilities/kgpg' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdepim-runtime' 'kde-agent') +makedepends=('cmake' 'automoc4') +groups=('kde' 'kdeutils') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kgpg-${pkgver}.tar.bz2") +sha1sums=('ee2143a2c5ecc04608e7b037a364b2f360d06574') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kgpg-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeutils-kgpg/kdeutils-kgpg.install b/staging/kdeutils-kgpg/kdeutils-kgpg.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdeutils-kgpg/kdeutils-kgpg.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdeutils-kremotecontrol/PKGBUILD b/staging/kdeutils-kremotecontrol/PKGBUILD new file mode 100644 index 000000000..51c1c9397 --- /dev/null +++ b/staging/kdeutils-kremotecontrol/PKGBUILD @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeutils-kremotecontrol +pkgver=4.7.80 +pkgrel=1 +pkgdesc='Configure your remote controls for use with applications' +url='http://kde.org/applications/utilities/kremotecontrol' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-workspace') +makedepends=('cmake' 'automoc4') +groups=('kde' 'kdeutils') +replaces=('kdeutils-kdelirc') +conflicts=('kdeutils-kdelirc') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kremotecontrol-${pkgver}.tar.bz2") +sha1sums=('fae17c72a67fbcd3333815838ff1d934a3fc7c53') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kremotecontrol-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install b/staging/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeutils-kremotecontrol/kdeutils-kremotecontrol.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/staging/kdeutils-ktimer/PKGBUILD b/staging/kdeutils-ktimer/PKGBUILD new file mode 100644 index 000000000..63417f142 --- /dev/null +++ b/staging/kdeutils-ktimer/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143198 2011-11-23 08:31:50Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeutils-ktimer +pkgver=4.7.80 +pkgrel=1 +pkgdesc='Countdown Launcher' +url='http://kde.org/applications/utilities/ktimer/' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +groups=('kde' 'kdeutils') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/ktimer-${pkgver}.tar.bz2") +sha1sums=('763c0116dc99f3c428fa1f48721b9dd37a9b53e1') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../ktimer-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeutils-ktimer/kdeutils-ktimer.install b/staging/kdeutils-ktimer/kdeutils-ktimer.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeutils-ktimer/kdeutils-ktimer.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/staging/kdeutils-kwallet/PKGBUILD b/staging/kdeutils-kwallet/PKGBUILD new file mode 100644 index 000000000..f72b82c50 --- /dev/null +++ b/staging/kdeutils-kwallet/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143199 2011-11-23 08:32:15Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeutils-kwallet +pkgver=4.7.80 +pkgrel=1 +pkgdesc='Wallet Management Tool' +url='http://kde.org/applications/system/kwalletmanager/' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +groups=('kde' 'kdeutils') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kwallet-${pkgver}.tar.bz2") +sha1sums=('ba1fc1e070c8d84af6d8a3e58452854f4b504214') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kwallet-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeutils-kwallet/kdeutils-kwallet.install b/staging/kdeutils-kwallet/kdeutils-kwallet.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/staging/kdeutils-kwallet/kdeutils-kwallet.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdeutils-printer-applet/PKGBUILD b/staging/kdeutils-printer-applet/PKGBUILD new file mode 100644 index 000000000..466efccb2 --- /dev/null +++ b/staging/kdeutils-printer-applet/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 143200 2011-11-23 08:32:41Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeutils-printer-applet +pkgver=4.7.80 +pkgrel=1 +pkgdesc='System tray icon for managing print jobs' +url='http://kde.org/applications/system/printerapplet/' +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common') +makedepends=('cmake' 'automoc4') +groups=('kde' 'kdeutils') +source=("http://download.kde.org/unstable/${pkgver}/src/printer-applet-${pkgver}.tar.bz2") +sha1sums=('d1fc4913baf8ca7a938347f7ce4efcb5b1e2ab85') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../printer-applet-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install + + # Fix python 2 path + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + "${pkgdir}"/usr/share/apps/printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py +} diff --git a/staging/kdeutils-superkaramba/PKGBUILD b/staging/kdeutils-superkaramba/PKGBUILD new file mode 100644 index 000000000..2700e958d --- /dev/null +++ b/staging/kdeutils-superkaramba/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143201 2011-11-23 08:33:05Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeutils-superkaramba +pkgver=4.7.80 +pkgrel=1 +pkgdesc='An engine for cool desktop eyecandy' +url='http://kde.org/applications/utilities/superkaramba' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-runtime' 'qimageblitz') +makedepends=('cmake' 'automoc4') +groups=('kde' 'kdeutils') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/superkaramba-${pkgver}.tar.bz2") +sha1sums=('16c505363cf3dac342eb411d8a5ffea80216563d') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../superkaramba-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeutils-superkaramba/kdeutils-superkaramba.install b/staging/kdeutils-superkaramba/kdeutils-superkaramba.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdeutils-superkaramba/kdeutils-superkaramba.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdeutils-sweeper/PKGBUILD b/staging/kdeutils-sweeper/PKGBUILD new file mode 100644 index 000000000..ba98667c9 --- /dev/null +++ b/staging/kdeutils-sweeper/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143202 2011-11-23 08:33:31Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeutils-sweeper +pkgver=4.7.80 +pkgrel=1 +pkgdesc='System Cleaner' +url='http://kde.org/applications/utilities/sweeper' +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +groups=('kde' 'kdeutils') +source=("http://download.kde.org/unstable/${pkgver}/src/sweeper-${pkgver}.tar.bz2") +sha1sums=('18c915a8057fd63edcb47c7e7c2a4503e5141856') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../sweeper-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/staging/kdewebdev/PKGBUILD b/staging/kdewebdev/PKGBUILD new file mode 100644 index 000000000..35c517ca4 --- /dev/null +++ b/staging/kdewebdev/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 143203 2011-11-23 08:34:02Z andrea $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdewebdev +pkgname=('kdewebdev-kfilereplace' + 'kdewebdev-kimagemapeditor' + 'kdewebdev-klinkstatus' + 'kdewebdev-kommander') +pkgver=4.7.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdewebdev') +makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime' 'boost') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('505444a089b88b210a34dc31d09ae2926892aee0') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdewebdev-kfilereplace() { + pkgdesc='Search & Replace Tool' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kfilereplace/" + install='kdewebdev.install' + cd $srcdir/build/kfilereplace + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kfilereplace + make DESTDIR=$pkgdir install +} + +package_kdewebdev-kimagemapeditor() { + pkgdesc='HTML Image Map Editor' + depends=('kdebase-runtime') + install='kdewebdev-kimagemapeditor.install' + cd $srcdir/build/kimagemapeditor + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kimagemapeditor + make DESTDIR=$pkgdir install +} + +package_kdewebdev-klinkstatus() { + pkgdesc='Link Checker' + depends=('kdepim-runtime' 'tidyhtml') + install='kdewebdev.install' + cd $srcdir/build/klinkstatus + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/klinkstatus + make DESTDIR=$pkgdir install +} + +package_kdewebdev-kommander() { + pkgdesc='Executor for Kommander dialogs' + depends=('kdebase-runtime') + cd $srcdir/build/kommander + make DESTDIR=$pkgdir install +} diff --git a/staging/kdewebdev/kdewebdev-kimagemapeditor.install b/staging/kdewebdev/kdewebdev-kimagemapeditor.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/staging/kdewebdev/kdewebdev-kimagemapeditor.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdewebdev/kdewebdev.install b/staging/kdewebdev/kdewebdev.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdewebdev/kdewebdev.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/staging/libkdcraw/PKGBUILD b/staging/libkdcraw/PKGBUILD new file mode 100644 index 000000000..6b5f2de94 --- /dev/null +++ b/staging/libkdcraw/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143135 2011-11-23 07:50:09Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkdcraw +pkgver=4.7.80 +pkgrel=1 +pkgdesc="A C++ interface used to decode RAW picture" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs' 'lcms') +makedepends=('cmake' 'automoc4') +replaces=('kdegraphics-libs') +conflicts=('kdegraphics-libs') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('67f6b65a98a4ab24e946fdf2c4b3523c803c935a') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/libkdcraw/libkdcraw.install b/staging/libkdcraw/libkdcraw.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/libkdcraw/libkdcraw.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/staging/libkdeedu/PKGBUILD b/staging/libkdeedu/PKGBUILD new file mode 100644 index 000000000..6d2636534 --- /dev/null +++ b/staging/libkdeedu/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143133 2011-11-23 07:49:00Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkdeedu +pkgver=4.7.80 +pkgrel=1 +pkgdesc="Libraries used by KDE Education applications" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +replaces=('kdeedu-libkdeedu' 'kdeedu-data') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('31113d9c884d37d36a6af10d5a3b9ab66dcb7396') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/libkdeedu/libkdeedu.install b/staging/libkdeedu/libkdeedu.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/libkdeedu/libkdeedu.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/staging/libkexiv2/PKGBUILD b/staging/libkexiv2/PKGBUILD new file mode 100644 index 000000000..ceab444f1 --- /dev/null +++ b/staging/libkexiv2/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143136 2011-11-23 07:50:36Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkexiv2 +pkgver=4.7.80 +pkgrel=1 +pkgdesc="A library to manipulate pictures metadata" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +replaces=('kdegraphics-libs') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('50916f1f47653f1a3fb84f07cd8eeed4296bf9b1') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/libkipi/PKGBUILD b/staging/libkipi/PKGBUILD new file mode 100644 index 000000000..679d9d1ad --- /dev/null +++ b/staging/libkipi/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143214 2011-11-23 12:51:47Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkipi +pkgver=4.7.80 +pkgrel=1 +pkgdesc="An interface to use kipi-plugins from a KDE application" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +replaces=('kdegraphics-libs') +conflicts=('kdegraphics-libs') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('cd223fb1dbdbfbdea39b3abf79291fe81f534906') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/libkipi/libkipi.install b/staging/libkipi/libkipi.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/libkipi/libkipi.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/staging/libksane/PKGBUILD b/staging/libksane/PKGBUILD new file mode 100644 index 000000000..c833c57f1 --- /dev/null +++ b/staging/libksane/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143137 2011-11-23 07:51:23Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libksane +pkgver=4.7.80 +pkgrel=1 +pkgdesc="An image scanning library" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs' 'sane') +makedepends=('cmake' 'automoc4') +replaces=('kdegraphics-libs') +conflicts=('kdegraphics-libs') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('331914883d031e9e56560d6c6fbef08de304767e') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/libksane/libksane.install b/staging/libksane/libksane.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/libksane/libksane.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/staging/libtorrent-rasterbar/PKGBUILD b/staging/libtorrent-rasterbar/PKGBUILD new file mode 100644 index 000000000..3253c3fbc --- /dev/null +++ b/staging/libtorrent-rasterbar/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 143229 2011-11-23 16:48:02Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Hugo Doria <hugo@archlinux.org> + +pkgname=libtorrent-rasterbar +pkgver=0.15.9 +pkgrel=1 +pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" +url="http://www.rasterbar.com/products/libtorrent/" +arch=('i686' 'x86_64') +license=('custom') +depends=('boost-libs' 'python2') +makedepends=('boost') +options=('!libtool' '!emptydirs') +source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz) +sha1sums=('d86eb9d4452d07715a355d3a67312f162d6eff3a') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --enable-python-binding + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/staging/ocaml/PKGBUILD b/staging/ocaml/PKGBUILD new file mode 100644 index 000000000..e6508d65c --- /dev/null +++ b/staging/ocaml/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 143258 2011-11-24 04:22:51Z eric $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgbase='ocaml' +pkgname=('ocaml' 'ocaml-compiler-libs') +pkgver=3.12.1 +pkgrel=3 +pkgdesc="A functional language with OO extensions" +arch=('i686' 'x86_64') +license=('LGPL2' 'custom: QPL-1.0') +url="http://caml.inria.fr/" +depends=('gdbm') +makedepends=('tk' 'ncurses>=5.6-7' 'libx11') +optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features') +source=(http://caml.inria.fr/distrib/ocaml-3.12/${pkgname}-${pkgver}.tar.gz) +md5sums=('814a047085f0f901ab7d8e3a4b7a9e65') +options=('!makeflags' '!emptydirs') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure -prefix /usr + make world.opt +} + +package_ocaml() { + cd "${srcdir}/${pkgbase}-${pkgver}" + make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install + + # Save >10MB with this one, makepkg only strips debug symbols. + #find "${pkgdir}/usr/lib" -type f -name '*.so.*' -exec strip --strip-unneeded {} \; + + # install license + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" +} + +package_ocaml-compiler-libs() { +pkgdesc="Several modules used internally by the OCaml compiler" +license=('custom: QPL-1.0') +depends=('ocaml') +optdepends=() + + cd "${srcdir}/${pkgbase}-${pkgver}" + + # Install compiler libraries + local compiler_libs="${pkgdir}/usr/lib/ocaml/compiler-libs" + mkdir -p "$compiler_libs"/{parsing,typing,utils} + cp parsing/*.{cmi,cmo,cmx,ml,mli,mll,o} "$compiler_libs"/parsing + cp typing/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/typing + cp utils/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/utils + # duplicated by installation + rm -f "$compiler_libs"/typing/outcometree.{cmi,mli} + + # install license + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/ocaml/fix-ocaml-binutils-2.21.patch b/staging/ocaml/fix-ocaml-binutils-2.21.patch new file mode 100644 index 000000000..fa7664cec --- /dev/null +++ b/staging/ocaml/fix-ocaml-binutils-2.21.patch @@ -0,0 +1,66 @@ +From: Stephane Glondu <steph@glondu.net> +Date: Tue, 8 Mar 2011 21:17:40 +0100 +Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Bug: http://caml.inria.fr/mantis/view.php?id=5237 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404 +Authors: Eric Cooper, spiralvoice +Reviewed-by: Stéphane Glondu <steph@glondu.net> +--- + asmcomp/amd64/emit.mlp | 13 +++++++------ + asmcomp/i386/emit.mlp | 6 +++--- + 2 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp +index 4a3f844..525c6e6 100644 +--- a/asmcomp/amd64/emit.mlp ++++ b/asmcomp/amd64/emit.mlp +@@ -679,17 +679,18 @@ let fundecl fundecl = + emit_all true fundecl.fun_body; + List.iter emit_call_gc !call_gc_sites; + emit_call_bound_errors (); ++ begin match Config.system with ++ "linux" | "gnu" -> ++ ` .type {emit_symbol fundecl.fun_name},@function\n`; ++ ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` ++ | _ -> () ++ end; + if !float_constants <> [] then begin + if macosx + then ` .literal8\n` + else ` .section .rodata.cst8,\"a\",@progbits\n`; + List.iter emit_float_constant !float_constants +- end; +- match Config.system with +- "linux" | "gnu" -> +- ` .type {emit_symbol fundecl.fun_name},@function\n`; +- ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` +- | _ -> () ++ end + + (* Emission of data *) + +diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp +index 2992f29..0b1252c 100644 +--- a/asmcomp/i386/emit.mlp ++++ b/asmcomp/i386/emit.mlp +@@ -905,12 +905,12 @@ let fundecl fundecl = + emit_all true fundecl.fun_body; + List.iter emit_call_gc !call_gc_sites; + emit_call_bound_errors (); +- List.iter emit_float_constant !float_constants; +- match Config.system with ++ begin match Config.system with + "linux_elf" | "bsd_elf" | "gnu" -> + ` .type {emit_symbol fundecl.fun_name},@function\n`; + ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` +- | _ -> () ++ | _ -> () end; ++ List.iter emit_float_constant !float_constants + + + (* Emission of data *) +-- diff --git a/staging/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch b/staging/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch new file mode 100644 index 000000000..1404460df --- /dev/null +++ b/staging/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch @@ -0,0 +1,83 @@ +From bb249b0b26c2e79a6f55355ef94889070f07fd21 Mon Sep 17 00:00:00 2001 +From: Niko Tyni <ntyni@debian.org> +Date: Thu, 28 Apr 2011 09:18:54 +0300 +Subject: [PATCH] Append CFLAGS and LDFLAGS to their Config.pm counterparts in + EU::CBuilder + +Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4), +CFLAGS and LDFLAGS from the environment have overridden the Config.pm +ccflags and ldflags settings. This can cause binary incompatibilities +between the core Perl and extensions built with EU::CBuilder. + +Append to the Config.pm values rather than overriding them. +--- + .../lib/ExtUtils/CBuilder/Base.pm | 6 +++- + dist/ExtUtils-CBuilder/t/04-base.t | 25 +++++++++++++++++++- + 2 files changed, 28 insertions(+), 3 deletions(-) + +diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm +index b572312..2255c51 100644 +--- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm ++++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm +@@ -40,11 +40,13 @@ sub new { + $self->{config}{$k} = $v unless exists $self->{config}{$k}; + } + $self->{config}{cc} = $ENV{CC} if defined $ENV{CC}; +- $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS}; ++ $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS}) ++ if defined $ENV{CFLAGS}; + $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX}; + $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS}; + $self->{config}{ld} = $ENV{LD} if defined $ENV{LD}; +- $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS}; ++ $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS}) ++ if defined $ENV{LDFLAGS}; + + unless ( exists $self->{config}{cxx} ) { + my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/); +diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t +index c3bf6b5..1bb15aa 100644 +--- a/dist/ExtUtils-CBuilder/t/04-base.t ++++ b/dist/ExtUtils-CBuilder/t/04-base.t +@@ -1,7 +1,7 @@ + #! perl -w + + use strict; +-use Test::More tests => 50; ++use Test::More tests => 64; + use Config; + use Cwd; + use File::Path qw( mkpath ); +@@ -326,6 +326,29 @@ is_deeply( $mksymlists_args, + "_prepare_mksymlists_args(): got expected arguments for Mksymlists", + ); + ++my %testvars = ( ++ CFLAGS => 'ccflags', ++ LDFLAGS => 'ldflags', ++); ++ ++while (my ($VAR, $var) = each %testvars) { ++ local $ENV{$VAR}; ++ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); ++ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); ++ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); ++ like($base->{config}{$var}, qr/\Q$Config{$var}/, ++ "honours $var from Config.pm"); ++ ++ $ENV{$VAR} = "-foo -bar"; ++ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); ++ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); ++ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); ++ like($base->{config}{$var}, qr/\Q$ENV{$VAR}/, ++ "honours $VAR from the environment"); ++ like($base->{config}{$var}, qr/\Q$Config{$var}/, ++ "doesn't override $var from Config.pm with $VAR from the environment"); ++} ++ + ##### + + for ($source_file, $object_file, $lib_file) { +-- +1.7.4.4 + diff --git a/staging/perl/ChangeLog b/staging/perl/ChangeLog new file mode 100644 index 000000000..9add39e20 --- /dev/null +++ b/staging/perl/ChangeLog @@ -0,0 +1,66 @@ +2011-06-22 Angel Velasquez <angvp@archlinux.org> + * Added a patch for ExtUtils doesnt overwrite CFLAGS and LDFLAGS + * Fixed #FS22197, FS#22441, FS#24767 + * Rebuilt perl 5.14.1-2 against db 5.2.28 + +2011-06-16 Angel Velasquez <angvp@archlinux.org> + * Fixed #FS24660 + * Rebuilt against db 5.2.28 + +2011-05-16 Angel Velasquez <angvp@archlinux.org> + * perl 5.14.0 + * Removed patch for h2ph warning from 5.12.3 + * Removed provides array, you can use corelist -v 5.14.0 to know the + modules included with the perl core, through Module::CoreList (thx j3nnn1 + for the tip) + +2010-11-07 kevin <kevin@archlinux.org> + + * perl 5.12.2-1 + - Using /usr/bin/*_perl for script directories + +2010-11-06 kevin <kevin@archlinux.org> + + - Removed otherlibdirs directive from Configure + - Removed /usr/*/perl5/site_perl/5.10.1 from INC + - Finally removed legacy dirs /usr/lib/perl5/current and + /usr/lib/perl5/site_perl/current from @INC + +2010-05-23 kevin <kevin@archlinux.org> + + * perl 5.12.1-2 + - Francois updated the provides array. + +2010-05-23 kevin <kevin@archlinux.org> + + * perl 5.12.1-1 + +2010-05-16 kevin <kevin@archlinux.org> + + * perl 5.12.0-2 + +2010-05-12 kevin <kevin@archlinux.org> + + - FS#19411. Removed the for loop in perlbin.sh which didn't work on zsh. + This makes the loop variables unnecessary so the script no longer + pollutes the user's environment. + - FS#19427. Added /usr/*/perl5/site_perl/5.10.1 to otherlibdirs to support + user built modules. + +2010-05-09 kevin <kevin@archlinux.org> + + * perl 5.12.0-1 + - Modified perlbin.sh to only add existing dirs to PATH. Fixes FS#17402, + path points to non-existant directories + +2010-05-07 kevin <kevin@archlinux.org> + + - Added this changelog. + - Added -Dinc_version_list=none to fix FS#19136, double entry in @INC. + This removes the duplicates and versioned directory entries. + - Change scriptdirs to /usr/lib/perl5/{core,vendor,site}_perl/bin to fix + Fix FS#13808, binaries don't follow FHS. + - Stopped using versioned directories in sitelib and sitearch. + + +# vim: set ft=changelog ts=4 sw=4 et: diff --git a/staging/perl/PKGBUILD b/staging/perl/PKGBUILD new file mode 100644 index 000000000..091d95ac6 --- /dev/null +++ b/staging/perl/PKGBUILD @@ -0,0 +1,109 @@ +# $Id: PKGBUILD 143227 2011-11-23 16:41:27Z bluewind $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: kevin <kevin.archlinux.org> +# Contributor: judd <jvinet.zeroflux.org> +# Contributor: francois <francois.archlinux.org> +pkgname=perl +pkgver=5.14.2 +pkgrel=3 +pkgdesc="A highly capable, feature-rich programming language" +arch=(i686 x86_64) +license=('GPL' 'PerlArtistic') +url="http://www.perl.org" +groups=('base') +depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') +changelog=ChangeLog +source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 +perlbin.sh +perlbin.csh +provides.pl +0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch) +install=perl.install +options=('!makeflags' '!purge') +md5sums=('04a4c5d3c1f9f19d77daff8e8cd19a26' + '5ed2542fdb9a60682f215bd33701e61a' + '1f0cbbee783e8a6d32f01be5118e0d5e' + '31fc0b5bb4935414394c5cfbec2cb8e5' + 'c25d86206d649046538c3daab7874564') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + if [ "${CARCH}" = "x86_64" ]; then + # for x86_64 + arch_opts="-Dcccdlflags='-fPIC'" + else + # for i686 + arch_opts="" + fi + ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \ + -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \ + -Dprivlib=/usr/share/perl5/core_perl \ + -Darchlib=/usr/lib/perl5/core_perl \ + -Dsitelib=/usr/share/perl5/site_perl \ + -Dsitearch=/usr/lib/perl5/site_perl \ + -Dvendorlib=/usr/share/perl5/vendor_perl \ + -Dvendorarch=/usr/lib/perl5/vendor_perl \ + -Dscriptdir=/usr/bin/core_perl \ + -Dsitescript=/usr/bin/site_perl \ + -Dvendorscript=/usr/bin/vendor_perl \ + -Dinc_version_list=none \ + -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \ + -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}" + patch -Np1 -i $srcdir/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch + make +} +package() { + # hack to work around makepkg running the subshell in check_sanity() + new_provides=($(cd "$srcdir/perl-$pkgver"; LD_PRELOAD=./libperl.so ./perl -Ilib "$srcdir/provides.pl" .)) + provides=(${new_provides[@]}) + + cd ${srcdir}/${pkgname}-${pkgver} + make install + + ### Perl Settings ### + # Change man page extensions for site and vendor module builds. + # Use archlinux email address instead of my own. + sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \ + -e "/^cf_email=/ s/'.*'/'kevin@archlinux.org'/" \ + -e "/^perladmin=/ s/'.*'/'kevin@archlinux.org'/" \ + -i ${pkgdir}/usr/lib/perl5/core_perl/Config_heavy.pl + + ### CPAN Settings ### + # Set CPAN default config to use the site directories. + sed -e '/(makepl_arg =>/ s/""/"INSTALLDIRS=site"/' \ + -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \ + -i ${pkgdir}/usr/share/perl5/core_perl/CPAN/FirstTime.pm + + ### CPANPLUS Settings ### + # Set CPANPLUS default config to use the site directories. + sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \ + -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \ + -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm + + # Profile script to set paths to perl scripts. + install -D -m755 ${srcdir}/perlbin.sh \ + ${pkgdir}/etc/profile.d/perlbin.sh + # Profile script to set paths to perl scripts on csh. (FS#22441) + install -D -m755 ${srcdir}/perlbin.csh \ + ${pkgdir}/etc/profile.d/perlbin.csh + + (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl) + (cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed) + grep -Rl "${pkgdir}" ${pkgdir}/usr | \ + xargs sed -i "s^${pkgdir}^^g" + + # Remove all pod files *except* those under /usr/share/perl5/core_perl/pod/ + # (FS#16488) + rm -f $pkgdir/usr/share/perl5/core_perl/*.pod + for d in $pkgdir/usr/share/perl5/core_perl/*; do + if [ -d $d -a $(basename $d) != "pod" ]; then + find $d -name *.pod -delete + fi + done + find $pkgdir/usr/lib -name *.pod -delete + find $pkgdir -name .packlist -delete + # Add /usr/lib/perl5/core_perl/CORE/ to standard library path (FS#24660) + install -dv ${pkgdir}/etc/ld.so.conf.d + echo "/usr/lib/perl5/core_perl/CORE" > ${pkgdir}/etc/ld.so.conf.d/perl.conf +} diff --git a/staging/perl/fix-h2ph-and-tests.patch b/staging/perl/fix-h2ph-and-tests.patch new file mode 100644 index 000000000..a2d176ec6 --- /dev/null +++ b/staging/perl/fix-h2ph-and-tests.patch @@ -0,0 +1,104 @@ +From 8d66b3f930dc6d88b524d103e304308ae73a46e7 Mon Sep 17 00:00:00 2001 +From: Robin Barker <rmbarker@cpan.org> +Date: Thu, 22 Apr 2010 11:51:20 +0100 +Subject: [PATCH 1/1] Fix h2ph and test + +--- + lib/h2ph.t | 12 ++++++++++-- + utils/h2ph.PL | 28 +++++++++++++++++++++++----- + 2 files changed, 33 insertions(+), 7 deletions(-) + +diff --git a/lib/h2ph.t b/lib/h2ph.t +index 27dd7b9..8d62d46 100644 +--- a/lib/h2ph.t ++++ b/lib/h2ph.t +@@ -18,7 +18,7 @@ if (!(-e $extracted_program)) { + exit 0; + } + +-plan(4); ++plan(5); + + # quickly compare two text files + sub txt_compare { +@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht', + stderr => 1 ); + like( $result, qr/syntax OK$/, "output compiles"); + ++$result = runperl( progfile => '_h2ph_pre.ph', ++ switches => ['-c'], ++ stderr => 1 ); ++like( $result, qr/syntax OK$/, "preamble compiles"); ++ + $result = runperl( switches => ["-w"], +- prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);'); ++ stderr => 1, ++ prog => <<'PROG' ); ++$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht); ++PROG + is( $result, '', "output free of warnings" ); + + # cleanup +diff --git a/utils/h2ph.PL b/utils/h2ph.PL +index 8f56db4..1255807 100644 +--- a/utils/h2ph.PL ++++ b/utils/h2ph.PL +@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) { + exit $Exit; + + sub expr { +- $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out. ++ if (/\b__asm__\b/) { # freak out ++ $new = '"(assembly code)"'; ++ return ++ } + my $joined_args; + if(keys(%curargs)) { + $joined_args = join('|', keys(%curargs)); +@@ -770,7 +773,7 @@ sub inc_dirs + sub build_preamble_if_necessary + { + # Increment $VERSION every time this function is modified: +- my $VERSION = 2; ++ my $VERSION = 3; + my $preamble = "$Dest_dir/_h2ph_pre.ph"; + + # Can we skip building the preamble file? +@@ -798,7 +801,16 @@ sub build_preamble_if_necessary + # parenthesized value: d=(v) + $define{$_} = $1; + } +- if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { ++ if (/^(\w+)\((\w)\)$/) { ++ my($macro, $arg) = ($1, $2); ++ my $def = $define{$_}; ++ $def =~ s/$arg/\$\{$arg\}/g; ++ print PREAMBLE <<DEFINE; ++unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } } ++ ++DEFINE ++ } elsif ++ ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { + # float: + print PREAMBLE + "unless (defined &$_) { sub $_() { $1 } }\n\n"; +@@ -807,8 +819,14 @@ sub build_preamble_if_necessary + print PREAMBLE + "unless (defined &$_) { sub $_() { $1 } }\n\n"; + } elsif ($define{$_} =~ /^\w+$/) { +- print PREAMBLE +- "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n"; ++ my $def = $define{$_}; ++ if ($isatype{$def}) { ++ print PREAMBLE ++ "unless (defined &$_) { sub $_() { \"$def\" } }\n\n"; ++ } else { ++ print PREAMBLE ++ "unless (defined &$_) { sub $_() { &$def } }\n\n"; ++ } + } else { + print PREAMBLE + "unless (defined &$_) { sub $_() { \"", +-- +1.6.5.2.74.g610f9.dirty + diff --git a/staging/perl/perl.install b/staging/perl/perl.install new file mode 100644 index 000000000..a355c5bbe --- /dev/null +++ b/staging/perl/perl.install @@ -0,0 +1,10 @@ +# arg 1: the new package version +post_install() { + for ver in 5.8.{0,1,2,3,4,5,6,7,8}; do + [ -h usr/lib/perl5/$ver ] && rm usr/lib/perl5/$ver + [ -h usr/lib/perl5/site_perl/$ver ] && rm usr/lib/perl5/site_perl/$ver + [ -h usr/bin/perl$ver ] && rm usr/bin/perl$ver + done + return 0 +} + diff --git a/staging/perl/perlbin.csh b/staging/perl/perlbin.csh new file mode 100644 index 000000000..535f0b18d --- /dev/null +++ b/staging/perl/perlbin.csh @@ -0,0 +1,15 @@ +# Set path to perl scriptdirs if they exist +# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts +# Added /usr/bin/*_perl dirs for scripts +# Remove /usr/lib/perl5/*_perl/bin in next release + +[ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl +[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/site_perl/bin + +[ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl +[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/vendor_perl/bin + +[ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl + +# If you have modules in non-standard directories you can add them here. +#export PERLLIB=dir1:dir2 diff --git a/staging/perl/perlbin.sh b/staging/perl/perlbin.sh new file mode 100755 index 000000000..20f830436 --- /dev/null +++ b/staging/perl/perlbin.sh @@ -0,0 +1,18 @@ +# Set path to perl scriptdirs if they exist +# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts +# Added /usr/bin/*_perl dirs for scripts +# Remove /usr/lib/perl5/*_perl/bin in next release + +[ -d /usr/bin/site_perl ] && PATH=$PATH:/usr/bin/site_perl +[ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin + +[ -d /usr/bin/vendor_perl ] && PATH=$PATH:/usr/bin/vendor_perl +[ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin + +[ -d /usr/bin/core_perl ] && PATH=$PATH:/usr/bin/core_perl + +export PATH + +# If you have modules in non-standard directories you can add them here. +#export PERLLIB=dir1:dir2 + diff --git a/staging/perl/provides.pl b/staging/perl/provides.pl new file mode 100644 index 000000000..3bf369577 --- /dev/null +++ b/staging/perl/provides.pl @@ -0,0 +1,286 @@ +# provides.pl +## +# Script for printing out a provides list of every CPAN distribution +# that is bundled with perl. +# +# Justin Davis <jrcd83@gmail.com> + +use warnings 'FATAL' => 'all'; +use strict; + +package Common; + +sub evalver +{ + my ($path, $mod) = @_; + $mod ||= ""; + + open my $fh, '<', $path or die "open $path: $!"; + + while (<$fh>) { + next unless /\s*(?:\$${mod}::|\$)VERSION\s*=\s*(.+)/; + my $ver = eval $1; + return $ver unless $@; + warn qq{$path:$. bad version string "$ver"\n}; + } + + close $fh; + return undef; +} + +#----------------------------------------------------------------------------- + +package Dists; + +sub maindistfile +{ + my ($dist, $dir) = @_; + + # libpath is the modern style, installing modules under lib/ + # with dirs matching the name components. + my $libpath = join q{/}, 'lib', split /-/, "${dist}.pm"; + + # dumbpath is an old style where there's no subdirs and just + # a .pm file. + my $dumbpath = $dist; + $dumbpath =~ s/\A.+-//; + $dumbpath .= ".pm"; + + my @paths = ($libpath, $dumbpath); + # Some modules (with simple names like XSLoader, lib, etc) are + # generated by Makefile.PL. Search through their generating code. + push @paths, "${dist}_pm.PL" if $dist =~ tr/-/-/ == 0; + + for my $path (map { "$dir/$_" } @paths) { return $path if -f $path; } + return undef; +} + +sub module_ver +{ + my ($dist, $dir) = @_; + + my $path = maindistfile($dist, $dir) or return undef; + + my $mod = $dist; + $mod =~ s/-/::/g; + my $ver = Common::evalver($path, $mod); + unless ($ver) { + warn "failed to find version in module file for $dist\n"; + return undef; + } + + return $ver; +} + +sub changelog_ver +{ + my ($dist, $dir) = @_; + + my $path; + for my $tmp (glob "$dir/{Changes,ChangeLog}") { + if (-f $tmp) { $path = $tmp; last; } + } + return undef unless $path; + + open my $fh, '<', $path or die "open: $!"; + while (<$fh>) { + return $1 if /\A\s*(?:$dist[ \t]*)?([0-9._]+)/; + return $1 if /\A\s*version\s+([0-9._]+)/i; + } + close $fh; + + return undef; +} + +# for some reason podlators has a VERSION file with perl code in it +sub verfile_ver +{ + my ($dist, $dir) = @_; + + my $path = "$dir/VERSION"; + return undef unless -f $path; # no warning, only podlaters has it + + return Common::evalver($path); +} + +# scans a directory full of nicely separated dist. directories. +sub scan_distroot +{ + my ($distroot) = @_; + opendir my $cpand, "$distroot" or die "failed to open $distroot"; + my @dists = grep { !/^\./ && -d "$distroot/$_" } readdir $cpand; + closedir $cpand; + + my @found; + for my $dist (@dists) { + my $distdir = "$distroot/$dist"; + my $ver = (module_ver($dist, $distdir) + || changelog_ver($dist, $distdir) + || verfile_ver($dist, $distdir)); + + if ($ver) { push @found, [ $dist, $ver ]; } + else { warn "failed to find version for $dist\n"; } + } + return @found; +} + +sub find +{ + my ($srcdir) = @_; + return map { scan_distroot($_) } glob "$srcdir/{cpan,dist}"; +} + +#----------------------------------------------------------------------------- + +package Modules; + +use HTTP::Tiny qw(); +use File::Find qw(); +use File::stat; + +*findfile = *File::Find::find; + +sub cpan_provider +{ + my ($module) = @_; + my $url = "http://cpanmetadb.appspot.com/v1.0/package/$module"; + my $http = HTTP::Tiny->new; + my $resp = $http->get($url); + return undef unless $resp->{'success'}; + + my ($cpanpath) = $resp->{'content'} =~ /^distfile: (.*)$/m + or return undef; + + my $dist = $cpanpath; + $dist =~ s{\A.+/}{}; # remove author directory + $dist =~ s{-[^-]+\z}{}; # remove version and extension + return ($dist eq 'perl' ? undef : $dist); +} + +sub find +{ + my ($srcdir) = @_; + my $libdir = "$srcdir/lib/"; + die "failed to find $libdir directory" unless -d $libdir; + + # Find only the module files that have not changed since perl + # was extracted. We don't want the files perl just recently + # installed into lib/. We processed those already. + my @modfiles; + my $finder = sub { + return unless /[.]pm\z/; + push @modfiles, $_; + }; + findfile({ 'no_chdir' => 1, 'wanted' => $finder }, $libdir); + + # First we have to find what the oldest ctime actually is. + my $oldest = time; + @modfiles = map { + my $modfile = $_; + my $ctime = (stat $modfile)->ctime; + $oldest = $ctime if $ctime < $oldest; + [ $modfile, $ctime ]; # save ctime for later + } @modfiles; + + # Then we filter out any file that was created more than a + # few seconds after that. Process the rest. + my @mods; + for my $modfile (@modfiles) { + my ($mod, $ctime) = @$modfile; + next if $ctime - $oldest > 5; # ignore newer files + + my $path = $mod; + $mod =~ s{[.]pm\z}{}; + $mod =~ s{\A$libdir}{}; + $mod =~ s{/}{::}g; + + my $ver = Common::evalver($path) || q{}; + push @mods, [ $mod, $ver ]; + } + + # Convert modules names to the dist names who provide them. + my %seen; + my @dists; + for my $modref (@mods) { + my ($mod, $ver) = @$modref; + my $dist = cpan_provider($mod) or next; # filter out core modules + next if $seen{$dist}++; # avoid duplicate dists + push @dists, [ $dist, $ver ]; + } + return @dists; +} + +#----------------------------------------------------------------------------- + +package Dist2Pkg; + +sub name +{ + my ($name) = @_; + my $orig = $name; + + # Package names should be lowercase and consist of alphanumeric + # characters only (and hyphens!)... + $name =~ tr/A-Z/a-z/; + $name =~ tr/_+/-/; # _ and +'s converted to - (ie Tabbed-Text+Wrap) + $name =~ tr/-a-z0-9+//cd; # Delete all other chars. + $name =~ tr/-/-/s; + + # Delete leading or trailing hyphens... + $name =~ s/\A-|-\z//g; + + die qq{Dist. name '$orig' completely violates packaging standards} + unless $name; + + return "perl-$name"; +} + +sub version +{ + my ($version) = @_; + + # Package versions should be numbers and decimal points only... + $version =~ tr/-/./; + $version =~ tr/_0-9.-//cd; + + # Remove developer versions because pacman has no special logic + # to compare them to regular versions like perl does. + $version =~ s/_[^_]+\z//; + + $version =~ tr/_//d; # delete other underscores + $version =~ tr/././s; # only one period at a time + $version =~ s/\A[.]|[.]\z//g; # shouldn't start or stop with a period + + return $version; +} + +#----------------------------------------------------------------------------- + +package main; + +my %CPANNAME = ('List-Util' => 'Scalar-List-Utils', + 'Text-Tabs' => 'Text-Tabs+Wrap', + 'Cwd' => 'PathTools'); + +my $perldir = shift or die "Usage: $0 [path to perl source directory]\n"; +die "$perldir is not a valid directory." unless -d $perldir; + +my @dists = (Dists::find($perldir), Modules::find($perldir)); +for my $dist (@dists) { + my $name = $dist->[0]; + $dist->[0] = $CPANNAME{$name} if exists $CPANNAME{$name}; +} + +my @pkgs = map { + my ($name, $ver) = @$_; + $name = Dist2Pkg::name($name); + $ver = Dist2Pkg::version($ver); + [ $name, $ver ]; +} @dists; + +@pkgs = sort { $a->[0] cmp $b->[0] } @pkgs; + +for my $pkg (@pkgs) { + my ($name, $ver) = @$pkg; + print "$name=$ver\n"; +} diff --git a/testing/jack/99-audio.conf b/testing/jack/99-audio.conf new file mode 100644 index 000000000..eb76ef920 --- /dev/null +++ b/testing/jack/99-audio.conf @@ -0,0 +1,2 @@ +@audio - rtprio 99 +@audio - memlock unlimited diff --git a/testing/jack/PKGBUILD b/testing/jack/PKGBUILD index 6cc592384..357e7c795 100644 --- a/testing/jack/PKGBUILD +++ b/testing/jack/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140421 2011-10-13 20:39:26Z schiv $ +# $Id: PKGBUILD 143225 2011-11-23 16:14:06Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: tobias <tobias@archlinux.net> # Contributor: Robert Emil Berge <robert@rebi.no> @@ -6,7 +6,7 @@ pkgname=jack _longname=jack-audio-connection-kit pkgver=0.121.3 -pkgrel=2 +pkgrel=3 pkgdesc="A low-latency audio server" arch=('i686' 'x86_64') license=('GPL' 'LGPL') @@ -15,17 +15,16 @@ makedepends=('doxygen' 'libffado' 'celt') optdepends=('libffado: FireWire support' 'celt: NetJACK driver') url="http://jackaudio.org/" -backup=(etc/security/limits.d/99-realtime.conf) +backup=(etc/security/limits.d/99-audio.conf) options=('!libtool') provides=("$_longname=$pkgver") conflicts=("$_longname") replaces=("$_longname") -install=$pkgname.install source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz" - "99-realtime.conf" - "40-hpet-permissions.rules") + '99-audio.conf' + '40-hpet-permissions.rules') md5sums=('35f470f7422c37b33eb965033f7a42e8' - 'bb312fa74956066046d6a599ac623c98' + 'ae65b7c9ebe0fff6c918ba9d97ae342d' '6a1017041c024cea57da9bd726b664d7') build() { @@ -43,11 +42,16 @@ package() { # configure realtime access/scheduling # see https://bugs.archlinux.org/task/26343 - install -Dm644 "$srcdir/99-realtime.conf" \ - "$pkgdir/etc/security/limits.d/99-realtime.conf" + install -Dm644 "$srcdir/99-audio.conf" \ + "$pkgdir/etc/security/limits.d/99-audio.conf" install -Dm644 "$srcdir/40-hpet-permissions.rules" \ - "$srcdir/lib/udev/rules.d/40-hpet-permissions.rules" + "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" + + # install a missing header forgotten by upstream + # see https://bugs.archlinux.org/task/26865 + install -Dm644 "$srcdir/$_longname-$pkgver/jack/jslist.h" \ + "$pkgdir/usr/include/jack/jslist.h" } # vim:set ts=2 sw=2 et: diff --git a/~fauno/notmuch/PKGBUILD b/~fauno/notmuch/PKGBUILD index 209144a69..81cc7981d 100644 --- a/~fauno/notmuch/PKGBUILD +++ b/~fauno/notmuch/PKGBUILD @@ -3,21 +3,20 @@ # Maintainer: Richard Murri <admin@richardmurri.com> pkgname=notmuch -pkgver=0.8 +pkgver=0.10 pkgrel=1 pkgdesc="Notmuch is not much of an email program" arch=(i686 x86_64 mips64el) url="http://notmuchmail.org/" license=('GPL3') -depends=('xapian-core' 'gmime') -makedepends=('talloc' 'python2' 'emacs-nox' 'gnupg' 'ruby') +depends=('xapian-core' 'gmime' 'talloc') +makedepends=('python2' 'emacs-nox' 'gnupg' 'ruby' 'pkgconfig') optdepends=('emacs: for using the emacs interface' 'vim: for using the vim interface' 'python2: for using the python bindings' 'ruby: for using the ruby bindings' 'gnupg: for email encryption') source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('915fe95817e263d62e6de5c3b3c389c4') build() { cd "$srcdir/${pkgname}-${pkgver}" @@ -61,3 +60,4 @@ package(){ sed -i -e 's,/site_ruby,,g' Makefile make prefix=${pkgdir}/usr install } +md5sums=('58c005357395bb6f66d06cfa07534d22') |
